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

Merge pull request #10206 from Frauschi/mlkem-dynamic-key-2

Browse Source 
Store the size of the allocated private key buffer for ML-KEM
This commit is contained in:
David Garske
2026-04-14 09:15:10 -07:00
committed by GitHub
parent 9176185d66 17ba0c252a
commit c01eca5fc8
2 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
wolfcrypt/src/wc_mlkem.c
+10 -8
View File
@@ -232,16 +232,18 @@ static int mlkemkey_get_k(const MlKemKey* key)
*/
static int mlkemkey_alloc_priv(MlKemKey* key, unsigned int k)
{
word32 sz = (word32)(k * MLKEM_N * sizeof(sword16));
if (key->priv != NULL) {
ForceZero(key->priv, k * MLKEM_N * sizeof(sword16));
ForceZero(key->priv, key->privAllocSz);
XFREE(key->priv, key->heap, DYNAMIC_TYPE_TMP_BUFFER);
key->priv = NULL;
key->privAllocSz = 0;
}
key->priv = (sword16*)XMALLOC(k * MLKEM_N * sizeof(sword16), key->heap,
DYNAMIC_TYPE_TMP_BUFFER);
key->priv = (sword16*)XMALLOC(sz, key->heap, DYNAMIC_TYPE_TMP_BUFFER);
if (key->priv == NULL) {
return MEMORY_E;
}
key->privAllocSz = sz;
return 0;
}
@@ -434,6 +436,7 @@ int wc_MlKemKey_Init(MlKemKey* key, int type, void* heap, int devId)
#ifdef WOLFSSL_MLKEM_DYNAMIC_KEYS
key->priv = NULL;
key->pub = NULL;
key->privAllocSz = 0;
#ifdef WOLFSSL_MLKEM_CACHE_A
key->a = NULL;
#endif
@@ -539,11 +542,10 @@ int wc_MlKemKey_Free(MlKemKey* key)
ForceZero(&key->prf, sizeof(key->prf));
#ifdef WOLFSSL_MLKEM_DYNAMIC_KEYS
if (key->priv != NULL) {
int k = mlkemkey_get_k(key);
ForceZero(key->priv,
(word32)(k * MLKEM_N) * (word32)sizeof(sword16));
ForceZero(key->priv, key->privAllocSz);
XFREE(key->priv, key->heap, DYNAMIC_TYPE_TMP_BUFFER);
key->priv = NULL;
key->privAllocSz = 0;
}
if (key->pub != NULL) {
XFREE(key->pub, key->heap, DYNAMIC_TYPE_TMP_BUFFER);
@@ -2015,7 +2017,7 @@ int wc_MlKemKey_DecodePrivateKey(MlKemKey* key, const unsigned char* in,
/* Compute the hash of the public key. */
ret = MLKEM_HASH_H(&key->hash, p, pubLen, key->h);
if (ret != 0) {
ForceZero(key->priv, k * MLKEM_N);
ForceZero(key->priv, k * MLKEM_N * sizeof(sword16));
}
}
@@ -2023,7 +2025,7 @@ int wc_MlKemKey_DecodePrivateKey(MlKemKey* key, const unsigned char* in,
p += pubLen;
/* Compare computed public key hash with stored hash */
if (XMEMCMP(key->h, p, WC_ML_KEM_SYM_SZ) != 0) {
ForceZero(key->priv, k * MLKEM_N);
ForceZero(key->priv, k * MLKEM_N * sizeof(sword16));
ret = MLKEM_PUB_HASH_E;
}
}
wolfssl/wolfcrypt/wc_mlkem.h
+4
View File
@@ -104,6 +104,10 @@ enum {
struct MlKemKey {
/* Type of key: WC_ML_KEM_512, WC_ML_KEM_768, WC_ML_KEM_1024 */
int type;
#ifdef WOLFSSL_MLKEM_DYNAMIC_KEYS
/* Allocated size of priv buffer in bytes. */
word32 privAllocSz;
#endif
/* Dynamic memory allocation hint. */
void* heap;
#if defined(WOLF_CRYPTO_CB)