diff options
Diffstat (limited to 'src/crypt')
| -rw-r--r-- | src/crypt/crypt_des.c | 19 | ||||
| -rw-r--r-- | src/crypt/crypt_md5.c | 2 | ||||
| -rw-r--r-- | src/crypt/crypt_sha256.c | 2 | ||||
| -rw-r--r-- | src/crypt/crypt_sha512.c | 2 |
4 files changed, 11 insertions, 14 deletions
diff --git a/src/crypt/crypt_des.c b/src/crypt/crypt_des.c index 4454a130..dc95dcaa 100644 --- a/src/crypt/crypt_des.c +++ b/src/crypt/crypt_des.c @@ -879,10 +879,7 @@ static char *_crypt_extended_r_uut(const char *_key, const char *_setting, char const unsigned char *key = (const unsigned char *)_key; const unsigned char *setting = (const unsigned char *)_setting; struct expanded_key ekey; - union { - unsigned char c[8]; - uint32_t i[2]; - } keybuf; + unsigned char keybuf[8]; unsigned char *p, *q; uint32_t count, salt, l, r0, r1; unsigned int i; @@ -891,13 +888,13 @@ static char *_crypt_extended_r_uut(const char *_key, const char *_setting, char * Copy the key, shifting each character left by one bit and padding * with zeroes. */ - q = keybuf.c; - while (q <= &keybuf.c[sizeof(keybuf.c) - 1]) { + q = keybuf; + while (q <= &keybuf[sizeof(keybuf) - 1]) { *q++ = *key << 1; if (*key) key++; } - des_setkey(keybuf.c, &ekey); + des_setkey(keybuf, &ekey); if (*setting == _PASSWORD_EFMT1) { /* @@ -925,14 +922,14 @@ static char *_crypt_extended_r_uut(const char *_key, const char *_setting, char /* * Encrypt the key with itself. */ - des_cipher(keybuf.c, keybuf.c, 1, 0, &ekey); + des_cipher(keybuf, keybuf, 1, 0, &ekey); /* * And XOR with the next 8 characters of the key. */ - q = keybuf.c; - while (q <= &keybuf.c[sizeof(keybuf.c) - 1] && *key) + q = keybuf; + while (q <= &keybuf[sizeof(keybuf) - 1] && *key) *q++ ^= *key++ << 1; - des_setkey(keybuf.c, &ekey); + des_setkey(keybuf, &ekey); } memcpy(output, setting, 9); diff --git a/src/crypt/crypt_md5.c b/src/crypt/crypt_md5.c index 02f22444..70ab8b99 100644 --- a/src/crypt/crypt_md5.c +++ b/src/crypt/crypt_md5.c @@ -118,7 +118,7 @@ static void md5_init(struct md5 *s) s->h[3] = 0x10325476; } -static void md5_sum(struct md5 *s, uint8_t md[16]) +static void md5_sum(struct md5 *s, uint8_t *md) { int i; diff --git a/src/crypt/crypt_sha256.c b/src/crypt/crypt_sha256.c index 076e4b16..e01a208b 100644 --- a/src/crypt/crypt_sha256.c +++ b/src/crypt/crypt_sha256.c @@ -119,7 +119,7 @@ static void sha256_init(struct sha256 *s) s->h[7] = 0x5be0cd19; } -static void sha256_sum(struct sha256 *s, uint8_t md[20]) +static void sha256_sum(struct sha256 *s, uint8_t *md) { int i; diff --git a/src/crypt/crypt_sha512.c b/src/crypt/crypt_sha512.c index 0f1de814..8325d77c 100644 --- a/src/crypt/crypt_sha512.c +++ b/src/crypt/crypt_sha512.c @@ -136,7 +136,7 @@ static void sha512_init(struct sha512 *s) s->h[7] = 0x5be0cd19137e2179ULL; } -static void sha512_sum(struct sha512 *s, uint8_t md[20]) +static void sha512_sum(struct sha512 *s, uint8_t *md) { int i; |