From 14996d5036c66feafe6b6b77ca61f348505bf769 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Sat, 25 Nov 2006 22:04:23 +0000 Subject: [PATCH] add checks for missing ciphers in openssh (fixes #974) SVN-Revision: 5643 --- ...0-openssl-cipher.patch => 100-no_cast_fix.patch} | 11 ++++++----- net/openssh/patches/110-no_ripemd_fix.patch | 13 +++++++++++++ 2 files changed, 19 insertions(+), 5 deletions(-) rename net/openssh/patches/{100-openssl-cipher.patch => 100-no_cast_fix.patch} (51%) create mode 100644 net/openssh/patches/110-no_ripemd_fix.patch diff --git a/net/openssh/patches/100-openssl-cipher.patch b/net/openssh/patches/100-no_cast_fix.patch similarity index 51% rename from net/openssh/patches/100-openssl-cipher.patch rename to net/openssh/patches/100-no_cast_fix.patch index f8eb177c2..9e8c4be2c 100644 --- a/net/openssh/patches/100-openssl-cipher.patch +++ b/net/openssh/patches/100-no_cast_fix.patch @@ -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 }, diff --git a/net/openssh/patches/110-no_ripemd_fix.patch b/net/openssh/patches/110-no_ripemd_fix.patch new file mode 100644 index 000000000..f732455c8 --- /dev/null +++ b/net/openssh/patches/110-no_ripemd_fix.patch @@ -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 } + }; + -- 2.30.2