diff options
| author | Ben Longbons <b.r.longbons@gmail.com> | 2011-09-10 16:43:26 -0700 |
|---|---|---|
| committer | Ben Longbons <b.r.longbons@gmail.com> | 2011-09-10 16:43:26 -0700 |
| commit | 8f4e4e9a92f6af89820a358ab99b990697117502 (patch) | |
| tree | cb312b5367c71dfe89543a5463be9555177c6445 /src/common/md5calc.c | |
| parent | f841b6fdcc802e73d52da0e67ee192c0c2c1c7e1 (diff) | |
| parent | 2c863c0d99aa3df9ef2eb4ceb112c4d946520f0a (diff) | |
| download | tmwa-8f4e4e9a92f6af89820a358ab99b990697117502.tar.gz tmwa-8f4e4e9a92f6af89820a358ab99b990697117502.tar.bz2 tmwa-8f4e4e9a92f6af89820a358ab99b990697117502.tar.xz tmwa-8f4e4e9a92f6af89820a358ab99b990697117502.zip | |
Merge commit '2c863c0d99aa3df9ef2eb4ceb112c4d946520f0a'
Diffstat (limited to 'src/common/md5calc.c')
| -rw-r--r-- | src/common/md5calc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/common/md5calc.c b/src/common/md5calc.c index d5ebcf8..ba8f6af 100644 --- a/src/common/md5calc.c +++ b/src/common/md5calc.c @@ -165,7 +165,7 @@ void MD5_to_bin(MD5_state state, uint8_t out[0x10]) out[i] = state.val[i/4] >> 8*(i%4); } -static const char hex[0x10] = "0123456789abcdef"; +static const char hex[] = "0123456789abcdef"; void MD5_to_str(MD5_state state, char out[0x21]) { @@ -198,7 +198,7 @@ MD5_state MD5_from_string(const char* msg, const size_t msglen) if (64 - rem > 8) { for (int i=0; i<8; i++) - buf[0x38+i] = (msglen*8) >> (i*8); + buf[0x38+i] = ((uint64_t)msglen*8) >> (i*8); } for (int i=0; i<0x10; i++) X[i] = buf[4*i+0] | buf[4*i+1]<<8 | buf[4*i+2]<<16 | buf[4*i+3]<<24; @@ -207,7 +207,7 @@ MD5_state MD5_from_string(const char* msg, const size_t msglen) { memset(buf,'\0', 0x38); for (int i=0; i<8; i++) - buf[0x38+i] = (msglen*8) >> (i*8); + buf[0x38+i] = ((uint64_t)msglen*8) >> (i*8); for (int i=0; i<0x10; i++) X[i] = buf[4*i+0] | buf[4*i+1]<<8 | buf[4*i+2]<<16 | buf[4*i+3]<<24; MD5_do_block(&state, block); @@ -291,7 +291,7 @@ const char *MD5_saltcrypt(const char *key, const char *salt) return obuf; } -const char *make_salt() { +const char *make_salt(void) { static char salt[6]; for (int i=0; i<5; i++) salt[i] = MPRAND(48, 78); |