From c40473416a20d0485210f413fa1fb221035d0256 Mon Sep 17 00:00:00 2001 From: Awais Chishti Date: Thu, 1 Aug 2019 21:28:48 +0500 Subject: [PATCH] Avoid -Waddress-of-packed-member warnings --- src/modules/module_17200.c | 10 ++++------ src/modules/module_17210.c | 10 ++++------ src/modules/module_17220.c | 4 +--- src/modules/module_17225.c | 4 +--- src/modules/module_17230.c | 4 +--- 5 files changed, 11 insertions(+), 21 deletions(-) diff --git a/src/modules/module_17200.c b/src/modules/module_17200.c index e42081643..a94a30ec7 100644 --- a/src/modules/module_17200.c +++ b/src/modules/module_17200.c @@ -284,12 +284,10 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE hex_to_binary (p, strlen (p), (char *) &(pkzip->hash.data)); // fake salt - u32 *ptr = (u32 *) pkzip->hash.data; - - salt->salt_buf[0] = ptr[0]; - salt->salt_buf[1] = ptr[1]; - salt->salt_buf[2] = ptr[2]; - salt->salt_buf[3] = ptr[3]; + salt->salt_buf[0] = pkzip->hash.data[0]; + salt->salt_buf[1] = pkzip->hash.data[1]; + salt->salt_buf[2] = pkzip->hash.data[2]; + salt->salt_buf[3] = pkzip->hash.data[3]; salt->salt_len = 16; diff --git a/src/modules/module_17210.c b/src/modules/module_17210.c index 6025921f6..c1f405f2e 100644 --- a/src/modules/module_17210.c +++ b/src/modules/module_17210.c @@ -283,12 +283,10 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE hex_to_binary (p, strlen (p), (char *) &(pkzip->hash.data)); // fake salt - u32 *ptr = (u32 *) pkzip->hash.data; - - salt->salt_buf[0] = ptr[0]; - salt->salt_buf[1] = ptr[1]; - salt->salt_buf[2] = ptr[2]; - salt->salt_buf[3] = ptr[3]; + salt->salt_buf[0] = pkzip->hash.data[0]; + salt->salt_buf[1] = pkzip->hash.data[1]; + salt->salt_buf[2] = pkzip->hash.data[2]; + salt->salt_buf[3] = pkzip->hash.data[3]; salt->salt_len = 16; diff --git a/src/modules/module_17220.c b/src/modules/module_17220.c index fa737ecbf..403640d94 100644 --- a/src/modules/module_17220.c +++ b/src/modules/module_17220.c @@ -285,9 +285,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE hex_to_binary (p, strlen (p), (char *) &(pkzip->hashes[i].data)); // fake salt - u32 *ptr = (u32 *) pkzip->hashes[i].data; - - salt->salt_buf[i] = ptr[0]; + salt->salt_buf[i] = pkzip->hashes[i].data[0]; if (i == 0) digest[i] = pkzip->hashes[i].checksum_from_crc; } diff --git a/src/modules/module_17225.c b/src/modules/module_17225.c index 9cf725cf0..66907159f 100644 --- a/src/modules/module_17225.c +++ b/src/modules/module_17225.c @@ -285,9 +285,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE hex_to_binary (p, strlen (p), (char *) &(pkzip->hashes[i].data)); // fake salt - u32 *ptr = (u32 *) pkzip->hashes[i].data; - - salt->salt_buf[i] = ptr[0]; + salt->salt_buf[i] = pkzip->hashes[i].data[0]; if (i == 0) digest[i] = pkzip->hashes[i].checksum_from_crc; } diff --git a/src/modules/module_17230.c b/src/modules/module_17230.c index 26cbb1b5c..2b65dd65e 100644 --- a/src/modules/module_17230.c +++ b/src/modules/module_17230.c @@ -286,9 +286,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE hex_to_binary (p, strlen (p), (char *) &(pkzip->hashes[i].data)); // fake salt - u32 *ptr = (u32 *) pkzip->hashes[i].data; - - salt->salt_buf[i] = ptr[0]; + salt->salt_buf[i] = pkzip->hashes[i].data[0]; if (i == 0) digest[i] = pkzip->hashes[i].checksum_from_crc; }