diff options
| -rw-r--r-- | apps/passwd.c | 2 | ||||
| -rw-r--r-- | crypto/md32_common.h | 3 | ||||
| -rw-r--r-- | crypto/md5/md5.h | 2 | ||||
| -rw-r--r-- | crypto/ripemd/ripemd.h | 2 | ||||
| -rw-r--r-- | crypto/sha/sha.h | 4 |
5 files changed, 8 insertions, 5 deletions
diff --git a/apps/passwd.c b/apps/passwd.c index 06155979f4..0e5682d1d6 100644 --- a/apps/passwd.c +++ b/apps/passwd.c @@ -346,7 +346,9 @@ static char *apr1_crypt(const char *passwd, const char *salt) buf_perm[dest] = buf[source]; buf_perm[14] = buf[5]; buf_perm[15] = buf[11]; +#ifndef PEDANTIC /* Unfortunately, this generates a "no effect" warning */ assert(16 == sizeof buf_perm); +#endif output = salt_out + salt_len; assert(output == out_buf + strlen(out_buf)); diff --git a/crypto/md32_common.h b/crypto/md32_common.h index d7c0084c4e..1a404a458d 100644 --- a/crypto/md32_common.h +++ b/crypto/md32_common.h @@ -410,8 +410,9 @@ * 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 unsigned long l; int sw,sc,ew,ec; diff --git a/crypto/md5/md5.h b/crypto/md5/md5.h index d9b7383446..d10bc8397f 100644 --- a/crypto/md5/md5.h +++ b/crypto/md5/md5.h @@ -103,7 +103,7 @@ typedef struct MD5state_st } MD5_CTX; 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); unsigned char *MD5(const unsigned char *d, unsigned long n, unsigned char *md); void MD5_Transform(MD5_CTX *c, const unsigned char *b); diff --git a/crypto/ripemd/ripemd.h b/crypto/ripemd/ripemd.h index 730bf7a592..dd1627cf40 100644 --- a/crypto/ripemd/ripemd.h +++ b/crypto/ripemd/ripemd.h @@ -89,7 +89,7 @@ typedef struct RIPEMD160state_st } RIPEMD160_CTX; 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); unsigned char *RIPEMD160(const unsigned char *d, unsigned long n, unsigned char *md); diff --git a/crypto/sha/sha.h b/crypto/sha/sha.h index 5e9cf20cc8..77f6d9695e 100644 --- a/crypto/sha/sha.h +++ b/crypto/sha/sha.h @@ -100,14 +100,14 @@ typedef struct SHAstate_st #ifndef NO_SHA0 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); unsigned char *SHA(const unsigned char *d, unsigned long n,unsigned char *md); void SHA_Transform(SHA_CTX *c, const unsigned char *data); #endif #ifndef NO_SHA1 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); unsigned char *SHA1(const unsigned char *d, unsigned long n,unsigned char *md); void SHA1_Transform(SHA_CTX *c, const unsigned char *data); |