提交 bd445703 编写于 作者: B Ben Laurie

Fix signed/unsigned warnings.

上级 e1c55191
...@@ -346,7 +346,9 @@ static char *apr1_crypt(const char *passwd, const char *salt) ...@@ -346,7 +346,9 @@ static char *apr1_crypt(const char *passwd, const char *salt)
buf_perm[dest] = buf[source]; buf_perm[dest] = buf[source];
buf_perm[14] = buf[5]; buf_perm[14] = buf[5];
buf_perm[15] = buf[11]; buf_perm[15] = buf[11];
#ifndef PEDANTIC /* Unfortunately, this generates a "no effect" warning */
assert(16 == sizeof buf_perm); assert(16 == sizeof buf_perm);
#endif
output = salt_out + salt_len; output = salt_out + salt_len;
assert(output == out_buf + strlen(out_buf)); assert(output == out_buf + strlen(out_buf));
......
...@@ -410,8 +410,9 @@ ...@@ -410,8 +410,9 @@
* Time for some action:-) * Time for some action:-)
*/ */
void HASH_UPDATE (HASH_CTX *c, const unsigned char *data, unsigned long len) void HASH_UPDATE (HASH_CTX *c, const void *data_, unsigned long len)
{ {
const unsigned char *data=data_;
register HASH_LONG * p; register HASH_LONG * p;
register unsigned long l; register unsigned long l;
int sw,sc,ew,ec; int sw,sc,ew,ec;
......
...@@ -103,7 +103,7 @@ typedef struct MD5state_st ...@@ -103,7 +103,7 @@ typedef struct MD5state_st
} MD5_CTX; } MD5_CTX;
void MD5_Init(MD5_CTX *c); void MD5_Init(MD5_CTX *c);
void MD5_Update(MD5_CTX *c, const unsigned char *data, unsigned long len); void MD5_Update(MD5_CTX *c, const void *data, unsigned long len);
void MD5_Final(unsigned char *md, MD5_CTX *c); void MD5_Final(unsigned char *md, MD5_CTX *c);
unsigned char *MD5(const unsigned char *d, unsigned long n, unsigned char *md); unsigned char *MD5(const unsigned char *d, unsigned long n, unsigned char *md);
void MD5_Transform(MD5_CTX *c, const unsigned char *b); void MD5_Transform(MD5_CTX *c, const unsigned char *b);
......
...@@ -89,7 +89,7 @@ typedef struct RIPEMD160state_st ...@@ -89,7 +89,7 @@ typedef struct RIPEMD160state_st
} RIPEMD160_CTX; } RIPEMD160_CTX;
void RIPEMD160_Init(RIPEMD160_CTX *c); void RIPEMD160_Init(RIPEMD160_CTX *c);
void RIPEMD160_Update(RIPEMD160_CTX *c, const unsigned char *data, unsigned long len); void RIPEMD160_Update(RIPEMD160_CTX *c, const void *data, unsigned long len);
void RIPEMD160_Final(unsigned char *md, RIPEMD160_CTX *c); void RIPEMD160_Final(unsigned char *md, RIPEMD160_CTX *c);
unsigned char *RIPEMD160(const unsigned char *d, unsigned long n, unsigned char *RIPEMD160(const unsigned char *d, unsigned long n,
unsigned char *md); unsigned char *md);
......
...@@ -100,14 +100,14 @@ typedef struct SHAstate_st ...@@ -100,14 +100,14 @@ typedef struct SHAstate_st
#ifndef NO_SHA0 #ifndef NO_SHA0
void SHA_Init(SHA_CTX *c); void SHA_Init(SHA_CTX *c);
void SHA_Update(SHA_CTX *c, const unsigned char *data, unsigned long len); void SHA_Update(SHA_CTX *c, const void *data, unsigned long len);
void SHA_Final(unsigned char *md, SHA_CTX *c); void SHA_Final(unsigned char *md, SHA_CTX *c);
unsigned char *SHA(const unsigned char *d, unsigned long n,unsigned char *md); unsigned char *SHA(const unsigned char *d, unsigned long n,unsigned char *md);
void SHA_Transform(SHA_CTX *c, const unsigned char *data); void SHA_Transform(SHA_CTX *c, const unsigned char *data);
#endif #endif
#ifndef NO_SHA1 #ifndef NO_SHA1
void SHA1_Init(SHA_CTX *c); void SHA1_Init(SHA_CTX *c);
void SHA1_Update(SHA_CTX *c, const unsigned char *data, unsigned long len); void SHA1_Update(SHA_CTX *c, const void *data, unsigned long len);
void SHA1_Final(unsigned char *md, SHA_CTX *c); void SHA1_Final(unsigned char *md, SHA_CTX *c);
unsigned char *SHA1(const unsigned char *d, unsigned long n,unsigned char *md); unsigned char *SHA1(const unsigned char *d, unsigned long n,unsigned char *md);
void SHA1_Transform(SHA_CTX *c, const unsigned char *data); void SHA1_Transform(SHA_CTX *c, const unsigned char *data);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册