wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2026-07-10 07:00:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

Improve the TLS v1.3 expand key label warning for possible use of uninitialized "hash".

Browse Source
This commit is contained in:
David Garske
2023-12-27 09:52:56 -08:00
parent d9ac8b5422
commit b86dfffdbe
2 changed files with 27 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
wolfcrypt/src/kdf.c
+15 -9
View File
@@ -485,17 +485,23 @@ int wc_PRF_TLS(byte* digest, word32 digLen, const byte* secret, word32 secLen,
data[idx++] = (byte)okmLen;
/* Length of protocol | label. */
data[idx++] = (byte)(protocolLen + labelLen);
/* Protocol */
XMEMCPY(&data[idx], protocol, protocolLen);
idx += protocolLen;
/* Label */
XMEMCPY(&data[idx], label, labelLen);
idx += labelLen;
if (protocolLen > 0) {
/* Protocol */
XMEMCPY(&data[idx], protocol, protocolLen);
idx += protocolLen;
}
if (labelLen > 0) {
/* Label */
XMEMCPY(&data[idx], label, labelLen);
idx += labelLen;
}
/* Length of hash of messages */
data[idx++] = (byte)infoLen;
/* Hash of messages */
XMEMCPY(&data[idx], info, infoLen);
idx += infoLen;
if (infoLen > 0) {
/* Hash of messages */
XMEMCPY(&data[idx], info, infoLen);
idx += infoLen;
}
#ifdef WOLFSSL_CHECK_MEM_ZERO
wc_MemZero_Add("wc_Tls13_HKDF_Expand_Label data", data, idx);