diff options
| author | Andreas Schneider <asn@samba.org> | 2018-12-03 15:42:03 +0100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2018-12-20 12:16:40 +0100 |
| commit | 6b2c6c0e56b048e29d97e7efe535ba56b41b10b5 (patch) | |
| tree | babbe6454a10197f5d28a7fcb5b8eba02b323a2f /libcli | |
| parent | 161d14f200933855ccd3b12ff228079333bc72f7 (diff) | |
| download | samba-6b2c6c0e56b048e29d97e7efe535ba56b41b10b5.tar.gz | |
libcli:auth: Use C99 initializers or ZERO_ARRAY instead of ZERO_STRUCT
ZERO_STRUCT is not wrong here, it will give the same result, but better
use macros with correct naming as it makes clear what happens when you
read the code.
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'libcli')
| -rw-r--r-- | libcli/auth/credentials.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/libcli/auth/credentials.c b/libcli/auth/credentials.c index acf88c923aa..b6c8ba281ba 100644 --- a/libcli/auth/credentials.c +++ b/libcli/auth/credentials.c @@ -32,10 +32,9 @@ static void netlogon_creds_step_crypt(struct netlogon_creds_CredentialState *cre { if (creds->negotiate_flags & NETLOGON_NEG_SUPPORTS_AES) { AES_KEY key; - uint8_t iv[AES_BLOCK_SIZE]; + uint8_t iv[AES_BLOCK_SIZE] = {0}; AES_set_encrypt_key(creds->session_key, 128, &key); - ZERO_STRUCT(iv); aes_cfb8_encrypt(in->data, out->data, 8, &key, iv, AES_ENCRYPT); } else { @@ -62,7 +61,7 @@ static void netlogon_creds_init_64bit(struct netlogon_creds_CredentialState *cre SIVAL(sum2,0,sum[0]); SIVAL(sum2,4,sum[1]); - ZERO_STRUCT(creds->session_key); + ZERO_ARRAY(creds->session_key); des_crypt128(creds->session_key, sum2, machine_password->hash); } @@ -81,7 +80,7 @@ static void netlogon_creds_init_128bit(struct netlogon_creds_CredentialState *cr HMACMD5Context ctx; MD5_CTX md5; - ZERO_STRUCT(creds->session_key); + ZERO_ARRAY(creds->session_key); memset(zero, 0, sizeof(zero)); @@ -108,7 +107,7 @@ static void netlogon_creds_init_hmac_sha256(struct netlogon_creds_CredentialStat struct HMACSHA256Context ctx; uint8_t digest[SHA256_DIGEST_LENGTH]; - ZERO_STRUCT(creds->session_key); + ZERO_ARRAY(creds->session_key); hmac_sha256_init(machine_password->hash, sizeof(machine_password->hash), @@ -228,10 +227,9 @@ void netlogon_creds_arcfour_crypt(struct netlogon_creds_CredentialState *creds, void netlogon_creds_aes_encrypt(struct netlogon_creds_CredentialState *creds, uint8_t *data, size_t len) { AES_KEY key; - uint8_t iv[AES_BLOCK_SIZE]; + uint8_t iv[AES_BLOCK_SIZE] = {0}; AES_set_encrypt_key(creds->session_key, 128, &key); - ZERO_STRUCT(iv); aes_cfb8_encrypt(data, data, len, &key, iv, AES_ENCRYPT); } @@ -242,10 +240,9 @@ void netlogon_creds_aes_encrypt(struct netlogon_creds_CredentialState *creds, ui void netlogon_creds_aes_decrypt(struct netlogon_creds_CredentialState *creds, uint8_t *data, size_t len) { AES_KEY key; - uint8_t iv[AES_BLOCK_SIZE]; + uint8_t iv[AES_BLOCK_SIZE] = {0}; AES_set_encrypt_key(creds->session_key, 128, &key); - ZERO_STRUCT(iv); aes_cfb8_encrypt(data, data, len, &key, iv, AES_DECRYPT); } |