Skip to content

Extend/Add label/id extension functions #10072

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
night1rider wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Extend/Add label/id extension functions #10072

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3e112a3
Extend CMAC API to pull in label/id extension functions to pass down …
night1rider Mar 4, 2026
ebdbc8e
Add WC_TEST_SKIP_RSA_PRIVATE_EXPORT to test.c
night1rider Mar 26, 2026
c74f01a
change WC_TEST_NO_ECC_CHECK_KEY to WC_TEST_SKIP_ECC_CHECK_KEY
night1rider Mar 26, 2026
48e8442
Add test/bench_AesEcbInit helper
night1rider Mar 27, 2026
88396d7
Fix -Wcast-qual errors in _Label functions by making _common helpers …
night1rider Apr 6, 2026
8b49e0a
Fix -Wcast-qual errors by replacing void* with typed id/label params …
night1rider Apr 6, 2026
24c40b5
reset ret after CRYPTOCB_UNAVAILABLE fall-through in _InitCmac_common…
night1rider Apr 9, 2026
3fa0fb7
Add (void)ret after CRYPTOCB_UNAVAILABLE fall-through reset in _InitC…
night1rider Apr 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
167 changes: 155 additions & 12 deletions wolfcrypt/benchmark/benchmark.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4993,6 +4993,145 @@ void bench_rng(void)
#endif /* WC_NO_RNG */


/* ============================================================================
* Benchmark init helpers -- use id[] when WC_TEST_*_ID is defined and
* useDeviceID is true, else plain init.
* ========================================================================= */

/* --- AES CBC --- */
#if !defined(NO_AES) && defined(HAVE_AES_CBC)
#if defined(WOLF_PRIVATE_KEY_ID) && defined(WC_TEST_AES_CBC_ID)
static unsigned char benchAesCbcId[] = WC_TEST_AES_CBC_ID;
static int benchAesCbcIdLen = (int)sizeof(benchAesCbcId);
#endif

static WC_MAYBE_UNUSED int bench_AesCbcInit(Aes* aes, void* heap,
int declaredDevId)
{
#if defined(WOLF_PRIVATE_KEY_ID) && defined(WC_TEST_AES_CBC_ID)
return wc_AesInit_Id(aes, benchAesCbcId, benchAesCbcIdLen, heap,
declaredDevId);
#else
return wc_AesInit(aes, heap, declaredDevId);
#endif
}
#endif /* !NO_AES && HAVE_AES_CBC */

/* --- AES GCM --- */
#if !defined(NO_AES) && defined(HAVE_AESGCM)
#if defined(WOLF_PRIVATE_KEY_ID) && defined(WC_TEST_AES_GCM_ID)
static unsigned char benchAesGcmId[] = WC_TEST_AES_GCM_ID;
static int benchAesGcmIdLen = (int)sizeof(benchAesGcmId);
#endif

static WC_MAYBE_UNUSED int bench_AesGcmInit(Aes* aes, void* heap,
int declaredDevId)
{
#if defined(WOLF_PRIVATE_KEY_ID) && defined(WC_TEST_AES_GCM_ID)
return wc_AesInit_Id(aes, benchAesGcmId, benchAesGcmIdLen, heap,
declaredDevId);
#else
return wc_AesInit(aes, heap, declaredDevId);
#endif
}
#endif /* !NO_AES && HAVE_AESGCM */

/* --- RSA --- */
#if !defined(NO_RSA)
#if defined(WOLF_PRIVATE_KEY_ID) && defined(WC_TEST_RSA_PRIV_ID)
static unsigned char benchRsaPrivId[] = WC_TEST_RSA_PRIV_ID;
static int benchRsaPrivIdLen = (int)sizeof(benchRsaPrivId);
#endif

