diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-04 10:34:02 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-04 10:34:02 +0200 |
commit | 5042ac8e5927d0089d3902b1c37e5bcc1565d053 (patch) | |
tree | cd2be3085808c5ac59dd70f9c610c6a40bfe3ffd /package/openssh/patches/patch-cipher_c | |
parent | 401dabf66529cfb5ab47b4c78d5e25fd493eef1f (diff) | |
parent | 4d569ed1a3305c7b7abe8fa4273cea3b559cc85a (diff) |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts:
BUGS
package/autoconf/Makefile
Diffstat (limited to 'package/openssh/patches/patch-cipher_c')
-rw-r--r-- | package/openssh/patches/patch-cipher_c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/package/openssh/patches/patch-cipher_c b/package/openssh/patches/patch-cipher_c index 9edbd4167..b0a91afea 100644 --- a/package/openssh/patches/patch-cipher_c +++ b/package/openssh/patches/patch-cipher_c @@ -1,6 +1,5 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- openssh-5.2p1.orig/cipher.c 2009-01-28 06:38:41.000000000 +0100 -+++ openssh-5.2p1/cipher.c 2009-05-01 13:39:23.000000000 +0200 +--- openssh-5.4p1.orig/cipher.c 2009-01-28 06:38:41.000000000 +0100 ++++ openssh-5.4p1/cipher.c 2010-03-17 16:24:25.000000000 +0100 @@ -69,21 +69,30 @@ struct Cipher { { "none", SSH_CIPHER_NONE, 8, 0, 0, 0, EVP_enc_null }, { "des", SSH_CIPHER_DES, 8, 8, 0, 1, EVP_des_cbc }, |