Skip to content

FIPS alignment #49

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

Merged
SparkiDev merged 2 commits into from
Jun 19, 2025
Merged

FIPS alignment #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f397d34
Various FIPS fixes
gasbytes Jun 18, 2025
30092a3
- Added logs when outputting a digest indicating which algo is being …
gasbytes Jun 19, 2025
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
2 changes: 1 addition & 1 deletion setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ if [ $FIPS_MODE -eq 1 ]; then

cd fips-v5-checkout

./configure --prefix=$WOLFSSL_INSTALL/ CC=clang --enable-cmac --enable-aesccm --enable-aescfb --enable-keygen 'CFLAGS=-DWOLFSSL_PUBLIC_ASN -DHAVE_PUBLIC_FFDHE -DHAVE_FFDHE_3072 -DHAVE_FFDHE_4096 -DWOLFSSL_DH_EXTRA -DWOLFSSL_PSS_SALT_LEN_DISCOVER -DWOLFSSL_PUBLIC_MP -DWOLFSSL_RSA_KEY_CHECK -DWOLFSSL_ECDSA_DETERMINISTIC_K' --enable-fips=v5
./configure --prefix=$WOLFSSL_INSTALL/ CC=clang --enable-cmac --enable-aesccm --enable-aescfb --enable-keygen 'CFLAGS=-DWOLFSSL_PUBLIC_ASN -DHAVE_PUBLIC_FFDHE -DHAVE_FFDHE_3072 -DHAVE_FFDHE_4096 -DWOLFSSL_DH_EXTRA -DWOLFSSL_PSS_SALT_LEN_DISCOVER -DWOLFSSL_PUBLIC_MP -DWOLFSSL_RSA_KEY_CHECK' --enable-fips=v5

make

Expand Down
74 changes: 49 additions & 25 deletions wolfssl-gnutls-wrapper/src/wolfssl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1720,30 +1720,6 @@ static int get_hash_type(gnutls_mac_algorithm_t algorithm)
}
}

/* checks if the provided operation and hash_type are fips approved */
#if defined(HAVE_FIPS)
static int is_hash_type_fips(int hash_type, int operation) {
switch(hash_type) {
case WC_SHA:
if (operation == VERIFY_OP)
return 1;
else
return 0;
case WC_SHA224:
case WC_SHA256:
case WC_SHA384:
case WC_SHA512:
case WC_SHA3_224:
case WC_SHA3_256:
case WC_SHA3_384:
case WC_SHA3_512:
return 1;
default:
return 0;
}
}
#endif

