From f966ece6f4f591336b6246dcca92f9fc9ebb4211 Mon Sep 17 00:00:00 2001 From: Colton Willey Date: Thu, 11 Dec 2025 23:45:58 -0800 Subject: [PATCH 1/3] Restrict DH keygen to 2048 bits and above for FIPS builds --- src/wp_dh_kmgmt.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/wp_dh_kmgmt.c b/src/wp_dh_kmgmt.c index cd1aa0cf..d834efa0 100644 --- a/src/wp_dh_kmgmt.c +++ b/src/wp_dh_kmgmt.c @@ -40,6 +40,12 @@ /** Maximum size of the group name string. */ #define WP_MAX_DH_GROUP_NAME_SZ 10 +/* Min accepted bitlen for keygen */ +#ifdef HAVE_FIPS +#define WP_DH_MIN_BITS 2048 +#else +#define WP_DH_MIN_BITS 1024 +#endif /** * DH key. @@ -1776,7 +1782,7 @@ static int wp_dh_params_validate(wp_Dh* dh) if (ok) { /* Ensure p is a minimum size. */ sz = mp_count_bits(&dh->key.p); - if (sz < 1024) { + if (sz < WP_DH_MIN_BITS) { ok = 0; } From caca3522b294077f7d724062d04435c536c3a03d Mon Sep 17 00:00:00 2001 From: Colton Willey Date: Fri, 12 Dec 2025 01:30:47 -0800 Subject: [PATCH 2/3] Fix FIPS ready bundle build --- scripts/utils-wolfssl.sh | 6 ++++-- test/unit.c | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/scripts/utils-wolfssl.sh b/scripts/utils-wolfssl.sh index f6d4d460..c19dd688 100644 --- a/scripts/utils-wolfssl.sh +++ b/scripts/utils-wolfssl.sh @@ -242,8 +242,10 @@ install_wolfssl() { exit 1 fi fi - # Change to test directory for FIPS builds - if [ -n "$WOLFSSL_FIPS_BUNDLE" ] || [ "$WOLFSSL_ISFIPS" = "1" ]; then + # Change to test directory for FIPS builds (only when cloning, not for bundles) + # XXX-fips-test is created by fips-check.sh when cloning from GitHub. + # Pre-packaged FIPS bundles don't have this directory - they ARE the source tree. + if [ -z "$WOLFSSL_FIPS_BUNDLE" ] && [ "$WOLFSSL_ISFIPS" = "1" ]; then cd XXX-fips-test fi fi diff --git a/test/unit.c b/test/unit.c index a55a5bcf..c3c8cd68 100644 --- a/test/unit.c +++ b/test/unit.c @@ -280,7 +280,9 @@ TEST_CASE test_case[] = { #endif #ifdef WP_HAVE_DH TEST_DECL(test_dh_pgen_pkey, NULL), +#if !defined(HAVE_FIPS) && !defined(HAVE_FIPS_VERSION) TEST_DECL(test_dh_pkey, NULL), +#endif TEST_DECL(test_dh_decode, NULL), TEST_DECL(test_dh_krb5_keygen, NULL), #ifndef WOLFPROV_QUICKTEST From 176408ba180702b242a26ee8d5e9daea0ba941a0 Mon Sep 17 00:00:00 2001 From: Colton Willey Date: Tue, 16 Dec 2025 02:38:56 -0800 Subject: [PATCH 3/3] Modify DH pkey test to use 2048 bit --- test/test_dh.c | 56 ++++++++++++++++++++++++++++++++++---------------- test/unit.c | 2 -- 2 files changed, 38 insertions(+), 20 deletions(-) diff --git a/test/test_dh.c b/test/test_dh.c index 42dcb459..49948f2c 100644 --- a/test/test_dh.c +++ b/test/test_dh.c @@ -75,26 +75,46 @@ static const unsigned char dh_der[] = { 0xDF, 0x31, }; -/* dh1024 p */ -static const unsigned char dh_p[] = -{ - 0xE6, 0x96, 0x9D, 0x3D, 0x49, 0x5B, 0xE3, 0x2C, 0x7C, 0xF1, 0x80, 0xC3, - 0xBD, 0xD4, 0x79, 0x8E, 0x91, 0xB7, 0x81, 0x82, 0x51, 0xBB, 0x05, 0x5E, - 0x2A, 0x20, 0x64, 0x90, 0x4A, 0x79, 0xA7, 0x70, 0xFA, 0x15, 0xA2, 0x59, - 0xCB, 0xD5, 0x23, 0xA6, 0xA6, 0xEF, 0x09, 0xC4, 0x30, 0x48, 0xD5, 0xA2, - 0x2F, 0x97, 0x1F, 0x3C, 0x20, 0x12, 0x9B, 0x48, 0x00, 0x0E, 0x6E, 0xDD, - 0x06, 0x1C, 0xBC, 0x05, 0x3E, 0x37, 0x1D, 0x79, 0x4E, 0x53, 0x27, 0xDF, - 0x61, 0x1E, 0xBB, 0xBE, 0x1B, 0xAC, 0x9B, 0x5C, 0x60, 0x44, 0xCF, 0x02, - 0x3D, 0x76, 0xE0, 0x5E, 0xEA, 0x9B, 0xAD, 0x99, 0x1B, 0x13, 0xA6, 0x3C, - 0x97, 0x4E, 0x9E, 0xF1, 0x83, 0x9E, 0xB5, 0xDB, 0x12, 0x51, 0x36, 0xF7, - 0x26, 0x2E, 0x56, 0xA8, 0x87, 0x15, 0x38, 0xDF, 0xD8, 0x23, 0xC6, 0x50, - 0x50, 0x85, 0xE2, 0x1F, 0x0D, 0xD5, 0xC8, 0x6B, + +/* Random 2048-bit DH prime (not a named group) */ +static const unsigned char dh_p[] = { + 0xc4, 0xa9, 0x96, 0x01, 0x1d, 0xe9, 0x31, 0xd3, + 0x76, 0xdc, 0xae, 0xda, 0x11, 0x68, 0xee, 0xae, + 0x5f, 0x3e, 0x8f, 0x78, 0x36, 0x13, 0xfc, 0x91, + 0xba, 0x74, 0x7f, 0xdb, 0xd7, 0x04, 0x13, 0x50, + 0xee, 0xba, 0xa8, 0xa3, 0xca, 0xe5, 0x26, 0xa4, + 0x78, 0x60, 0xb9, 0xa3, 0xc0, 0xad, 0x14, 0x30, + 0xd9, 0xe5, 0x6a, 0xa3, 0xe2, 0xf2, 0xe5, 0xc8, + 0x08, 0xcd, 0x7b, 0x93, 0x8d, 0xbe, 0xe0, 0x6c, + 0x0f, 0x34, 0x90, 0xd8, 0x30, 0x06, 0x22, 0xad, + 0xfc, 0x43, 0x40, 0xd6, 0xbd, 0x51, 0x21, 0x2f, + 0x15, 0x09, 0x85, 0xa3, 0x70, 0xcc, 0x35, 0x49, + 0xea, 0x79, 0x08, 0x22, 0xdb, 0x94, 0x0b, 0xf8, + 0x40, 0x1c, 0xcb, 0x64, 0x9c, 0x20, 0x95, 0xff, + 0xc6, 0xb9, 0x03, 0x24, 0x80, 0x55, 0x28, 0xe1, + 0x08, 0x0a, 0x24, 0xd2, 0xfc, 0xc6, 0xe7, 0xbd, + 0xd9, 0x17, 0x04, 0x0c, 0x57, 0x20, 0x65, 0x6f, + 0xf7, 0x8b, 0x1c, 0x93, 0x3a, 0xc0, 0x32, 0xe6, + 0x4f, 0x63, 0xaf, 0xe1, 0xbf, 0xb8, 0xe7, 0x5f, + 0xe6, 0x0e, 0x5f, 0x9e, 0xf3, 0x45, 0x8f, 0xbf, + 0x9e, 0xe6, 0xd8, 0x0d, 0xa0, 0x0c, 0x81, 0xa8, + 0x3f, 0xfc, 0x07, 0xf3, 0x21, 0xe1, 0xdd, 0x73, + 0x9f, 0x23, 0xfd, 0x49, 0xcd, 0xa0, 0x1d, 0x0f, + 0xbe, 0xed, 0xb5, 0x7f, 0x07, 0x7b, 0x67, 0x7c, + 0xd7, 0xd3, 0xd5, 0xc2, 0x22, 0x8b, 0x24, 0x62, + 0xe1, 0xa4, 0x84, 0x18, 0xda, 0xac, 0xca, 0xd2, + 0xdc, 0x17, 0x37, 0xb2, 0x8a, 0x20, 0x5b, 0x52, + 0x18, 0xe5, 0xd2, 0xaa, 0x91, 0x3e, 0x23, 0x9b, + 0x4e, 0xe3, 0xfc, 0xa5, 0xfc, 0x0f, 0x99, 0xae, + 0xa7, 0x90, 0xdb, 0x66, 0x68, 0x18, 0xcd, 0xd6, + 0xd3, 0xfc, 0x10, 0x73, 0x9b, 0x44, 0xb3, 0x55, + 0xa5, 0x58, 0xfc, 0xff, 0x7a, 0xc1, 0x01, 0xac, + 0xe0, 0xf8, 0x8d, 0xd6, 0x8c, 0x10, 0x1d, 0x67 }; -/* dh1024 g */ -static const unsigned char dh_g[] = -{ - 0x02, +/* dh2048 g */ +static const unsigned char dh_g[] = { + 0x02 }; /* Fixed param from krb5 DH generation, named "o2048" */ diff --git a/test/unit.c b/test/unit.c index c3c8cd68..a55a5bcf 100644 --- a/test/unit.c +++ b/test/unit.c @@ -280,9 +280,7 @@ TEST_CASE test_case[] = { #endif #ifdef WP_HAVE_DH TEST_DECL(test_dh_pgen_pkey, NULL), -#if !defined(HAVE_FIPS) && !defined(HAVE_FIPS_VERSION) TEST_DECL(test_dh_pkey, NULL), -#endif TEST_DECL(test_dh_decode, NULL), TEST_DECL(test_dh_krb5_keygen, NULL), #ifndef WOLFPROV_QUICKTEST