HMAC-BLAKE2: avoid clang-analyzer warnings about x_key being uninitialized

This commit is contained in:
Josh Holtrop
2026-01-18 22:20:14 -05:00
parent 90c8b5c80d
commit e90429dbb8
2 changed files with 16 additions and 8 deletions

View File

@@ -537,8 +537,10 @@ int wc_Blake2bHmacInit(Blake2b* b2b, const byte* key, size_t key_len)
XMEMSET(x_key + key_len, 0, BLAKE2B_BLOCKBYTES - key_len);
}
for (i = 0; i < BLAKE2B_BLOCKBYTES; ++i)
x_key[i] ^= 0x36U;
if (ret == 0) {
for (i = 0; i < BLAKE2B_BLOCKBYTES; ++i)
x_key[i] ^= 0x36U;
}
if (ret == 0)
ret = wc_InitBlake2b(b2b, BLAKE2B_OUTBYTES);
@@ -582,8 +584,10 @@ int wc_Blake2bHmacFinal(Blake2b* b2b, const byte* key, size_t key_len,
XMEMSET(x_key + key_len, 0, BLAKE2B_BLOCKBYTES - key_len);
}
for (i = 0; i < BLAKE2B_BLOCKBYTES; ++i)
x_key[i] ^= 0x5CU;
if (ret == 0) {
for (i = 0; i < BLAKE2B_BLOCKBYTES; ++i)
x_key[i] ^= 0x5CU;
}
if (ret == 0)
ret = wc_Blake2bFinal(b2b, out, 0);

View File

@@ -531,8 +531,10 @@ int wc_Blake2sHmacInit(Blake2s* b2s, const byte* key, size_t key_len)
XMEMSET(x_key + key_len, 0, BLAKE2S_BLOCKBYTES - key_len);
}
for (i = 0; i < BLAKE2S_BLOCKBYTES; ++i)
x_key[i] ^= 0x36U;
if (ret == 0) {
for (i = 0; i < BLAKE2S_BLOCKBYTES; ++i)
x_key[i] ^= 0x36U;
}
if (ret == 0)
ret = wc_InitBlake2s(b2s, BLAKE2S_OUTBYTES);
@@ -576,8 +578,10 @@ int wc_Blake2sHmacFinal(Blake2s* b2s, const byte* key, size_t key_len,
XMEMSET(x_key + key_len, 0, BLAKE2S_BLOCKBYTES - key_len);
}
for (i = 0; i < BLAKE2S_BLOCKBYTES; ++i)
x_key[i] ^= 0x5CU;
if (ret == 0) {
for (i = 0; i < BLAKE2S_BLOCKBYTES; ++i)
x_key[i] ^= 0x5CU;
}
if (ret == 0)
ret = wc_Blake2sFinal(b2s, out, 0);