Fix FIPS ready bundle build

Author: ColtonWilley

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

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