diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-02-12 15:38:18 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-02-12 15:38:18 +0100 |
| commit | 756b97ecc48c03e20792adb6c973eb5f4d16c627 (patch) | |
| tree | ca241b628c1dd6e05a2e05a3d7ab05e432b50df6 /package/openssh/patches | |
| parent | b0737882e275d23a9ee0909830a75900c0d916c0 (diff) | |
update to latest stable upstream version
Diffstat (limited to 'package/openssh/patches')
| -rw-r--r-- | package/openssh/patches/patch-cipher_c | 6 | ||||
| -rw-r--r-- | package/openssh/patches/patch-digest_c | 12 | ||||
| -rw-r--r-- | package/openssh/patches/patch-mac_c | 8 |
3 files changed, 19 insertions, 7 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 }, diff --git a/package/openssh/patches/patch-digest_c b/package/openssh/patches/patch-digest_c new file mode 100644 index 000000000..feead7711 --- /dev/null +++ b/package/openssh/patches/patch-digest_c @@ -0,0 +1,12 @@ +--- openssh-6.5p1.orig/digest.c 2014-01-20 02:41:53.000000000 +0100 ++++ openssh-6.5p1/digest.c 2014-02-11 17:41:23.000000000 +0100 +@@ -44,7 +44,9 @@ struct ssh_digest { + /* NB. Indexed directly by algorithm number */ + const struct ssh_digest digests[] = { + { SSH_DIGEST_MD5, "MD5", 16, EVP_md5 }, ++#ifndef OPENSSL_NO_RIPEMD + { SSH_DIGEST_RIPEMD160, "RIPEMD160", 20, EVP_ripemd160 }, ++#endif + { SSH_DIGEST_SHA1, "SHA1", 20, EVP_sha1 }, + #ifdef HAVE_EVP_SHA256 /* XXX replace with local if missing */ + { SSH_DIGEST_SHA256, "SHA256", 32, EVP_sha256 }, 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 }, |