bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add checks for missing ciphers in openssh (fixes #974)

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/packages@5643 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd 2006-11-25 22:04:23 +00:00
parent 0e23e5e242
commit e6bad774f4
2 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
net/openssh/patches/100-openssl-cipher.patch → net/openssh/patches/100-no_cast_fix.patch
View File

@ -1,11 +1,12 @@
diff -Nur openssh-4.2p1/cipher.c openssh-4.2p1.patched/cipher.c
--- openssh-4.2p1/cipher.c 2005-07-17 09:02:10.000000000 +0200
+++ openssh-4.2p1.patched/cipher.c 2006-03-26 12:43:41.000000000 +0200
@@ -67,7 +67,6 @@
--- openssh-4.4p1/cipher.c.old 2006-11-25 22:56:20.000000000 +0100
+++ openssh-4.4p1/cipher.c 2006-11-25 22:55:47.000000000 +0100
@@ -72,7 +72,9 @@
{ "3des-cbc", SSH_CIPHER_SSH2, 8, 24, 0, EVP_des_ede3_cbc },
{ "blowfish-cbc", SSH_CIPHER_SSH2, 8, 16, 0, EVP_bf_cbc },
- { "cast128-cbc", SSH_CIPHER_SSH2, 8, 16, 0, EVP_cast5_cbc },
+#ifndef OPENSSL_NO_CAST
{ "cast128-cbc", SSH_CIPHER_SSH2, 8, 16, 0, EVP_cast5_cbc },
+#endif
{ "arcfour", SSH_CIPHER_SSH2, 8, 16, 0, EVP_rc4 },
{ "arcfour128", SSH_CIPHER_SSH2, 8, 16, 1536, EVP_rc4 },
{ "arcfour256", SSH_CIPHER_SSH2, 8, 32, 1536, EVP_rc4 },

13
net/openssh/patches/110-no_ripemd_fix.patch Normal file
View File

@ -0,0 +1,13 @@
--- openssh-4.4p1/mac.c.old 2006-11-25 22:59:32.000000000 +0100
+++ openssh-4.4p1/mac.c 2006-11-25 22:59:48.000000000 +0100
@@ -51,8 +51,10 @@
{ "hmac-sha1-96", EVP_sha1, 96 },
{ "hmac-md5", EVP_md5, 0 },
{ "hmac-md5-96", EVP_md5, 96 },
+#ifndef OPENSSL_NO_RIPEMD
{ "hmac-ripemd160", EVP_ripemd160, 0 },
{ "hmac-ripemd160@openssh.com", EVP_ripemd160, 0 },
+#endif
{ NULL, NULL, 0 }
};