diff options
Diffstat (limited to 'tools/depends/target/libssh/md5.patch')
| -rw-r--r-- | tools/depends/target/libssh/md5.patch | 66 |
1 files changed, 29 insertions, 37 deletions
diff --git a/tools/depends/target/libssh/md5.patch b/tools/depends/target/libssh/md5.patch index b5985f0be8..84f4bec0ef 100644 --- a/tools/depends/target/libssh/md5.patch +++ b/tools/depends/target/libssh/md5.patch @@ -1,19 +1,17 @@ -diff -ruN include/libssh/wrapper.h include/libssh/wrapper.h ---- include/libssh/wrapper.h 2011-05-31 10:29:52.000000000 -0400 -+++ include/libssh/wrapper.h 2012-07-26 00:21:16.021511996 -0400 -@@ -26,7 +26,7 @@ - #include "libssh/libcrypto.h" - #include "libssh/libgcrypt.h" +--- include/libssh/wrapper.h.orig 2014-12-27 12:03:55.521114159 +0100 ++++ include/libssh/wrapper.h 2014-12-27 12:06:35.072310640 +0100 +@@ -52,7 +52,7 @@ + }; + typedef struct ssh_mac_ctx_struct *ssh_mac_ctx; -MD5CTX md5_init(void); +MD5CTX ssh_md5_init(void); void md5_update(MD5CTX c, const void *data, unsigned long len); void md5_final(unsigned char *md,MD5CTX c); - SHACTX sha1_init(void); -diff -ruN src/dh.c src/dh.c ---- src/dh.c 2011-05-31 10:29:52.000000000 -0400 -+++ src/dh.c 2012-07-26 00:19:52.961512049 -0400 -@@ -854,7 +854,7 @@ + +--- src/dh.c.orig 2014-12-27 12:08:07.441537435 +0100 ++++ src/dh.c 2014-12-27 12:09:25.539205892 +0100 +@@ -906,7 +906,7 @@ return SSH_ERROR; } @@ -22,10 +20,18 @@ diff -ruN src/dh.c src/dh.c if (ctx == NULL) { SAFE_FREE(h); return SSH_ERROR; -diff -ruN src/kex.c src/kex.c ---- src/kex.c 2011-05-31 10:29:52.000000000 -0400 -+++ src/kex.c 2012-07-26 00:20:37.671512021 -0400 -@@ -509,7 +509,7 @@ +@@ -1037,7 +1037,7 @@ + goto out; + } + +- ctx = md5_init(); ++ ctx = ssh_md5_init(); + if (ctx == NULL) { + free(h); + rc = -1; +--- src/kex1.c.orig 2014-12-27 12:11:18.307842585 +0100 ++++ src/kex1.c 2014-12-27 12:11:38.999225682 +0100 +@@ -78,7 +78,7 @@ ssh_string hostn) { MD5CTX md5 = NULL; @@ -34,23 +40,10 @@ diff -ruN src/kex.c src/kex.c if (md5 == NULL) { return -1; } -diff -ruN src/keyfiles.c src/keyfiles.c ---- src/keyfiles.c 2011-05-31 10:29:52.000000000 -0400 -+++ src/keyfiles.c 2012-07-26 00:20:51.801512011 -0400 -@@ -223,7 +223,7 @@ - unsigned int md_not_empty; - - for (j = 0, md_not_empty = 0; j < keylen; ) { -- md = md5_init(); -+ md = ssh_md5_init(); - if (md == NULL) { - return -1; - } -diff -ruN src/libcrypto.c src/libcrypto.c ---- src/libcrypto.c 2011-05-31 10:29:52.000000000 -0400 -+++ src/libcrypto.c 2012-07-26 00:20:07.061512022 -0400 -@@ -89,7 +89,7 @@ - SHA1(digest, len, hash); +--- src/libcrypto.c.orig 2014-12-27 12:12:40.977378184 +0100 ++++ src/libcrypto.c 2014-12-27 12:13:14.716372667 +0100 +@@ -234,7 +234,7 @@ + SHA512(digest, len, hash); } -MD5CTX md5_init(void) { @@ -58,11 +51,10 @@ diff -ruN src/libcrypto.c src/libcrypto.c MD5CTX c = malloc(sizeof(*c)); if (c == NULL) { return NULL; -diff -ruN src/libgcrypt.c src/libgcrypt.c ---- src/libgcrypt.c 2011-05-31 10:29:52.000000000 -0400 -+++ src/libgcrypt.c 2012-07-26 00:20:19.401512036 -0400 -@@ -62,7 +62,7 @@ - gcry_md_hash_buffer(GCRY_MD_SHA1, hash, digest, len); +--- src/libgcrypt.c.orig 2014-12-27 12:13:46.319430927 +0100 ++++ src/libgcrypt.c 2014-12-27 12:13:59.611034883 +0100 +@@ -132,7 +132,7 @@ + gcry_md_hash_buffer(GCRY_MD_SHA512, hash, digest, len); } -MD5CTX md5_init(void) { |