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

Address pr comments.

Browse Source
This commit is contained in:
Thomas Cook
2026-06-05 12:55:18 -04:00
parent 2e9fe0e3b7
commit 8945f2bde8
2 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
wolfcrypt/src/hmac.c
+15 -15
View File
@@ -1832,35 +1832,35 @@ int wolfSSL_GetHmacMaxSize(void)
word32 hashSz;
byte n = 0x1;
if (inKey == NULL || out == NULL)
return BAD_FUNC_ARG;
ret = wc_HmacSizeByType(type);
if (ret < 0)
return ret;
hashSz = (word32)ret;
/* RFC 5869 states that the length of output keying material in
* octets must be L <= 255*HashLen or N = ceil(L/HashLen) */
if (outSz/hashSz + ((outSz % hashSz) != 0) > 255)
return BAD_FUNC_ARG;
#ifdef WOLF_CRYPTO_CB
/* Try crypto callback first for complete operation */
if (devId != INVALID_DEVID) {
ret = wc_CryptoCb_Hkdf_Expand(type, inKey, inKeySz, info, infoSz,
ret = wc_CryptoCb_Hkdf_Expand(type, inKey, inKeySz, info, infoSz,
out, outSz, devId);
if (ret != WC_NO_ERR_TRACE(CRYPTOCB_UNAVAILABLE))
return ret;
}
#endif
ret = wc_HmacSizeByType(type);
if (ret < 0) {
return ret;
}
hashSz = (word32)ret;
/* RFC 5869 states that the length of output keying material in
* octets must be L <= 255*HashLen or N = ceil(L/HashLen) */
if (out == NULL || ((outSz/hashSz) + ((outSz % hashSz) != 0)) > 255) {
return BAD_FUNC_ARG;
}
WC_ALLOC_VAR_EX(myHmac, Hmac, 1, NULL, DYNAMIC_TYPE_HMAC,
return MEMORY_E);
ret = wc_HmacInit(myHmac, heap, devId);
if (ret != 0) {
WC_FREE_VAR_EX(myHmac, NULL, DYNAMIC_TYPE_HMAC);
WC_FREE_VAR_EX(myHmac, NULL, DYNAMIC_TYPE_HMAC);
return ret;
}
wolfssl/wolfcrypt/types.h
+3 -3
View File
@@ -1440,9 +1440,9 @@ enum wc_AlgoType {
enum wc_KdfType {
WC_KDF_TYPE_NONE = 0,
WC_KDF_TYPE_HKDF = 1,
WC_KDF_TYPE_HKDF_EXTRACT = 2,
WC_KDF_TYPE_HKDF_EXPAND = 3,
WC_KDF_TYPE_TWOSTEP_CMAC = 4 /* NIST SP 800-56C two-step cmac kdf. */
WC_KDF_TYPE_TWOSTEP_CMAC = 2, /* NIST SP 800-56C two-step cmac kdf. */
WC_KDF_TYPE_HKDF_EXTRACT = 3,
WC_KDF_TYPE_HKDF_EXPAND = 4
/* Future: WC_KDF_TYPE_PBKDF2 = 5, WC_KDF_TYPE_SCRYPT = 6, etc. */
};