feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

remove ocsp attempt with ipv6 enabled

Browse Source
This commit is contained in:
Jacob Barthelmeh
2019-02-13 19:01:09 -07:00
parent acc0121e0f
commit 275667f0e9
2 changed files with 6 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
scripts/include.am
View File

@ -21,10 +21,6 @@ dist_noinst_SCRIPTS+= scripts/crl-revoked.test
scripts/crl-revoked.log: scripts/resume.log scripts/crl-revoked.log: scripts/resume.log
endif endif
if BUILD_OCSP
dist_noinst_SCRIPTS+= scripts/ocsp.test
endif
if BUILD_OCSP_STAPLING if BUILD_OCSP_STAPLING
dist_noinst_SCRIPTS+= scripts/ocsp-stapling.test dist_noinst_SCRIPTS+= scripts/ocsp-stapling.test
scripts/ocsp-stapling.log: tests/unit.log scripts/ocsp-stapling.log: tests/unit.log
@ -74,6 +70,11 @@ if !BUILD_IPV6
dist_noinst_SCRIPTS+= scripts/external.test dist_noinst_SCRIPTS+= scripts/external.test
dist_noinst_SCRIPTS+= scripts/google.test dist_noinst_SCRIPTS+= scripts/google.test
dist_noinst_SCRIPTS+= scripts/openssl.test dist_noinst_SCRIPTS+= scripts/openssl.test
if BUILD_OCSP
dist_noinst_SCRIPTS+= scripts/ocsp.test
endif
endif endif
endif endif

17
wolfssl/test.h
View File

@ -793,7 +793,7 @@ static WC_INLINE void build_addr(SOCKADDR_IN_T* addr, const char* peer,
addr->sin6_addr = in6addr_any; addr->sin6_addr = in6addr_any;
} }
else { else {
#ifdef HAVE_GETADDRINFO #if defined(HAVE_GETADDRINFO) || defined(WOLF_C99)
struct addrinfo hints; struct addrinfo hints;
struct addrinfo* answer = NULL; struct addrinfo* answer = NULL;
int ret; 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); XMEMCPY(addr, answer->ai_addr, answer->ai_addrlen);
freeaddrinfo(answer); 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 #else
printf("no ipv6 getaddrinfo, loopback only tests/examples\n"); printf("no ipv6 getaddrinfo, loopback only tests/examples\n");
addr->sin6_addr = in6addr_loopback; addr->sin6_addr = in6addr_loopback;