diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2013-04-29 17:59:12 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-04-29 17:59:12 +0200 |
| commit | 5782397d77cd243c1174c98051158febe3a21641 (patch) | |
| tree | 861884ab0072eb6a65f800dc552b69022219dc9a /package/openssh/patches/patch-mac_c | |
| parent | aa2345af436cfb40dff27df88cbd4a5fb79d477a (diff) | |
update to latest upstream
Diffstat (limited to 'package/openssh/patches/patch-mac_c')
| -rw-r--r-- | package/openssh/patches/patch-mac_c | 33 |
1 files changed, 22 insertions, 11 deletions
diff --git a/package/openssh/patches/patch-mac_c b/package/openssh/patches/patch-mac_c index 1d4286e29..c06cbe38a 100644 --- a/package/openssh/patches/patch-mac_c +++ b/package/openssh/patches/patch-mac_c @@ -1,13 +1,24 @@ ---- openssh-5.4p1.orig/mac.c 2008-06-13 02:58:50.000000000 +0200 -+++ openssh-5.4p1/mac.c 2010-03-17 16:24:25.000000000 +0100 -@@ -59,8 +59,10 @@ struct { - { "hmac-sha1-96", SSH_EVP, EVP_sha1, 96, -1, -1 }, - { "hmac-md5", SSH_EVP, EVP_md5, 0, -1, -1 }, - { "hmac-md5-96", SSH_EVP, EVP_md5, 96, -1, -1 }, +diff -Nur openssh-6.2p1.orig/mac.c openssh-6.2p1/mac.c +--- openssh-6.2p1.orig/mac.c 2012-12-12 01:00:37.000000000 +0100 ++++ openssh-6.2p1/mac.c 2013-04-29 15:14:29.000000000 +0200 +@@ -68,8 +68,10 @@ + #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, -1, -1 }, - { "hmac-ripemd160@openssh.com", SSH_EVP, EVP_ripemd160, 0, -1, -1 }, + { "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 }, - { NULL, 0, NULL, 0, -1, -1 } - }; + { "umac-64@openssh.com", SSH_UMAC, NULL, 0, 128, 64, 0 }, + { "umac-128@openssh.com", SSH_UMAC128, NULL, 0, 128, 128, 0 }, + +@@ -82,7 +84,9 @@ + #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 }, + |