wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2026-01-26 14:02:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

add _new/_delete API for ML-KEM/ML-DSA

Browse Source
This commit is contained in:
Masaki Iwai
2025-07-30 10:51:08 +09:00
committed by Masaki I.
parent a1e2ba2cd3
commit e9292e301f
5 changed files with 129 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
wolfcrypt/src/dilithium.c
View File

@@ -8488,6 +8488,52 @@ int wc_dilithium_verify_ctx_hash(const byte* sig, word32 sigLen,
}
#endif /* WOLFSSL_DILITHIUM_NO_VERIFY */
#ifndef WC_NO_CONSTRUCTORS
/**
* Create a new dilithium key object.
*
* heap [in] Dynamic memory hint.
* devId [in] Device Id.
* returns MEMORY_E when dynamic memory allocation fails
*/
dilithium_key* wc_dilithium_new(void* heap, int devId)
{
int ret;
dilithium_key* key = (dilithium_key*)XMALLOC(sizeof(dilithium_key), heap,
DYNAMIC_TYPE_DILITHIUM);
if (key != NULL) {
ret = wc_dilithium_init_ex(key, heap, devId);
if (ret != 0) {
XFREE(key, heap, DYNAMIC_TYPE_DILITHIUM);
key = NULL;
}
}
return key;
}
/**
* Delete and free a dilithium key object.
*
* key [in] dilithium key object to delete.
* key_p [in, out] Pointer to key pointer to set to NULL.
* returns BAD_FUNC_ARG when key is NULL
*/
int wc_dilithium_delete(dilithium_key* key, dilithium_key** key_p)
{
if (key == NULL)
return BAD_FUNC_ARG;
wc_dilithium_free(key);
XFREE(key, key->heap, DYNAMIC_TYPE_DILITHIUM);
if (key_p != NULL)
*key_p = NULL;
return 0;
}
#endif /* !WC_NO_CONSTRUCTORS */
/* Initialize the dilithium private/public key.
*
* key [in] Dilithium key.

54
wolfcrypt/src/wc_mlkem.c
View File

@@ -126,6 +126,60 @@ volatile sword16 mlkem_opt_blocker = 0;
/******************************************************************************/
#ifndef WC_NO_CONSTRUCTORS
/**
* Create a new ML-KEM key object.
*
* Allocates and initializes a ML-KEM key object.
*
* @param [in] type Type of key:
* WC_ML_KEM_512, WC_ML_KEM_768, WC_ML_KEM_1024,
* KYBER512, KYBER768, KYBER1024.
* @param [in] heap Dynamic memory hint.
* @param [in] devId Device Id.
* @return Pointer to new MlKemKey object, or NULL on failure.
*/
MlKemKey* wc_MlKemKey_New(int type, void* heap, int devId)
{
int ret;
MlKemKey* key = (MlKemKey*)XMALLOC(sizeof(MlKemKey), heap,
DYNAMIC_TYPE_TMP_BUFFER);
if (key != NULL) {
ret = wc_MlKemKey_Init(key, type, heap, devId);
if (ret != 0) {
XFREE(key, heap, DYNAMIC_TYPE_TMP_BUFFER);
key = NULL;
}
}
return key;
}
/**
* Delete and free a ML-KEM key object.
*
* Frees resources associated with a ML-KEM key object and sets pointer to NULL.
*
* @param [in] key ML-KEM key object to delete.
* @param [in, out] key_p Pointer to key pointer to set to NULL.
* @return 0 on success.
* @return BAD_FUNC_ARG when key is NULL.
*/
int wc_MlKemKey_Delete(MlKemKey* key, MlKemKey** key_p)
{
if (key == NULL)
return BAD_FUNC_ARG;
wc_MlKemKey_Free(key);
XFREE(key, key->heap, DYNAMIC_TYPE_TMP_BUFFER);
if (key_p != NULL)
*key_p = NULL;
return 0;
}
#endif /* !WC_NO_CONSTRUCTORS */
/**
* Initialize the Kyber key.
*

21
wolfcrypt/test/test.c
View File

@@ -43480,6 +43480,9 @@ WOLFSSL_TEST_SUBROUTINE wc_test_ret_t mlkem_test(void)
#endif
#endif
#endif
#endif
#ifdef WOLFSSL_WC_MLKEM
MlKemKey *tmpKey = NULL;
#endif
int key_inited = 0;
static const int testData[][4] = {
@@ -43628,6 +43631,15 @@ WOLFSSL_TEST_SUBROUTINE wc_test_ret_t mlkem_test(void)
if (XMEMCMP(priv, priv2, testData[i][2]) != 0)
ERROR_OUT(WC_TEST_RET_ENC_I(i), out);
#ifdef WOLFSSL_WC_MLKEM
tmpKey = wc_MlKemKey_New(testData[i][0], HEAP_HINT, INVALID_DEVID);
if (tmpKey == NULL)
ERROR_OUT(WC_TEST_RET_ENC_EC(ret), out);
ret = wc_MlKemKey_Delete(tmpKey, &tmpKey);
if (ret != 0)
ERROR_OUT(WC_TEST_RET_ENC_I(i), out);
#endif
#endif
}
@@ -46865,6 +46877,7 @@ static wc_test_ret_t dilithium_param_test(int param, WC_RNG* rng)
#ifndef WOLFSSL_DILITHIUM_NO_VERIFY
int res = 0;
#endif
dilithium_key* tmpKey = NULL;
#endif
#if defined(WOLFSSL_SMALL_STACK) && !defined(WOLFSSL_NO_MALLOC)
@@ -46910,6 +46923,14 @@ static wc_test_ret_t dilithium_param_test(int param, WC_RNG* rng)
#endif
#endif
tmpKey = wc_dilithium_new(HEAP_HINT, INVALID_DEVID);
if (tmpKey == NULL)
ERROR_OUT(WC_TEST_RET_ENC_EC(ret), out);
ret = wc_dilithium_delete(tmpKey, &tmpKey);
if (ret != 0)
ERROR_OUT(WC_TEST_RET_ENC_EC(ret), out);
out:
wc_dilithium_free(key);
#if defined(WOLFSSL_SMALL_STACK) && !defined(WOLFSSL_NO_MALLOC)

5
wolfssl/wolfcrypt/dilithium.h
View File

@@ -788,6 +788,11 @@ int wc_dilithium_verify_ctx_hash(const byte* sig, word32 sigLen,
const byte* ctx, word32 ctxLen, int hashAlg, const byte* hash,
word32 hashLen, int* res, dilithium_key* key);
WOLFSSL_API
dilithium_key* wc_dilithium_new(void* heap, int devId);
WOLFSSL_API
int wc_dilithium_delete(dilithium_key* key, dilithium_key** key_p);
WOLFSSL_API
int wc_dilithium_init(dilithium_key* key);

3
wolfssl/wolfcrypt/mlkem.h
View File

@@ -313,6 +313,9 @@ typedef struct MlKemKey MlKemKey;
extern "C" {
#endif
WOLFSSL_API MlKemKey* wc_MlKemKey_New(int type, void* heap, int devId);
WOLFSSL_API int wc_MlKemKey_Delete(MlKemKey* key, MlKemKey** key_p);
WOLFSSL_API int wc_MlKemKey_Init(MlKemKey* key, int type, void* heap,
int devId);
WOLFSSL_API int wc_MlKemKey_Free(MlKemKey* key);