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-cipher_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-cipher_c')
-rw-r--r-- | package/openssh/patches/patch-cipher_c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/package/openssh/patches/patch-cipher_c b/package/openssh/patches/patch-cipher_c index e7169b576..059d3cf86 100644 --- a/package/openssh/patches/patch-cipher_c +++ b/package/openssh/patches/patch-cipher_c @@ -1,7 +1,7 @@ diff -Nur openssh-6.2p1.orig/cipher.c openssh-6.2p1/cipher.c ---- openssh-6.2p1.orig/cipher.c 2013-02-12 01:00:35.000000000 +0100 -+++ openssh-6.2p1/cipher.c 2013-08-20 08:56:48.923159083 +0200 -@@ -69,23 +69,33 @@ struct Cipher { +--- openssh-6.5p1.orig/cipher.c 2014-01-25 23:37:26.000000000 +0100 ++++ openssh-6.5p1/cipher.c 2014-02-11 15:26:16.000000000 +0100 +@@ -75,23 +75,33 @@ static const struct Cipher ciphers[] = { { "none", SSH_CIPHER_NONE, 8, 0, 0, 0, 0, 0, EVP_enc_null }, { "des", SSH_CIPHER_DES, 8, 8, 0, 0, 0, 1, EVP_des_cbc }, { "3des", SSH_CIPHER_3DES, 8, 16, 0, 0, 0, 1, evp_ssh1_3des }, |