/**
* Checks if MAC is supported.
*
Expand Down Expand Up @@ -3125,69 +3101,79 @@ static int wolfssl_digest_output(void *_ctx, void *digest, size_t digestsize)

/* Finalize the digest and get the result. */
if (ctx->algorithm == GNUTLS_DIG_MD5) {
WGW_LOG("Outputting Md5");
/* Make sure the output buffer is large enough. */
if (digestsize < WC_MD5_DIGEST_SIZE) {
WGW_ERROR("digestsize too small for MD5 output");
return GNUTLS_E_SHORT_MEMORY_BUFFER;
}
ret = wc_Md5Final(&ctx->obj.md5, (byte*)digest);
} else if (ctx->algorithm == GNUTLS_DIG_SHA1) {
WGW_LOG("Outputting Sha1");
/* Make sure the output buffer is large enough. */
if (digestsize < WC_SHA_DIGEST_SIZE) {
WGW_ERROR("digestsize too small for SHA-1 output");
return GNUTLS_E_SHORT_MEMORY_BUFFER;
}
ret = wc_ShaFinal(&ctx->obj.sha, (byte*)digest);
} else if (ctx->algorithm == GNUTLS_DIG_SHA224) {
WGW_LOG("Outputting Sha224");
/* Make sure the output buffer is large enough. */
if (digestsize < WC_SHA224_DIGEST_SIZE) {
WGW_ERROR("digestsize too small for SHA-224 output");
return GNUTLS_E_SHORT_MEMORY_BUFFER;
}
ret = wc_Sha224Final(&ctx->obj.sha224, (byte*)digest);
} else if (ctx->algorithm == GNUTLS_DIG_SHA256) {
WGW_LOG("Outputting Sha256");
/* Make sure the output buffer is large enough. */
if (digestsize < WC_SHA256_DIGEST_SIZE) {
WGW_ERROR("digestsize too small for SHA-256 output");
return GNUTLS_E_SHORT_MEMORY_BUFFER;
}
ret = wc_Sha256Final(&ctx->obj.sha256, (byte*)digest);
} else if (ctx->algorithm == GNUTLS_DIG_SHA384) {
WGW_LOG("Outputting Sha384");
/* Make sure the output buffer is large enough. */
if (digestsize < WC_SHA384_DIGEST_SIZE) {
WGW_ERROR("digestsize too small for SHA-384 output");
return GNUTLS_E_SHORT_MEMORY_BUFFER;
}
ret = wc_Sha384Final(&ctx->obj.sha384, (byte*)digest);
} else if (ctx->algorithm == GNUTLS_DIG_SHA512) {
WGW_LOG("Outputting Sha512");
/* Make sure the output buffer is large enough. */
if (digestsize < WC_SHA512_DIGEST_SIZE) {
WGW_ERROR("digestsize too small for SHA-512 output");
return GNUTLS_E_SHORT_MEMORY_BUFFER;
}
ret = wc_Sha512Final(&ctx->obj.sha512, (byte*)digest);
} else if (ctx->algorithm == GNUTLS_DIG_SHA3_224) {
WGW_LOG("Outputting Sha3 224");
/* Make sure the output buffer is large enough. */
if (digestsize < WC_SHA3_224_DIGEST_SIZE) {
WGW_ERROR("digestsize too small for SHA3-224 output");
return GNUTLS_E_SHORT_MEMORY_BUFFER;
}
ret = wc_Sha3_224_Final(&ctx->obj.sha3, (byte*)digest);
} else if (ctx->algorithm == GNUTLS_DIG_SHA3_256) {
WGW_LOG("Outputting Sha3 256");
/* Make sure the output buffer is large enough. */
if (digestsize < WC_SHA3_256_DIGEST_SIZE) {
WGW_ERROR("digestsize too small for SHA3-256 output");
return GNUTLS_E_SHORT_MEMORY_BUFFER;
}
ret = wc_Sha3_256_Final(&ctx->obj.sha3, (byte*)digest);
} else if (ctx->algorithm == GNUTLS_DIG_SHA3_384) {
WGW_LOG("Outputting Sha3 384");
/* Make sure the output buffer is large enough. */
if (digestsize < WC_SHA3_384_DIGEST_SIZE) {
WGW_ERROR("digestsize too small for SHA3-384 output");
return GNUTLS_E_SHORT_MEMORY_BUFFER;
}
ret = wc_Sha3_384_Final(&ctx->obj.sha3, (byte*)digest);
} else if (ctx->algorithm == GNUTLS_DIG_SHA3_512) {
WGW_LOG("Outputting Sha3 512");
/* Make sure the output buffer is large enough. */
if (digestsize < WC_SHA3_512_DIGEST_SIZE) {
WGW_ERROR("digestsize too small for SHA3-512 output");
Expand Down Expand Up @@ -4002,6 +3988,7 @@ static int dh_load_params(DhKey *dh, const gnutls_pk_params_st *params)
static int ecc_level_to_curve(int level, int *curve_id, int *curve_size)
{
switch (level) {
#if !defined(HAVE_FIPS)
#if ECC_MIN_KEY_SZ <= 192
case GNUTLS_ECC_CURVE_SECP192R1:
WGW_LOG("SECP192R1 - 24 bytes");
Expand All @@ -4015,6 +4002,7 @@ static int ecc_level_to_curve(int level, int *curve_id, int *curve_size)
*curve_id = ECC_SECP224R1;
*curve_size = 28;
break;
#endif
#endif
case GNUTLS_ECC_CURVE_SECP256R1:
WGW_LOG("SECP256R1 - 32 bytes");
Expand Down Expand Up @@ -4070,7 +4058,11 @@ static int ecc_load_params(ecc_key *ecc, const gnutls_pk_params_st *pk_params,
ret = mp_set(ecc->pubkey.z, 1);
}
if ((ret == 0) && priv) {
#if !defined(HAVE_FIPS)
ret = bigint_to_mp(pk_params->params[ECC_K], ecc->k);
#else
ret = bigint_to_mp(pk_params->params[ECC_K], &ecc->k);
#endif
}
if (ret == 0) {
if (priv) {
Expand Down Expand Up @@ -4449,6 +4441,10 @@ static int wolfssl_pk_sign_rsa(gnutls_datum_t *signature,

WGW_FUNC_ENTER();

#ifdef WC_RNG_SEED_CB
wc_SetSeed_Cb(wc_GenerateSeed);
#endif

ret = wc_InitRng(&rng);
if (ret != 0) {
WGW_WOLFSSL_ERROR("wc_InitRng", ret);
Expand Down Expand Up @@ -4549,6 +4545,9 @@ static int wolfssl_pk_sign_ecc(gnutls_datum_t *signature,
ecc_key ecc;
WC_RNG rng;
word32 len;
#if defined(HAVE_FIPS)
(void)sign_params;
#endif

WGW_FUNC_ENTER();

Expand Down Expand Up @@ -4993,6 +4992,7 @@ static int wolfssl_pk_verify(gnutls_pk_algorithm_t algo,
break;
#endif
default:
WGW_LOG("algo not supported!");
ret = GNUTLS_E_INVALID_REQUEST;
}

Expand Down Expand Up @@ -5193,6 +5193,10 @@ static int wolfssl_pk_generate_keys_rsa(unsigned int bits,
}
#endif

#ifdef WC_RNG_SEED_CB
wc_SetSeed_Cb(wc_GenerateSeed);
#endif

ret = wc_InitRng(&rng);
if (ret != 0) {
WGW_WOLFSSL_ERROR("wc_InitRng", ret);
Expand Down Expand Up @@ -5375,6 +5379,10 @@ static int wolfssl_pk_generate_keys_dh(unsigned int bits,

WGW_FUNC_ENTER();

#ifdef WC_RNG_SEED_CB
wc_SetSeed_Cb(wc_GenerateSeed);
#endif

ret = wc_InitRng(&rng);
if (ret != 0) {
WGW_WOLFSSL_ERROR("wc_InitRng", ret);
Expand Down Expand Up @@ -5441,11 +5449,11 @@ static int wolfssl_pk_generate_keys_dh(unsigned int bits,

wc_FreeRng(&rng);
wc_FreeDhKey(&dh);

if (ret != 0) {
WGW_WOLFSSL_ERROR("wc_DhGenerateKeyPair", ret);
gnutls_free(pub);
gnutls_free(priv);
wc_FreeDhKey(&dh);
return ret;
}

Expand All @@ -5458,6 +5466,9 @@ static int wolfssl_pk_generate_keys_dh(unsigned int bits,
params->params_nr++;
}

gnutls_free(pub);
gnutls_free(priv);

return ret;
}

Expand All @@ -5477,6 +5488,10 @@ static int wolfssl_pk_generate_keys_ecc(unsigned int level,
return ret;
}

#ifdef WC_RNG_SEED_CB
wc_SetSeed_Cb(wc_GenerateSeed);
#endif

ret = wc_InitRng(&rng);
if (ret != 0) {
WGW_WOLFSSL_ERROR("wc_InitRng", ret);
Expand Down Expand Up @@ -5514,7 +5529,11 @@ static int wolfssl_pk_generate_keys_ecc(unsigned int level,
}
if (ret == 0) {
params->params_nr++;
#if !defined(HAVE_FIPS)
ret = mp_to_bigint(ecc.k, &params->params[ECC_K]);
#else
ret = mp_to_bigint(&ecc.k, &params->params[ECC_K]);
#endif
}
if (ret == 0) {
params->params_nr++;
Expand Down Expand Up @@ -6392,8 +6411,13 @@ static int wolfssl_pk_derive_dh(gnutls_datum_t *out,
PRIVATE_KEY_UNLOCK();

if (flags & PK_DERIVE_TLS13) {
#if !defined(HAVE_FIPS)
ret = wc_DhAgree_ct(&dh, out->data, &len, private.data, private.size,
public.data, public.size);
#else
ret = wc_DhAgree(&dh, out->data, &len, private.data, private.size,
public.data, public.size);
#endif
} else {
ret = wc_DhAgree(&dh, out->data, &len, private.data, private.size,
public.data, public.size);
Expand Down
30 changes: 19 additions & 11 deletions wolfssl-gnutls-wrapper/tests/test_ecdh_encrypt_and_decrypt.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -445,6 +445,7 @@ int test_ecdh_encrypt_decrypt(gnutls_pk_algorithm_t algo, const char *curve_name

int main(void) {
int ret;
unsigned int fips_mode;

printf("Testing GnuTLS's ECDH encryption/decryption with various curves...\n");

Expand All @@ -455,18 +456,25 @@ int main(void) {
return 1;
}

/* Test X25519 */
ret = test_ecdh_encrypt_decrypt(GNUTLS_PK_ECDH_X25519, "X25519");
if (ret != 0) {
gnutls_global_deinit();
return 1;
}
/* Check if FIPS mode is enabled */
fips_mode = gnutls_fips140_mode_enabled();

/* Test X448 */
ret = test_ecdh_encrypt_decrypt(GNUTLS_PK_ECDH_X448, "X448");
if (ret != 0) {
gnutls_global_deinit();
return 1;
if (!fips_mode) {
/* Test X25519 */
ret = test_ecdh_encrypt_decrypt(GNUTLS_PK_ECDH_X25519, "X25519");
if (ret != 0) {
gnutls_global_deinit();
return 1;
}

/* Test X448 */
ret = test_ecdh_encrypt_decrypt(GNUTLS_PK_ECDH_X448, "X448");
if (ret != 0) {
gnutls_global_deinit();
return 1;
}
} else {
printf("Skipping X448 and X25519 since FIPS mode is enabled.\n");
}

/* Test P-256 (SECP256R1) */
Expand Down
8 changes: 8 additions & 0 deletions wolfssl-gnutls-wrapper/tests/test_eddsa_sign_and_verify.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ int test_eddsa_curve(const char *curve_name) {

int main(void) {
int ret;
unsigned int fips_mode;

printf("Testing GnuTLS's EdDSA implementation...\n");

Expand All @@ -126,6 +127,13 @@ int main(void) {
return 1;
}

/* Check if FIPS mode is enabled */
fips_mode = gnutls_fips140_mode_enabled();
if (fips_mode == 1) {
printf("This test can be run only when FIPS140 mode is not enabled\n");
return 0; /* Skip test */
}

/* Test Ed25519 */
ret = test_eddsa_curve("Ed25519");
if (ret != 0) {
Expand Down
Loading