Minor 64-bit md32_common.h update and minor unsignification of digests.

diff --git a/crypto/md2/md2.h b/crypto/md2/md2.h
index 45bf4cc29c84ed07b29a209dec14bf326bd2467f..15bd40c7b7bc4fbdb4d31ca0144a13fef970638d 100644 (file)
--- a/crypto/md2/md2.h
+++ b/crypto/md2/md2.h
@@ -73,7 +73,7 @@ extern "C" {
 
 typedef struct MD2state_st
        {
-       int num;
+       usigned int num;
        unsigned char data[MD2_BLOCK];
        MD2_INT cksm[MD2_BLOCK];
        MD2_INT state[MD2_BLOCK];

diff --git a/crypto/md32_common.h b/crypto/md32_common.h
index 5bdcf035aaddebd1a48445d4e9b4ab9fb6f37015..7eef6e907453474ab50ba2d063dfe20c593a0d3e 100644 (file)
--- a/crypto/md32_common.h
+++ b/crypto/md32_common.h
@@ -77,7 +77,7 @@
  *                     ...
  *                     HASH_LONG       Nl,Nh;
  *                     HASH_LONG       data[HASH_LBLOCK];
- *                     int             num;
+ *                     unsigned int    num;
  *                     ...
  *                     } HASH_CTX;
  * HASH_UPDATE
@@ -398,7 +398,7 @@ int HASH_UPDATE (HASH_CTX *c, const void *data_, size_t len)
        const unsigned char *data=data_;
        register HASH_LONG * p;
        register HASH_LONG l;
-       unsigned int sw,sc,ew,ec;
+       size_t sw,sc,ew,ec;
 
        if (len==0) return 1;
 
@@ -430,7 +430,7 @@ int HASH_UPDATE (HASH_CTX *c, const void *data_, size_t len)
                        }
                else
                        {
-                       c->num+=len;
+                       c->num+=(unsigned int)len;
                        if ((sc+len) < 4) /* ugly, add char's to a word */
                                {
                                l=p[sw]; HOST_p_c2l_p(data,l,sc,len); p[sw]=l;

diff --git a/crypto/md4/md4.h b/crypto/md4/md4.h
index 9a5b6603fe3e3b2b112e4c7e2f7167fc90c4d978..b080cbdc21402cf5464dad5ba94a58ccbc7e02d4 100644 (file)
--- a/crypto/md4/md4.h
+++ b/crypto/md4/md4.h
@@ -101,7 +101,7 @@ typedef struct MD4state_st
        MD4_LONG A,B,C,D;
        MD4_LONG Nl,Nh;
        MD4_LONG data[MD4_LBLOCK];
-       int num;
+       unsigned int num;
        } MD4_CTX;
 
 int MD4_Init(MD4_CTX *c);

diff --git a/crypto/md5/md5.h b/crypto/md5/md5.h
index 587d947b9a4fcd0032c91c7c8afabaf582668c72..a58940e5471f5c4ac032fd6633ce24f4ef00ebde 100644 (file)
--- a/crypto/md5/md5.h
+++ b/crypto/md5/md5.h
@@ -101,7 +101,7 @@ typedef struct MD5state_st
        MD5_LONG A,B,C,D;
        MD5_LONG Nl,Nh;
        MD5_LONG data[MD5_LBLOCK];
-       int num;
+       unigned int num;
        } MD5_CTX;
 
 int MD5_Init(MD5_CTX *c);

diff --git a/crypto/mdc2/mdc2.h b/crypto/mdc2/mdc2.h
index 6490e5c7d35fd46ebd0ef79a84c7ffa1140f9b75..72778a521236aed7dcb4b0f7bbe7dcd68ff3e1a2 100644 (file)
--- a/crypto/mdc2/mdc2.h
+++ b/crypto/mdc2/mdc2.h
@@ -74,7 +74,7 @@ extern "C" {
  
 typedef struct mdc2_ctx_st
        {
-       int num;
+       unsigned int num;
        unsigned char data[MDC2_BLOCK];
        DES_cblock h,hh;
        int pad_type; /* either 1 or 2, default 1 */

diff --git a/crypto/mdc2/mdc2dgst.c b/crypto/mdc2/mdc2dgst.c
index aa9ba0ee6bd982cb4436d4f1c80e34d2cf2a2204..4aa406edc3bab41e2dc9d46db2879b392a6c0b20 100644 (file)
--- a/crypto/mdc2/mdc2dgst.c
+++ b/crypto/mdc2/mdc2dgst.c
@@ -160,7 +160,8 @@ static void mdc2_body(MDC2_CTX *c, const unsigned char *in, size_t len)
 
 int MDC2_Final(unsigned char *md, MDC2_CTX *c)
        {
-       int i,j;
+       unsigned int i;
+       int j;
 
        i=c->num;
        j=c->pad_type;

diff --git a/crypto/ripemd/ripemd.h b/crypto/ripemd/ripemd.h
index a664e742afe80f753b6b5c387297e7f8a9ebd6d7..06bd67183bc3affa86229b4d604d7e5dadb1c6d7 100644 (file)
--- a/crypto/ripemd/ripemd.h
+++ b/crypto/ripemd/ripemd.h
@@ -87,7 +87,7 @@ typedef struct RIPEMD160state_st
        RIPEMD160_LONG A,B,C,D,E;
        RIPEMD160_LONG Nl,Nh;
        RIPEMD160_LONG data[RIPEMD160_LBLOCK];
-       int num;
+       unsigned int   num;
        } RIPEMD160_CTX;
 
 int RIPEMD160_Init(RIPEMD160_CTX *c);