Skip to content

Fix Fenrir Issues in wolfProvider extend test suite coverage #377

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
aidangarske wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix Fenrir Issues in wolfProvider extend test suite coverage #377

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4ae7cc0
Fix fenrir issues 169, 170, 171, 172, 271, 395, 396, 510, 511, 512, 5…
aidangarske Mar 23, 2026
4232f8f
Add unit tests to exercise new code paths
aidangarske Mar 24, 2026
3f19fab
Fix CI, Fenrir, and Copilot
aidangarske Mar 24, 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
4 changes: 4 additions & 0 deletions src/wp_aes_aead.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1688,6 +1688,10 @@ static void *wp_aes_gcm_newctx(WOLFPROV_CTX* provCtx, size_t keyBits)
*/
static void wp_aes_gcm_freectx(wp_AeadCtx* ctx)
{
OPENSSL_free(ctx->aad);
#if defined(WP_HAVE_AESGCM) && !defined(WOLFSSL_AESGCM_STREAM)
OPENSSL_free(ctx->in);
#endif
wc_AesFree(&ctx->aes);
OPENSSL_free(ctx);
}
Expand Down
23 changes: 12 additions & 11 deletions src/wp_aes_block.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -866,21 +866,22 @@ static int wp_aes_block_final_dec(wp_AesBlockCtx* ctx, unsigned char *out,

if (ok && ctx->pad) {
unsigned char pad;
unsigned char invalid;
unsigned char i;

pad = ctx->buf[AES_BLOCK_SIZE - 1];
if ((pad == 0) || (pad > AES_BLOCK_SIZE)) {
invalid = wp_ct_byte_mask_eq(pad, 0) |
~wp_ct_int_mask_gte(AES_BLOCK_SIZE, (int)pad);
for (i = 0; i < AES_BLOCK_SIZE; i++) {
unsigned char mask = wp_ct_int_mask_gte((int)i,
AES_BLOCK_SIZE - (int)pad);
invalid |= mask & wp_ct_byte_mask_ne(ctx->buf[i], pad);
}
if (invalid) {
ok = 0;
}
if (ok) {
unsigned char len = AES_BLOCK_SIZE;
unsigned char i;

for (i = 0; i < pad; i++) {
if (ctx->buf[--len] != pad) {
return 0;
}
}
ctx->bufSz = len;
else {
ctx->bufSz = AES_BLOCK_SIZE - pad;
}
}

Expand Down
15 changes: 7 additions & 8 deletions src/wp_cmac.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,14 +162,13 @@ static wp_CmacCtx* wp_cmac_dup(wp_CmacCtx* src)
dst = wp_cmac_new(NULL);
}
if (dst != NULL) {
*dst = *src;
dst->keyLen = 0;

if ((src->keyLen != 0) &&
(!wp_cmac_set_key(dst, src->key, src->keyLen, 0))) {
wp_cmac_free(dst);
dst = NULL;
}
/* Copy the entire context to preserve in-progress CMAC state. */
XMEMCPY(&dst->cmac, &src->cmac, sizeof(Cmac));
dst->type = src->type;
dst->size = src->size;
dst->expKeySize = src->expKeySize;
XMEMCPY(dst->key, src->key, src->keyLen);
dst->keyLen = src->keyLen;
Comment thread
aidangarske marked this conversation as resolved.
Outdated
}

return dst;
Expand Down
34 changes: 20 additions & 14 deletions src/wp_des.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,10 +418,15 @@ static int wp_des3_block_update(wp_Des3BlockCtx *ctx, unsigned char *out,
int i;
unsigned char off = inLen % DES_BLOCK_SIZE;
unsigned char pad = DES_BLOCK_SIZE - off - 1;
for (i = off; i < DES_BLOCK_SIZE; i++) {
out[inLen - off + i] = pad;
if (outSize < inLen + pad + 1) {
ok = 0;
}
if (ok) {
for (i = off; i < DES_BLOCK_SIZE; i++) {
out[inLen - off + i] = pad;
}
inLen += pad + 1;
}
inLen += pad + 1;
}
if (ctx->bufSz != 0) {
size_t len = DES_BLOCK_SIZE - ctx->bufSz;
Expand Down Expand Up @@ -578,21 +583,22 @@ static int wp_des3_block_final_dec(wp_Des3BlockCtx* ctx, unsigned char *out,

if (ok && ctx->pad) {
unsigned char pad;
unsigned char invalid;
unsigned char i;

pad = ctx->buf[DES_BLOCK_SIZE - 1];
if ((pad == 0) || (pad > DES_BLOCK_SIZE)) {
invalid = wp_ct_byte_mask_eq(pad, 0) |
~wp_ct_int_mask_gte(DES_BLOCK_SIZE, (int)pad);
for (i = 0; i < DES_BLOCK_SIZE; i++) {
unsigned char mask = wp_ct_int_mask_gte((int)i,
DES_BLOCK_SIZE - (int)pad);
invalid |= mask & wp_ct_byte_mask_ne(ctx->buf[i], pad);
}
if (invalid) {
ok = 0;
}
if (ok) {
unsigned char len = DES_BLOCK_SIZE;
unsigned char i;

for (i = 0; i < pad; i++) {
if (ctx->buf[--len] != pad) {
return 0;
}
}
ctx->bufSz = len;
else {
ctx->bufSz = DES_BLOCK_SIZE - pad;
}
}

Expand Down
15 changes: 4 additions & 11 deletions src/wp_dh_kmgmt.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,7 +453,7 @@ void wp_dh_free(wp_Dh* dh)
if (cnt == 0) {
/* No more references to this object. */
OPENSSL_free(dh->pub);
OPENSSL_free(dh->priv);
OPENSSL_clear_free(dh->priv, dh->privSz);
#ifndef WP_SINGLE_THREADED
wc_FreeMutex(&dh->mutex);
#endif
Expand Down Expand Up @@ -730,6 +730,9 @@ static int wp_dh_get_params_encoded_public_key(wp_Dh* dh, OSSL_PARAM params[])
if (p->data_size < outLen) {
ok = 0;
}
if (ok && (dh->pubSz > outLen)) {
ok = 0;
}
if (ok) {
unsigned char* data = p->data;
size_t padSz = outLen - dh->pubSz;
Expand Down Expand Up @@ -863,16 +866,6 @@ static int wp_dh_get_params(wp_Dh* dh, OSSL_PARAM params[])
}
}
}
if (ok) {
/* Only call if we haven't already handled OSSL_PKEY_PARAM_PRIV_KEY */
p = OSSL_PARAM_locate(params, OSSL_PKEY_PARAM_PRIV_KEY);
if (p == NULL || p->data != NULL) {
if (!wp_params_set_octet_string_be(params, OSSL_PKEY_PARAM_PRIV_KEY,
dh->priv, dh->privSz)) {
ok = 0;
}
}
}
if (ok && (!wp_dh_get_params_encoded_public_key(dh, params))) {
ok = 0;
}
Expand Down
66 changes: 48 additions & 18 deletions src/wp_drbg.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,29 +334,53 @@ static int wp_drbg_reseed(wp_DrbgCtx* ctx, int predResist,
const unsigned char* addIn, size_t addInLen)
{
int ok = 1;
int rc;
unsigned char *seed = NULL;
size_t seedLen = 0;

WOLFPROV_ENTER(WP_LOG_COMP_RNG, "wp_drbg_reseed");

#if 0
/* Calling Hash_DRBG_Instantiate would be better. */
int rc;
rc = wc_RNG_DRBG_Reseed(ctx->rng, entropy, entropyLen);
if (rc != 0) {
ok = 0;
/* If no entropy provided, get fresh entropy from the OS source. */
if (entropy == NULL || entropyLen == 0) {
seedLen = 48;
seed = OPENSSL_malloc(seedLen);
if (seed == NULL) {
ok = 0;
}
if (ok) {
OS_Seed osSeed;
rc = wc_GenerateSeed(&osSeed, seed, (word32)seedLen);
if (rc != 0) {
ok = 0;
}
else {
entropy = seed;
entropyLen = seedLen;
}
}
}
Comment thread
aidangarske marked this conversation as resolved.
if (ok && (addInLen > 0)) {
rc = wc_RNG_DRBG_Reseed(ctx->rng, addIn, addInLen);

if (ok && entropy != NULL && entropyLen > 0) {
rc = wc_RNG_DRBG_Reseed(ctx->rng, entropy, (word32)entropyLen);
if (rc != 0) {
WOLFPROV_MSG_DEBUG_RETCODE(WP_LOG_COMP_RNG,
"wc_RNG_DRBG_Reseed", rc);
ok = 0;
}
}
if (ok && (addInLen > 0) && (addIn != NULL)) {
rc = wc_RNG_DRBG_Reseed(ctx->rng, addIn, (word32)addInLen);
if (rc != 0) {
WOLFPROV_MSG_DEBUG_RETCODE(WP_LOG_COMP_RNG,
"wc_RNG_DRBG_Reseed", rc);
ok = 0;
}
}
#else
(void)ctx;
(void)entropy;
(void)entropyLen;
(void)addIn;
(void)addInLen;
#endif

/* Clear seed from parent if we obtained one. */
if (seed != NULL && ctx->parentClearSeed != NULL) {
ctx->parentClearSeed(ctx->parent, seed, seedLen);
}
Comment thread
aidangarske marked this conversation as resolved.
Outdated

(void)predResist;

Expand Down Expand Up @@ -388,6 +412,7 @@ static int wp_drbg_enable_locking(wp_DrbgCtx* ctx)
if (rc != 0) {
WOLFPROV_MSG_DEBUG_RETCODE(WP_LOG_COMP_RNG, "wc_InitMutex", rc);
OPENSSL_free(ctx->mutex);
ctx->mutex = NULL;
ok = 0;
}
}
Expand Down Expand Up @@ -547,11 +572,16 @@ static int wp_drbg_set_ctx_params(wp_DrbgCtx* ctx, const OSSL_PARAM params[])
*/
static int wp_drbg_verify_zeroization(wp_DrbgCtx* ctx)
{
int ok;

WOLFPROV_ENTER(WP_LOG_COMP_RNG, "wp_drbg_verify_zeroization");

(void)ctx;
WOLFPROV_LEAVE(WP_LOG_COMP_RNG, __FILE__ ":" WOLFPROV_STRINGIZE(__LINE__), 1);
return 1;
/* After uninstantiate, ctx->rng is freed (with internal state zeroized
* by wolfSSL) and set to NULL. Verify that cleanup occurred. */
ok = (ctx->rng == NULL);

WOLFPROV_LEAVE(WP_LOG_COMP_RNG, __FILE__ ":" WOLFPROV_STRINGIZE(__LINE__), ok);
return ok;
}

/**
Expand Down
27 changes: 23 additions & 4 deletions src/wp_ecx_kmgmt.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,16 +356,35 @@ static wp_Ecx* wp_ecx_dup(const wp_Ecx* src, int selection)
{
wp_Ecx* dst = NULL;

(void)selection;
if (wolfssl_prov_is_running()) {
/* Create a new ecx object. */
dst = wp_ecx_new(src->provCtx, src->data);
}
if (dst != NULL) {
XMEMCPY(&dst->key, &src->key, sizeof(src->key));
int ok = 1;
Comment thread
aidangarske marked this conversation as resolved.
Outdated

dst->includePublic = src->includePublic;
dst->hasPub = src->hasPub;
dst->hasPriv = src->hasPriv;

/* Copy the key union directly to preserve all internal state. */
XMEMCPY(&dst->key, &src->key, sizeof(src->key));

/* Copy public key flags if available and requested. */
if (src->hasPub &&
((selection & OSSL_KEYMGMT_SELECT_PUBLIC_KEY) != 0)) {
dst->hasPub = 1;
}
/* Copy private key flags if available and requested. */
if (src->hasPriv &&
((selection & OSSL_KEYMGMT_SELECT_PRIVATE_KEY) != 0)) {
dst->hasPriv = 1;
dst->clamped = src->clamped;
XMEMCPY(dst->unclamped, src->unclamped, sizeof(src->unclamped));
}
Comment thread
aidangarske marked this conversation as resolved.
Outdated

if (!ok) {
wp_ecx_free(dst);
dst = NULL;
}
}

return dst;
Expand Down
3 changes: 3 additions & 0 deletions src/wp_hkdf.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -716,6 +716,9 @@ static int wp_kdf_tls1_3_derive(wp_HkdfCtx* ctx, unsigned char* key,
ok = 0;
}
}
else {
ok = 0;
}
}

WOLFPROV_LEAVE(WP_LOG_COMP_HKDF, __FILE__ ":" WOLFPROV_STRINGIZE(__LINE__), ok);
Expand Down
20 changes: 16 additions & 4 deletions src/wp_hmac.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,12 +187,24 @@ static wp_HmacCtx* wp_hmac_dup(wp_HmacCtx* src)
dst = wp_hmac_new(src->provCtx);
}
if (dst != NULL) {
*dst = *src;
dst->key = NULL;
dst->keyLen = 0;
int ok = 1;
int rc;
Comment thread
aidangarske marked this conversation as resolved.
Outdated

if ((src->key != NULL) &&
dst->type = src->type;
dst->size = src->size;
dst->provCtx = src->provCtx;

/* Copy the Hmac struct directly to preserve in-progress state.
* wc_HmacCopy is not available in all wolfSSL versions. */
XMEMCPY(&dst->hmac, &src->hmac, sizeof(Hmac));
(void)rc;
Comment thread
aidangarske marked this conversation as resolved.
Outdated

if (ok && (src->key != NULL) &&
(!wp_hmac_set_key(dst, src->key, src->keyLen, 0))) {
ok = 0;
}

if (!ok) {
wp_hmac_free(dst);
dst = NULL;
}
Expand Down
23 changes: 15 additions & 8 deletions src/wp_mac_kmgmt.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,10 +223,11 @@ void wp_mac_free(wp_Mac* mac)
int rc;

rc = wc_LockMutex(&mac->mutex);
cnt = --mac->refCnt;
if (rc == 0) {
wc_UnLockMutex(&mac->mutex);
if (rc != 0) {
return;
}
cnt = --mac->refCnt;
wc_UnLockMutex(&mac->mutex);
Comment thread
aidangarske marked this conversation as resolved.
#else
cnt = --mac->refCnt;
#endif
Expand Down Expand Up @@ -318,6 +319,10 @@ static int wp_mac_has(const wp_Mac* mac, int selection)
if (mac == NULL) {
ok = 0;
}
if (ok && ((selection & OSSL_KEYMGMT_SELECT_PUBLIC_KEY) != 0)) {
/* MAC keys do not have a public key component. */
ok = 0;
}
if (ok && ((selection & OSSL_KEYMGMT_SELECT_PRIVATE_KEY) != 0)) {
ok &= mac->key != NULL;
}
Expand All @@ -344,11 +349,13 @@ static int wp_mac_match(const wp_Mac* mac1, const wp_Mac* mac2, int selection)
if (!wolfssl_prov_is_running()) {
ok = 0;
}
if (ok && ((selection & OSSL_KEYMGMT_SELECT_PRIVATE_KEY) != 0) &&
(mac1->keyLen != MAX_SIZE_T) && ((mac1->keyLen != mac2->keyLen) ||
(XMEMCMP(mac1->key, mac2->key, mac1->keyLen) != 0) ||
(XMEMCMP(mac1->cipher, mac2->cipher, WP_MAX_CIPH_NAME_SIZE) != 0))) {
ok = 0;
if (ok && ((selection & OSSL_KEYMGMT_SELECT_PRIVATE_KEY) != 0)) {
if ((mac1->keyLen == MAX_SIZE_T) || (mac2->keyLen == MAX_SIZE_T) ||
(mac1->keyLen != mac2->keyLen) ||
(CRYPTO_memcmp(mac1->key, mac2->key, mac1->keyLen) != 0) ||
(XMEMCMP(mac1->cipher, mac2->cipher, WP_MAX_CIPH_NAME_SIZE) != 0)) {
ok = 0;
}
}

WOLFPROV_LEAVE(WP_LOG_COMP_MAC, __FILE__ ":" WOLFPROV_STRINGIZE(__LINE__), ok);
Expand Down
Loading
Loading