diff options
Diffstat (limited to 'crypt/md5-crypt.c')
| -rw-r--r-- | crypt/md5-crypt.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/crypt/md5-crypt.c b/crypt/md5-crypt.c index 791a59767d..0cc597a7f2 100644 --- a/crypt/md5-crypt.c +++ b/crypt/md5-crypt.c @@ -110,7 +110,7 @@ __md5_crypt_r (const char *key, const char *salt, char *buffer, int buflen) salt_len = MIN (strcspn (salt, "$"), 8); key_len = strlen (key); - if ((key - (char *) 0) % __alignof__ (md5_uint32) != 0) + if (((uintptr_t) key) % __alignof__ (md5_uint32) != 0) { char *tmp; @@ -125,19 +125,19 @@ __md5_crypt_r (const char *key, const char *salt, char *buffer, int buflen) key = copied_key = memcpy (tmp + __alignof__ (md5_uint32) - - (tmp - (char *) 0) % __alignof__ (md5_uint32), + - ((uintptr_t) tmp) % __alignof__ (md5_uint32), key, key_len); - assert ((key - (char *) 0) % __alignof__ (md5_uint32) == 0); + assert (((uintptr_t) key) % __alignof__ (md5_uint32) == 0); } - if ((salt - (char *) 0) % __alignof__ (md5_uint32) != 0) + if (((uintptr_t) salt) % __alignof__ (md5_uint32) != 0) { char *tmp = (char *) alloca (salt_len + __alignof__ (md5_uint32)); salt = copied_salt = memcpy (tmp + __alignof__ (md5_uint32) - - (tmp - (char *) 0) % __alignof__ (md5_uint32), + - ((uintptr_t) tmp) % __alignof__ (md5_uint32), salt, salt_len); - assert ((salt - (char *) 0) % __alignof__ (md5_uint32) == 0); + assert (((uintptr_t) salt) % __alignof__ (md5_uint32) == 0); } #ifdef USE_NSS |