From b00b95ef6c6036320e509f3a63a3f64d9fee9714 Mon Sep 17 00:00:00 2001
From: John Safranek <john@wolfssl.com>
Date: Thu, 6 May 2021 11:45:40 -0700
Subject: [PATCH] Cofactor flag in wolfcrypt test needed a guard.

---
 configure.ac          | 4 ++--
 wolfcrypt/test/test.c | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index be116a772..0225d70e3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3487,10 +3487,10 @@ AS_CASE([$ENABLED_SELFTEST],
 
 AS_CASE([$SELFTEST_VERSION],
     ["v2"],[
-        AM_CFLAGS="$AM_CFLAGS -DHAVE_SELFTEST -DHAVE_SELFTEST_VERSION=2"
+        AM_CFLAGS="$AM_CFLAGS -DHAVE_SELFTEST -DHAVE_SELFTEST_VERSION=2 -DHAVE_PUBLIC_FFDHE"
     ],
     ["v1"],[
-        AM_CFLAGS="$AM_CFLAGS -DHAVE_SELFTEST"
+        AM_CFLAGS="$AM_CFLAGS -DHAVE_SELFTEST -DHAVE_PUBLIC_FFDHE"
     ])
 
 
diff --git a/wolfcrypt/test/test.c b/wolfcrypt/test/test.c
index 08b4839ce..459f88c99 100644
--- a/wolfcrypt/test/test.c
+++ b/wolfcrypt/test/test.c
@@ -21312,8 +21312,10 @@ static int ecc_test_cdh_vectors(WC_RNG* rng)
     ret = wc_ecc_init_ex(priv_key, HEAP_HINT, devId);
     if (ret != 0)
         goto done;
+#ifdef HAVE_ECC_CDH
     wc_ecc_set_flags(pub_key, WC_ECC_FLAG_COFACTOR);
     wc_ecc_set_flags(priv_key, WC_ECC_FLAG_COFACTOR);
+#endif
     ret = wc_ecc_import_raw(pub_key, QCAVSx, QCAVSy, NULL, "SECP256R1");
     if (ret != 0)
         goto done;
@@ -21593,7 +21595,9 @@ static int ecc_test_make_pub(WC_RNG* rng)
     /* make public key for shared secret */
     wc_ecc_init_ex(pub, HEAP_HINT, devId);
     ret = wc_ecc_make_key(rng, ECC_KEYGEN_SIZE, pub);
+#ifdef HAVE_ECC_CDH
     wc_ecc_set_flags(key, WC_ECC_FLAG_COFACTOR);
+#endif
 #if defined(WOLFSSL_ASYNC_CRYPT)
     ret = wc_AsyncWait(ret, &pub->asyncDev, WC_ASYNC_FLAG_NONE);
 #endif