From 99232c868fb3b52ba7405a1d0489c0ef20b285b3 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 24 Mar 2014 20:51:56 +0100 Subject: update to latest upstream --- package/openssh/patches/patch-mac_c | 24 ------------------------ 1 file changed, 24 deletions(-) delete mode 100644 package/openssh/patches/patch-mac_c (limited to 'package/openssh/patches/patch-mac_c') diff --git a/package/openssh/patches/patch-mac_c b/package/openssh/patches/patch-mac_c deleted file mode 100644 index 7812de4b2..000000000 --- a/package/openssh/patches/patch-mac_c +++ /dev/null @@ -1,24 +0,0 @@ -diff -Nur openssh-6.2p1.orig/mac.c openssh-6.2p1/mac.c ---- openssh-6.5p1.orig/mac.c 2014-01-10 00:37:05.000000000 +0100 -+++ openssh-6.5p1/mac.c 2014-02-11 15:26:16.000000000 +0100 -@@ -70,8 +70,10 @@ static const struct macalg macs[] = { - #endif - { "hmac-md5", SSH_EVP, EVP_md5, 0, 0, 0, 0 }, - { "hmac-md5-96", SSH_EVP, EVP_md5, 96, 0, 0, 0 }, -+#ifndef OPENSSL_NO_RIPEMD - { "hmac-ripemd160", SSH_EVP, EVP_ripemd160, 0, 0, 0, 0 }, - { "hmac-ripemd160@openssh.com", SSH_EVP, EVP_ripemd160, 0, 0, 0, 0 }, -+#endif - { "umac-64@openssh.com", SSH_UMAC, NULL, 0, 128, 64, 0 }, - { "umac-128@openssh.com", SSH_UMAC128, NULL, 0, 128, 128, 0 }, - -@@ -84,7 +86,9 @@ static const struct macalg macs[] = { - #endif - { "hmac-md5-etm@openssh.com", SSH_EVP, EVP_md5, 0, 0, 0, 1 }, - { "hmac-md5-96-etm@openssh.com", SSH_EVP, EVP_md5, 96, 0, 0, 1 }, -+#ifndef OPENSSL_NO_RIPEMD - { "hmac-ripemd160-etm@openssh.com", SSH_EVP, EVP_ripemd160, 0, 0, 0, 1 }, -+#endif - { "umac-64-etm@openssh.com", SSH_UMAC, NULL, 0, 128, 64, 1 }, - { "umac-128-etm@openssh.com", SSH_UMAC128, NULL, 0, 128, 128, 1 }, - -- cgit v1.2.3