static WC_MAYBE_UNUSED int bench_RsaInit(RsaKey* key, void* heap,
int declaredDevId)
{
#if defined(WOLF_PRIVATE_KEY_ID) && defined(WC_TEST_RSA_PRIV_ID)
return wc_InitRsaKey_Id(key, benchRsaPrivId, benchRsaPrivIdLen, heap,
declaredDevId);
#else
return wc_InitRsaKey_ex(key, heap, declaredDevId);
#endif
}
#endif /* !NO_RSA */

/* --- CMAC --- */
#ifdef WOLFSSL_CMAC
#if defined(WOLF_PRIVATE_KEY_ID) && defined(WC_TEST_CMAC_ID)
static unsigned char benchCmacId[] = WC_TEST_CMAC_ID;
static int benchCmacIdLen = (int)sizeof(benchCmacId);
#endif

static WC_MAYBE_UNUSED int bench_CmacInit(Cmac* cmac, const byte* key,
word32 keySz, int type,
void* unused, void* heap,
int declaredDevId)
{
#if defined(WOLF_PRIVATE_KEY_ID) && defined(WC_TEST_CMAC_ID)
return wc_InitCmac_Id(cmac, key, keySz, type, unused,
benchCmacId, benchCmacIdLen, heap, declaredDevId);
#elif !defined(HAVE_FIPS)
return wc_InitCmac_ex(cmac, key, keySz, type, unused, heap, declaredDevId);
#else
(void)heap;
(void)declaredDevId;
return wc_InitCmac(cmac, key, keySz, type, unused);
#endif
}
#endif /* WOLFSSL_CMAC */

/* --- AES ECB --- */
#if defined(HAVE_AES_ECB) || \
(defined(HAVE_FIPS) && defined(WOLFSSL_AES_DIRECT))
#if defined(WOLF_PRIVATE_KEY_ID) && defined(WC_TEST_AES_ECB_ID)
static unsigned char benchAesEcbId[] = WC_TEST_AES_ECB_ID;
static int benchAesEcbIdLen = (int)sizeof(benchAesEcbId);
#endif

static WC_MAYBE_UNUSED int bench_AesEcbInit(Aes* aes, void* heap,
int declaredDevId)
{
#if defined(WOLF_PRIVATE_KEY_ID) && defined(WC_TEST_AES_ECB_ID)
return wc_AesInit_Id(aes, benchAesEcbId, benchAesEcbIdLen, heap,
declaredDevId);
#else
return wc_AesInit(aes, heap, declaredDevId);
#endif
}
#endif /* HAVE_AES_ECB || (HAVE_FIPS && WOLFSSL_AES_DIRECT) */

/* --- ECC --- */
#ifdef HAVE_ECC
#if defined(WOLF_PRIVATE_KEY_ID) && defined(WC_TEST_ECC_PAIR_P256_ID)
static unsigned char benchEccPairP256Id[] = WC_TEST_ECC_PAIR_P256_ID;
static int benchEccPairP256IdLen = (int)sizeof(benchEccPairP256Id);
#endif
#if defined(WOLF_PRIVATE_KEY_ID) && defined(WC_TEST_ECC_PAIR_P521_ID)
static unsigned char benchEccPairP521Id[] = WC_TEST_ECC_PAIR_P521_ID;
static int benchEccPairP521IdLen = (int)sizeof(benchEccPairP521Id);
#endif

static WC_MAYBE_UNUSED int bench_EccInit_Pair(ecc_key* key, int keySize,
void* heap, int declaredDevId)
{
#if defined(WOLF_PRIVATE_KEY_ID) && defined(WC_TEST_ECC_PAIR_P256_ID)
if (keySize == 32) {
return wc_ecc_init_id(key, benchEccPairP256Id,
benchEccPairP256IdLen, heap, declaredDevId);
}
#endif
#if defined(WOLF_PRIVATE_KEY_ID) && defined(WC_TEST_ECC_PAIR_P521_ID)
if (keySize == 66) {
return wc_ecc_init_id(key, benchEccPairP521Id,
benchEccPairP521IdLen, heap, declaredDevId);
}
#endif
(void)keySize;
return wc_ecc_init_ex(key, heap, declaredDevId);
}
#endif /* HAVE_ECC */


