diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2014-02-15 14:25:42 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-02-15 14:25:42 +0100 |
commit | 3c586ea3d495ffa77ab95d5cb1529ecbf208a63c (patch) | |
tree | bcd9a488454f9a739450c742ced8b2e3ada8c118 /package/openssh/patches/patch-mac_c | |
parent | c653423921e82df58aa203674fabe6fc6e157cd4 (diff) | |
parent | 0c0e05a071067aa433b3cf13bd982543d9ad7d17 (diff) |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/openssh/patches/patch-mac_c')
-rw-r--r-- | package/openssh/patches/patch-mac_c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/package/openssh/patches/patch-mac_c b/package/openssh/patches/patch-mac_c index df8eac301..7812de4b2 100644 --- a/package/openssh/patches/patch-mac_c +++ b/package/openssh/patches/patch-mac_c @@ -1,7 +1,7 @@ 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-08-20 08:56:49.123256567 +0200 -@@ -68,8 +68,10 @@ struct { +--- 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 }, @@ -12,7 +12,7 @@ diff -Nur openssh-6.2p1.orig/mac.c openssh-6.2p1/mac.c { "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 @@ struct { +@@ -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 }, |