PageRenderTime 84ms CodeModel.GetById 24ms RepoModel.GetById 1ms app.codeStats 0ms

/tools/android/depends/libssh/md5.patch

https://github.com/energy6/xbmc
Patch | 72 lines | 65 code | 7 blank | 0 comment | 0 complexity | 860e435f16828c8ae5d1c8d39bb1afa5 MD5 | raw file
    

  1. diff -ruN include/libssh/wrapper.h include/libssh/wrapper.h
    2. 

  2. --- include/libssh/wrapper.h	2011-05-31 10:29:52.000000000 -0400
    3. 

  3. +++ include/libssh/wrapper.h	2012-07-26 00:21:16.021511996 -0400
    4. 

  4. @@ -26,7 +26,7 @@
    5. 

  5.  #include "libssh/libcrypto.h"
    6. 

  6.  #include "libssh/libgcrypt.h"
    7. 

  7.  
    8. 

  8. -MD5CTX md5_init(void);
    9. 

  9. +MD5CTX ssh_md5_init(void);
    10. 

  10.  void md5_update(MD5CTX c, const void *data, unsigned long len);
    11. 

  11.  void md5_final(unsigned char *md,MD5CTX c);
    12. 

  12.  SHACTX sha1_init(void);
    13. 

  13. diff -ruN src/dh.c src/dh.c
    14. 

  14. --- src/dh.c	2011-05-31 10:29:52.000000000 -0400
    15. 

  15. +++ src/dh.c	2012-07-26 00:19:52.961512049 -0400
    16. 

  16. @@ -854,7 +854,7 @@
    17. 

  17.      return SSH_ERROR;
    18. 

  18.    }
    19. 

  19.  
    20. 

  20. -  ctx = md5_init();
    21. 

  21. +  ctx = ssh_md5_init();
    22. 

  22.    if (ctx == NULL) {
    23. 

  23.      SAFE_FREE(h);
    24. 

  24.      return SSH_ERROR;
    25. 

  25. diff -ruN src/kex.c src/kex.c
    26. 

  26. --- src/kex.c	2011-05-31 10:29:52.000000000 -0400
    27. 

  27. +++ src/kex.c	2012-07-26 00:20:37.671512021 -0400
    28. 

  28. @@ -509,7 +509,7 @@
    29. 

  29.      ssh_string hostn) {
    30. 

  30.    MD5CTX md5 = NULL;
    31. 

  31.  
    32. 

  32. -  md5 = md5_init();
    33. 

  33. +  md5 = ssh_md5_init();
    34. 

  34.    if (md5 == NULL) {
    35. 

  35.      return -1;
    36. 

  36.    }
    37. 

  37. diff -ruN src/keyfiles.c src/keyfiles.c
    38. 

  38. --- src/keyfiles.c	2011-05-31 10:29:52.000000000 -0400
    39. 

  39. +++ src/keyfiles.c	2012-07-26 00:20:51.801512011 -0400
    40. 

  40. @@ -223,7 +223,7 @@
    41. 

  41.    unsigned int md_not_empty;
    42. 

  42.  
    43. 

  43.    for (j = 0, md_not_empty = 0; j < keylen; ) {
    44. 

  44. -    md = md5_init();
    45. 

  45. +    md = ssh_md5_init();
    46. 

  46.      if (md == NULL) {
    47. 

  47.        return -1;
    48. 

  48.      }
    49. 

  49. diff -ruN src/libcrypto.c src/libcrypto.c
    50. 

  50. --- src/libcrypto.c	2011-05-31 10:29:52.000000000 -0400
    51. 

  51. +++ src/libcrypto.c	2012-07-26 00:20:07.061512022 -0400
    52. 

  52. @@ -89,7 +89,7 @@
    53. 

  53.    SHA1(digest, len, hash);
    54. 

  54.  }
    55. 

  55.  
    56. 

  56. -MD5CTX md5_init(void) {
    57. 

  57. +MD5CTX ssh_md5_init(void) {
    58. 

  58.    MD5CTX c = malloc(sizeof(*c));
    59. 

  59.    if (c == NULL) {
    60. 

  60.      return NULL;
    61. 

  61. diff -ruN src/libgcrypt.c src/libgcrypt.c
    62. 

  62. --- src/libgcrypt.c	2011-05-31 10:29:52.000000000 -0400
    63. 

  63. +++ src/libgcrypt.c	2012-07-26 00:20:19.401512036 -0400
    64. 

  64. @@ -62,7 +62,7 @@
    65. 

  65.    gcry_md_hash_buffer(GCRY_MD_SHA1, hash, digest, len);
    66. 

  66.  }
    67. 

  67.  
    68. 

  68. -MD5CTX md5_init(void) {
    69. 

  69. +MD5CTX ssh_md5_init(void) {
    70. 

  70.    MD5CTX c = NULL;
    71. 

  71.    gcry_md_open(&c, GCRY_MD_MD5, 0);
    72. 

  72.  
    73. 

  73.