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-myproposal_h | |
| 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-myproposal_h')
| -rw-r--r-- | package/openssh/patches/patch-myproposal_h | 45 |
1 files changed, 0 insertions, 45 deletions
diff --git a/package/openssh/patches/patch-myproposal_h b/package/openssh/patches/patch-myproposal_h deleted file mode 100644 index 38345863e..000000000 --- a/package/openssh/patches/patch-myproposal_h +++ /dev/null @@ -1,45 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- openssh-5.2p1.orig/myproposal.h 2009-01-28 06:33:31.000000000 +0100 -+++ openssh-5.2p1/myproposal.h 2009-05-01 14:00:47.000000000 +0200 -@@ -42,15 +42,35 @@ - - #define KEX_DEFAULT_PK_ALG "ssh-rsa,ssh-dss" - -+ -+#ifndef OPENSSL_NO_AES192 -+#define KEX_ENCRYPT_AES192 ",aes192-ctr,aes192-cbc" -+#else -+#define KEX_ENCRYPT_AES192 -+#endif -+#ifndef OPENSSL_NO_BF -+#define KEX_ENCRYPT_BF ",blowfish-cbc" -+#else -+#define KEX_ENCRYPT_BF -+#endif -+#ifndef OPENSSL_NO_CAST -+#define KEX_ENCRYPT_CAST ",cast128-cbc" -+#define KEX_MAC_CAST ",hmac-ripemd160,hmac-ripemd160@openssh.com" -+#else -+#define KEX_ENCRYPT_CAST -+#define KEX_MAC_CAST -+#endif -+ - #define KEX_DEFAULT_ENCRYPT \ -- "aes128-ctr,aes192-ctr,aes256-ctr," \ -+ "aes128-ctr,aes256-ctr," \ - "arcfour256,arcfour128," \ -- "aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc," \ -- "aes192-cbc,aes256-cbc,arcfour,rijndael-cbc@lysator.liu.se" -+ "aes128-cbc,3des-cbc," \ -+ "aes256-cbc,arcfour,rijndael-cbc@lysator.liu.se" \ -+ KEX_ENCRYPT_AES192 KEX_ENCRYPT_BF KEX_ENCRYPT_CAST - #define KEX_DEFAULT_MAC \ -- "hmac-md5,hmac-sha1,umac-64@openssh.com,hmac-ripemd160," \ -- "hmac-ripemd160@openssh.com," \ -- "hmac-sha1-96,hmac-md5-96" -+ "hmac-md5,hmac-sha1,umac-64@openssh.com," \ -+ "hmac-sha1-96,hmac-md5-96" \ -+ KEX_MAC_CAST - #define KEX_DEFAULT_COMP "none,zlib@openssh.com,zlib" - #define KEX_DEFAULT_LANG "" - |