From acc0121e0f01da1c8cf9045bf8798ef0913e5ee0 Mon Sep 17 00:00:00 2001
From: Jacob Barthelmeh <jacob@wolfssl.com>
Date: Mon, 11 Feb 2019 15:07:12 -0700
Subject: [PATCH 1/2] account for WOLF_C99 with ipv6 test cases

---
 wolfssl/test.h | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/wolfssl/test.h b/wolfssl/test.h
index a9cc4e868..dd688b1d5 100644
--- a/wolfssl/test.h
+++ b/wolfssl/test.h
@@ -826,6 +826,21 @@ static WC_INLINE void build_addr(SOCKADDR_IN_T* addr, const char* peer,
 
             XMEMCPY(addr, answer->ai_addr, answer->ai_addrlen);
             freeaddrinfo(answer);
+        #elif defined(WOLF_C99)
+            HOSTENT* entry;
+            SOCKADDR_IN* sin;
+
+            entry = gethostbyname(peer);
+            sin   = (SOCKADDR_IN*)&addr;
+            if (entry) {
+                sin->sin_family = AF_INET;
+                sin->sin_port = XHTONS(port);
+                XMEMCPY(&sin->sin_addr.s_addr, entry->h_addr_list[0],
+                        entry->h_length);
+            }
+            else {
+                err_sys("no addr info for responder");
+            }
         #else
             printf("no ipv6 getaddrinfo, loopback only tests/examples\n");
             addr->sin6_addr = in6addr_loopback;

From 275667f0e98e1fbb7ec42acd101fc19ae3b94070 Mon Sep 17 00:00:00 2001
From: Jacob Barthelmeh <jacob@wolfssl.com>
Date: Wed, 13 Feb 2019 19:01:09 -0700
Subject: [PATCH 2/2] remove ocsp attempt with ipv6 enabled

---
 scripts/include.am |  9 +++++----
 wolfssl/test.h     | 17 +----------------
 2 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/scripts/include.am b/scripts/include.am
index 6882d24e1..7cf8df579 100644
--- a/scripts/include.am
+++ b/scripts/include.am
@@ -21,10 +21,6 @@ dist_noinst_SCRIPTS+= scripts/crl-revoked.test
 scripts/crl-revoked.log: scripts/resume.log
 endif
 
-if BUILD_OCSP
-dist_noinst_SCRIPTS+= scripts/ocsp.test
-endif
-
 if BUILD_OCSP_STAPLING
 dist_noinst_SCRIPTS+= scripts/ocsp-stapling.test
 scripts/ocsp-stapling.log: tests/unit.log
@@ -74,6 +70,11 @@ if !BUILD_IPV6
 dist_noinst_SCRIPTS+= scripts/external.test
 dist_noinst_SCRIPTS+= scripts/google.test
 dist_noinst_SCRIPTS+= scripts/openssl.test
+
+if BUILD_OCSP
+dist_noinst_SCRIPTS+= scripts/ocsp.test
+endif
+
 endif
 endif
 
diff --git a/wolfssl/test.h b/wolfssl/test.h
index dd688b1d5..a9af40315 100644
--- a/wolfssl/test.h
+++ b/wolfssl/test.h
@@ -793,7 +793,7 @@ static WC_INLINE void build_addr(SOCKADDR_IN_T* addr, const char* peer,
         addr->sin6_addr = in6addr_any;
     }
     else {
-        #ifdef HAVE_GETADDRINFO
+        #if defined(HAVE_GETADDRINFO) || defined(WOLF_C99)
             struct addrinfo  hints;
             struct addrinfo* answer = NULL;
             int    ret;
@@ -826,21 +826,6 @@ static WC_INLINE void build_addr(SOCKADDR_IN_T* addr, const char* peer,
 
             XMEMCPY(addr, answer->ai_addr, answer->ai_addrlen);
             freeaddrinfo(answer);
-        #elif defined(WOLF_C99)
-            HOSTENT* entry;
-            SOCKADDR_IN* sin;
-
-            entry = gethostbyname(peer);
-            sin   = (SOCKADDR_IN*)&addr;
-            if (entry) {
-                sin->sin_family = AF_INET;
-                sin->sin_port = XHTONS(port);
-                XMEMCPY(&sin->sin_addr.s_addr, entry->h_addr_list[0],
-                        entry->h_length);
-            }
-            else {
-                err_sys("no addr info for responder");
-            }
         #else
             printf("no ipv6 getaddrinfo, loopback only tests/examples\n");
             addr->sin6_addr = in6addr_loopback;