From 4151af4b4a0f7d61988e000f5a924b40d2da17ea Mon Sep 17 00:00:00 2001
From: John Safranek <john@wolfssl.com>
Date: Mon, 25 Jun 2018 17:49:11 -0700
Subject: [PATCH] A few new functions in AES-GCM and DH don't exist in the
 netbsd-selftest build of wolfSSL. Option them out of the wolfCrypt self-test.

---
 wolfcrypt/test/test.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/wolfcrypt/test/test.c b/wolfcrypt/test/test.c
index 90129506a..eb5358c04 100644
--- a/wolfcrypt/test/test.c
+++ b/wolfcrypt/test/test.c
@@ -6921,7 +6921,7 @@ int aesgcm_test(void)
 #if !defined(HAVE_FIPS) || \
     (defined(HAVE_FIPS_VERSION) && (HAVE_FIPS_VERSION >= 2))
     /* Test encrypt with internally generated IV */
-#ifndef WC_NO_RNG
+#if !(defined(WC_NO_RNG) || defined(HAVE_SELFTEST))
     {
         WC_RNG rng;
         byte randIV[12];
@@ -6975,7 +6975,7 @@ int aesgcm_test(void)
             return -8212;
         wc_FreeRng(&rng);
     }
-#endif /* WC_NO_RNG */
+#endif /* WC_NO_RNG HAVE_SELFTEST */
 #endif
 
     wc_AesFree(&enc);
@@ -7052,7 +7052,7 @@ int gmac_test(void)
     if (XMEMCMP(t2, tag, sizeof(t2)) != 0)
         return -5801;
 
-#ifndef WC_NO_RNG
+#if !(defined(WC_NO_RNG) || defined(HAVE_SELFTEST))
     {
         const byte badT[] =
         {
@@ -7091,7 +7091,7 @@ int gmac_test(void)
             return -8219;
         wc_FreeRng(&rng);
     }
-#endif /* WC_NO_RNG */
+#endif /* WC_NO_RNG HAVE_SELFTEST */
 #endif /* HAVE_FIPS */
 
     return 0;
@@ -11299,6 +11299,7 @@ static int dh_fips_generate_test(WC_RNG *rng)
         ERROR_OUT(-7088, exit_gen_test);
     }
 
+#ifndef HAVE_SELFTEST
     ret = wc_DhCheckKeyPair(&key, pub, pubSz, priv, privSz);
     if (ret != 0) {
         ERROR_OUT(-8229, exit_gen_test);
@@ -11310,6 +11311,7 @@ static int dh_fips_generate_test(WC_RNG *rng)
     if (ret != MP_CMP_E) {
         ERROR_OUT(-8230, exit_gen_test);
     }
+#endif /* HAVE_SELFTEST */
 
 #ifdef WOLFSSL_KEY_GEN