diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2014-02-17 22:24:44 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-02-17 22:24:44 +0100 |
commit | da133cad10885ca36be26b1b043c737e295a4cd4 (patch) | |
tree | 3fb8e1189dce7188c4681144f96982d30c4511bd /package/openssh/patches/patch-mac_c | |
parent | 638c9f989542642d52859a56913ae5c2ace93e69 (diff) | |
parent | 642a45334676311b50bd2b45ae49c45f8b86c86d (diff) |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts:
TODO
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 }, |