#ifndef NO_AES

#ifdef HAVE_AES_CBC
Expand All @@ -5016,8 +5155,9 @@ static void bench_aescbc_internal(int useDeviceID,

/* init keys */
for (i = 0; i < BENCH_MAX_PENDING; i++) {
if ((ret = wc_AesInit(enc[i], HEAP_HINT,
useDeviceID ? devId: INVALID_DEVID)) != 0) {
ret = bench_AesCbcInit(enc[i], HEAP_HINT,
useDeviceID ? devId : INVALID_DEVID);
if (ret != 0) {
printf("AesInit failed at L%d, ret = %d\n", __LINE__, ret);
goto exit;
}
Expand Down Expand Up @@ -5085,8 +5225,8 @@ static void bench_aescbc_internal(int useDeviceID,

/* init keys */
for (i = 0; i < BENCH_MAX_PENDING; i++) {
ret = wc_AesInit(enc[i], HEAP_HINT,
useDeviceID ? devId: INVALID_DEVID);
ret = bench_AesCbcInit(enc[i], HEAP_HINT,
useDeviceID ? devId : INVALID_DEVID);
if (ret != 0) {
printf("AesInit failed at L%d, ret = %d\n", __LINE__, ret);
goto exit;
Expand Down Expand Up @@ -5207,8 +5347,9 @@ static void bench_aesgcm_internal(int useDeviceID,

/* init keys */
for (i = 0; i < BENCH_MAX_PENDING; i++) {
if ((ret = wc_AesInit(enc[i], HEAP_HINT,
useDeviceID ? devId: INVALID_DEVID)) != 0) {
ret = bench_AesGcmInit(enc[i], HEAP_HINT,
useDeviceID ? devId : INVALID_DEVID);
if (ret != 0) {
printf("AesInit failed at L%d, ret = %d\n", __LINE__, ret);
goto exit;
}
Expand Down Expand Up @@ -5292,8 +5433,9 @@ static void bench_aesgcm_internal(int useDeviceID,

/* init keys */
for (i = 0; i < BENCH_MAX_PENDING; i++) {
if ((ret = wc_AesInit(dec[i], HEAP_HINT,
useDeviceID ? devId: INVALID_DEVID)) != 0) {
ret = bench_AesGcmInit(dec[i], HEAP_HINT,
useDeviceID ? devId : INVALID_DEVID);
if (ret != 0) {
printf("AesInit failed at L%d, ret = %d\n", __LINE__, ret);
goto exit;
}
Expand Down Expand Up @@ -5705,7 +5847,7 @@ static void bench_aesecb_internal(int useDeviceID,

/* init keys */
for (i = 0; i < BENCH_MAX_PENDING; i++) {
if ((ret = wc_AesInit(enc[i], HEAP_HINT,
if ((ret = bench_AesEcbInit(enc[i], HEAP_HINT,
useDeviceID ? devId: INVALID_DEVID)) != 0) {
printf("AesInit failed at L%d, ret = %d\n", __LINE__, ret);
goto exit;
Expand Down Expand Up @@ -9100,7 +9242,7 @@ static void bench_cmac_helper(word32 keySz, const char* outMsg, int useDeviceID)
#ifdef HAVE_FIPS
ret = wc_InitCmac(&cmac, bench_key, keySz, WC_CMAC_AES, NULL);
#else
ret = wc_InitCmac_ex(&cmac, bench_key, keySz, WC_CMAC_AES, NULL,
ret = bench_CmacInit(&cmac, bench_key, keySz, WC_CMAC_AES, NULL,
HEAP_HINT, useDeviceID ? devId : INVALID_DEVID);
#endif
if (ret != 0) {
Expand Down Expand Up @@ -10164,7 +10306,7 @@ void bench_rsa(int useDeviceID)
/* init keys */
for (i = 0; i < BENCH_MAX_PENDING; i++) {
/* setup an async context for each key */
ret = wc_InitRsaKey_ex(rsaKey[i], HEAP_HINT,
ret = bench_RsaInit(rsaKey[i], HEAP_HINT,
useDeviceID ? devId : INVALID_DEVID);
if (ret < 0) {
goto exit;
Expand Down Expand Up @@ -12348,7 +12490,8 @@ void bench_ecc(int useDeviceID, int curveId)
/* init keys */
for (i = 0; i < BENCH_MAX_PENDING; i++) {
/* setup an context for each key */
if ((ret = wc_ecc_init_ex(genKey[i], HEAP_HINT, deviceID)) < 0) {
if ((ret = bench_EccInit_Pair(genKey[i], keySize, HEAP_HINT,
deviceID)) < 0) {
goto exit;
}
ret = wc_ecc_make_key_ex(&gRng, keySize, genKey[i], curveId);
Expand Down
69 changes: 66 additions & 3 deletions wolfcrypt/src/aes.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13559,27 +13559,90 @@ int wc_AesCcmEncrypt_ex(Aes* aes, byte* out, const byte* in, word32 sz,
#endif /* HAVE_AESCCM */

#ifndef WC_NO_CONSTRUCTORS
Aes* wc_AesNew(void* heap, int devId, int *result_code)

#define AES_NEW_INIT_PLAIN 0
#ifdef WOLF_PRIVATE_KEY_ID
#define AES_NEW_INIT_ID 1
#define AES_NEW_INIT_LABEL 2
#endif

static Aes* _AesNew_common(void* heap, int devId, int *result_code,
int aesInitType, unsigned char* id,
int idLen, const char* label)
{
int ret;
Aes* aes = (Aes*)XMALLOC(sizeof(Aes), heap, DYNAMIC_TYPE_AES);
if (aes == NULL) {
ret = MEMORY_E;
}
else {
ret = wc_AesInit(aes, heap, devId);
switch (aesInitType) {
#ifdef WOLF_PRIVATE_KEY_ID
case AES_NEW_INIT_ID:
if (id == NULL || idLen == 0 || label != NULL) {
ret = BAD_FUNC_ARG;
}
else {
ret = wc_AesInit_Id(aes, id, idLen, heap, devId);
}
break;
case AES_NEW_INIT_LABEL:
if (label == NULL || id != NULL || idLen != 0) {
ret = BAD_FUNC_ARG;
}
else {
ret = wc_AesInit_Label(aes, label, heap, devId);
}
break;
#endif
default:
if (id != NULL || idLen != 0 || label != NULL) {
ret = BAD_FUNC_ARG;
}
else {
ret = wc_AesInit(aes, heap, devId);
}
break;
}
if (ret != 0) {
XFREE(aes, heap, DYNAMIC_TYPE_AES);
aes = NULL;
}
}
(void)aesInitType;
(void)id;
(void)idLen;
(void)label;

if (result_code != NULL)
if (result_code != NULL) {
*result_code = ret;
}

return aes;
}

Aes* wc_AesNew(void* heap, int devId, int *result_code)
{
return _AesNew_common(heap, devId, result_code,
AES_NEW_INIT_PLAIN, NULL, 0, NULL);
}

#ifdef WOLF_PRIVATE_KEY_ID
Aes* wc_AesNew_Id(unsigned char* id, int len, void* heap, int devId,
int *result_code)
{
return _AesNew_common(heap, devId, result_code,
AES_NEW_INIT_ID, id, len, NULL);
}

Aes* wc_AesNew_Label(const char* label, void* heap, int devId,
int *result_code)
{
return _AesNew_common(heap, devId, result_code,
AES_NEW_INIT_LABEL, NULL, 0, label);
}
#endif /* WOLF_PRIVATE_KEY_ID */

int wc_AesDelete(Aes *aes, Aes** aes_p)
{
if (aes == NULL)
Expand Down
Loading
Loading