diff options
| -rw-r--r-- | crypto/md5/md5_locl.h | 10 | ||||
| -rw-r--r-- | crypto/ripemd/rmd_locl.h | 12 | ||||
| -rw-r--r-- | crypto/ripemd/rmd_one.c | 1 | ||||
| -rw-r--r-- | crypto/sha/sha_locl.h | 12 |
4 files changed, 18 insertions, 17 deletions
diff --git a/crypto/md5/md5_locl.h b/crypto/md5/md5_locl.h index 84723439e0..da40a6206b 100644 --- a/crypto/md5/md5_locl.h +++ b/crypto/md5/md5_locl.h @@ -113,11 +113,11 @@ void md5_block_data_order (MD5_CTX *c, const void *p,int num); #define HASH_TRANSFORM MD5_Transform #define HASH_FINAL MD5_Final #define HASH_MAKE_STRING(c,s) do { \ - unsigned long l; \ - l=(c)->A; HOST_l2c(l,(s)); \ - l=(c)->B; HOST_l2c(l,(s)); \ - l=(c)->C; HOST_l2c(l,(s)); \ - l=(c)->D; HOST_l2c(l,(s)); \ + unsigned long ll; \ + ll=(c)->A; HOST_l2c(ll,(s)); \ + ll=(c)->B; HOST_l2c(ll,(s)); \ + ll=(c)->C; HOST_l2c(ll,(s)); \ + ll=(c)->D; HOST_l2c(ll,(s)); \ } while (0) #define HASH_BLOCK_HOST_ORDER md5_block_host_order #if !defined(L_ENDIAN) || defined(md5_block_data_order) diff --git a/crypto/ripemd/rmd_locl.h b/crypto/ripemd/rmd_locl.h index 7068de711b..145cf316b9 100644 --- a/crypto/ripemd/rmd_locl.h +++ b/crypto/ripemd/rmd_locl.h @@ -95,12 +95,12 @@ void ripemd160_block_data_order (RIPEMD160_CTX *c, const void *p,int num); #define HASH_FINAL RIPEMD160_Final #define HASH_BLOCK_HOST_ORDER ripemd160_block_host_order #define HASH_MAKE_STRING(c,s) do { \ - unsigned long l; \ - l=(c)->A; HOST_l2c(l,(s)); \ - l=(c)->B; HOST_l2c(l,(s)); \ - l=(c)->C; HOST_l2c(l,(s)); \ - l=(c)->D; HOST_l2c(l,(s)); \ - l=(c)->E; HOST_l2c(l,(s)); \ + unsigned long ll; \ + ll=(c)->A; HOST_l2c(ll,(s)); \ + ll=(c)->B; HOST_l2c(ll,(s)); \ + ll=(c)->C; HOST_l2c(ll,(s)); \ + ll=(c)->D; HOST_l2c(ll,(s)); \ + ll=(c)->E; HOST_l2c(ll,(s)); \ } while (0) #if !defined(L_ENDIAN) || defined(ripemd160_block_data_order) #define HASH_BLOCK_DATA_ORDER ripemd160_block_data_order diff --git a/crypto/ripemd/rmd_one.c b/crypto/ripemd/rmd_one.c index 582cd31e25..cbc6132bc7 100644 --- a/crypto/ripemd/rmd_one.c +++ b/crypto/ripemd/rmd_one.c @@ -57,6 +57,7 @@ */ #include <stdio.h> +#include <memory.h> #include <openssl/ripemd.h> unsigned char *RIPEMD160(unsigned char *d, unsigned long n, diff --git a/crypto/sha/sha_locl.h b/crypto/sha/sha_locl.h index 6f64e57627..80e70f046f 100644 --- a/crypto/sha/sha_locl.h +++ b/crypto/sha/sha_locl.h @@ -74,12 +74,12 @@ #define HASH_CBLOCK SHA_CBLOCK #define HASH_LBLOCK SHA_LBLOCK #define HASH_MAKE_STRING(c,s) do { \ - unsigned long l; \ - l=(c)->h0; HOST_l2c(l,(s)); \ - l=(c)->h1; HOST_l2c(l,(s)); \ - l=(c)->h2; HOST_l2c(l,(s)); \ - l=(c)->h3; HOST_l2c(l,(s)); \ - l=(c)->h4; HOST_l2c(l,(s)); \ + unsigned long ll; \ + ll=(c)->h0; HOST_l2c(ll,(s)); \ + ll=(c)->h1; HOST_l2c(ll,(s)); \ + ll=(c)->h2; HOST_l2c(ll,(s)); \ + ll=(c)->h3; HOST_l2c(ll,(s)); \ + ll=(c)->h4; HOST_l2c(ll,(s)); \ } while (0) #if defined(SHA_0) |