summaryrefslogtreecommitdiff
path: root/package/openssh/patches
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2013-04-29 17:59:12 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2013-04-29 17:59:12 +0200
commit5782397d77cd243c1174c98051158febe3a21641 (patch)
tree861884ab0072eb6a65f800dc552b69022219dc9a /package/openssh/patches
parentaa2345af436cfb40dff27df88cbd4a5fb79d477a (diff)
update to latest upstream
Diffstat (limited to 'package/openssh/patches')
-rw-r--r--package/openssh/patches/patch-cipher_c49
-rw-r--r--package/openssh/patches/patch-mac_c33
2 files changed, 48 insertions, 34 deletions
diff --git a/package/openssh/patches/patch-cipher_c b/package/openssh/patches/patch-cipher_c
index b0a91afea..88f5d11d9 100644
--- a/package/openssh/patches/patch-cipher_c
+++ b/package/openssh/patches/patch-cipher_c
@@ -1,34 +1,37 @@
---- 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 },
- { "3des", SSH_CIPHER_3DES, 8, 16, 0, 1, evp_ssh1_3des },
+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-04-29 15:10:49.000000000 +0200
+@@ -69,23 +69,33 @@
+ { "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 },
+#ifndef OPENSSL_NO_BF
- { "blowfish", SSH_CIPHER_BLOWFISH, 8, 32, 0, 1, evp_ssh1_bf },
--
+ { "blowfish", SSH_CIPHER_BLOWFISH, 8, 32, 0, 0, 0, 1, evp_ssh1_bf },
+#endif
- { "3des-cbc", SSH_CIPHER_SSH2, 8, 24, 0, 1, EVP_des_ede3_cbc },
+
+ { "3des-cbc", SSH_CIPHER_SSH2, 8, 24, 0, 0, 0, 1, EVP_des_ede3_cbc },
+#ifndef OPENSSL_NO_BF
- { "blowfish-cbc", SSH_CIPHER_SSH2, 8, 16, 0, 1, EVP_bf_cbc },
+ { "blowfish-cbc",
+ SSH_CIPHER_SSH2, 8, 16, 0, 0, 0, 1, EVP_bf_cbc },
+#endif
+#ifndef OPENSSL_NO_CAST
- { "cast128-cbc", SSH_CIPHER_SSH2, 8, 16, 0, 1, EVP_cast5_cbc },
+ { "cast128-cbc",
+ SSH_CIPHER_SSH2, 8, 16, 0, 0, 0, 1, EVP_cast5_cbc },
+#endif
- { "arcfour", SSH_CIPHER_SSH2, 8, 16, 0, 0, EVP_rc4 },
- { "arcfour128", SSH_CIPHER_SSH2, 8, 16, 1536, 0, EVP_rc4 },
- { "arcfour256", SSH_CIPHER_SSH2, 8, 32, 1536, 0, EVP_rc4 },
- { "aes128-cbc", SSH_CIPHER_SSH2, 16, 16, 0, 1, EVP_aes_128_cbc },
+ { "arcfour", SSH_CIPHER_SSH2, 8, 16, 0, 0, 0, 0, EVP_rc4 },
+ { "arcfour128", SSH_CIPHER_SSH2, 8, 16, 0, 0, 1536, 0, EVP_rc4 },
+ { "arcfour256", SSH_CIPHER_SSH2, 8, 32, 0, 0, 1536, 0, EVP_rc4 },
+ { "aes128-cbc", SSH_CIPHER_SSH2, 16, 16, 0, 0, 0, 1, EVP_aes_128_cbc },
+#ifndef OPENSSL_NO_AES192
- { "aes192-cbc", SSH_CIPHER_SSH2, 16, 24, 0, 1, EVP_aes_192_cbc },
+ { "aes192-cbc", SSH_CIPHER_SSH2, 16, 24, 0, 0, 0, 1, EVP_aes_192_cbc },
+#endif
- { "aes256-cbc", SSH_CIPHER_SSH2, 16, 32, 0, 1, EVP_aes_256_cbc },
+ { "aes256-cbc", SSH_CIPHER_SSH2, 16, 32, 0, 0, 0, 1, EVP_aes_256_cbc },
{ "rijndael-cbc@lysator.liu.se",
- SSH_CIPHER_SSH2, 16, 32, 0, 1, EVP_aes_256_cbc },
- { "aes128-ctr", SSH_CIPHER_SSH2, 16, 16, 0, 0, evp_aes_128_ctr },
+ SSH_CIPHER_SSH2, 16, 32, 0, 0, 0, 1, EVP_aes_256_cbc },
+ { "aes128-ctr", SSH_CIPHER_SSH2, 16, 16, 0, 0, 0, 0, EVP_aes_128_ctr },
+#ifndef OPENSSL_NO_AES192
- { "aes192-ctr", SSH_CIPHER_SSH2, 16, 24, 0, 0, evp_aes_128_ctr },
+ { "aes192-ctr", SSH_CIPHER_SSH2, 16, 24, 0, 0, 0, 0, EVP_aes_192_ctr },
+#endif
- { "aes256-ctr", SSH_CIPHER_SSH2, 16, 32, 0, 0, evp_aes_128_ctr },
- #ifdef USE_CIPHER_ACSS
- { "acss@openssh.org", SSH_CIPHER_SSH2, 16, 5, 0, 0, EVP_acss },
+ { "aes256-ctr", SSH_CIPHER_SSH2, 16, 32, 0, 0, 0, 0, EVP_aes_256_ctr },
+ #ifdef OPENSSL_HAVE_EVPGCM
+ { "aes128-gcm@openssh.com",
diff --git a/package/openssh/patches/patch-mac_c b/package/openssh/patches/patch-mac_c
index 1d4286e29..c06cbe38a 100644
--- a/package/openssh/patches/patch-mac_c
+++ b/package/openssh/patches/patch-mac_c
@@ -1,13 +1,24 @@
---- openssh-5.4p1.orig/mac.c 2008-06-13 02:58:50.000000000 +0200
-+++ openssh-5.4p1/mac.c 2010-03-17 16:24:25.000000000 +0100
-@@ -59,8 +59,10 @@ struct {
- { "hmac-sha1-96", SSH_EVP, EVP_sha1, 96, -1, -1 },
- { "hmac-md5", SSH_EVP, EVP_md5, 0, -1, -1 },
- { "hmac-md5-96", SSH_EVP, EVP_md5, 96, -1, -1 },
+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-04-29 15:14:29.000000000 +0200
+@@ -68,8 +68,10 @@
+ #endif
+ { "hmac-md5", SSH_EVP, EVP_md5, 0, 0, 0, 0 },
+ { "hmac-md5-96", SSH_EVP, EVP_md5, 96, 0, 0, 0 },
+#ifndef OPENSSL_NO_RIPEMD
- { "hmac-ripemd160", SSH_EVP, EVP_ripemd160, 0, -1, -1 },
- { "hmac-ripemd160@openssh.com", SSH_EVP, EVP_ripemd160, 0, -1, -1 },
+ { "hmac-ripemd160", SSH_EVP, EVP_ripemd160, 0, 0, 0, 0 },
+ { "hmac-ripemd160@openssh.com", SSH_EVP, EVP_ripemd160, 0, 0, 0, 0 },
+#endif
- { "umac-64@openssh.com", SSH_UMAC, NULL, 0, 128, 64 },
- { NULL, 0, NULL, 0, -1, -1 }
- };
+ { "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 @@
+ #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 },
++#ifndef OPENSSL_NO_RIPEMD
+ { "hmac-ripemd160-etm@openssh.com", SSH_EVP, EVP_ripemd160, 0, 0, 0, 1 },
++#endif
+ { "umac-64-etm@openssh.com", SSH_UMAC, NULL, 0, 128, 64, 1 },
+ { "umac-128-etm@openssh.com", SSH_UMAC128, NULL, 0, 128, 128, 1 },
+