Merge pull request #7961 from philljj/fips_pkcallback

douzzer · web-flow · commit 5b337e69d966 · 2024-09-12T18:18:48.000-05:00
Update HAVE_FIPS define guard in test.h.
diff --git a/wolfssl/test.h b/wolfssl/test.h
@@ -3342,8 +3342,9 @@ static WC_INLINE int myEccSharedSecret(WOLFSSL* ssl, ecc_key* otherKey,
         ret = BAD_FUNC_ARG;
     }
 
-#if defined(ECC_TIMING_RESISTANT) && !defined(HAVE_FIPS) && \
-                                                         !defined(HAVE_SELFTEST)
+#if defined(ECC_TIMING_RESISTANT) && (!defined(HAVE_FIPS) || \
+    (!defined(HAVE_FIPS_VERSION) || (HAVE_FIPS_VERSION != 2))) && \
+    !defined(HAVE_SELFTEST)
     if (ret == 0) {
         ret = wc_ecc_set_rng(privKey, wolfSSL_GetRNG(ssl));
     }

Original file line number	Diff line number	Diff line change
`@@ -3342,8 +3342,9 @@ static WC_INLINE int myEccSharedSecret(WOLFSSL* ssl, ecc_key* otherKey,`
`3342`	`3342`	`ret = BAD_FUNC_ARG;`
`3343`	`3343`	`}`
`3344`	`3344`
`3345`		`-#if defined(ECC_TIMING_RESISTANT) && !defined(HAVE_FIPS) && \`
`3346`		`- !defined(HAVE_SELFTEST)`
	`3345`	`+#if defined(ECC_TIMING_RESISTANT) && (!defined(HAVE_FIPS) \|\| \`
	`3346`	`+ (!defined(HAVE_FIPS_VERSION) \|\| (HAVE_FIPS_VERSION != 2))) && \`
	`3347`	`+ !defined(HAVE_SELFTEST)`
`3347`	`3348`	`if (ret == 0) {`
`3348`	`3349`	`ret = wc_ecc_set_rng(privKey, wolfSSL_GetRNG(ssl));`
`3349`	`3350`	`}`