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

Fix for example client with -X external tests to not disable for PSK build unless usePsk is set. Resolves issue with external tests being skipped if building with PSK enabled.

Browse Source
This commit is contained in:
David Garske
2018-12-21 08:21:59 -08:00
parent 9733076fe0
commit 00dd222aa5
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
examples/client/client.c
View File

@ -1860,9 +1860,10 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args)
int done = 0; int done = 0;
#ifdef NO_RSA #ifdef NO_RSA
done += 1; done += 1; /* require RSA for external tests */
#endif #endif
if (!XSTRNCMP(domain, "www.globalsign.com", 14)) {
/* www.globalsign.com does not respond to ipv6 ocsp requests */ /* www.globalsign.com does not respond to ipv6 ocsp requests */
#if defined(TEST_IPV6) && defined(HAVE_OCSP) #if defined(TEST_IPV6) && defined(HAVE_OCSP)
done += 1; done += 1;
@ -1880,9 +1881,12 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args)
#if defined(HAVE_OCSP) && !defined(HAVE_ECC) #if defined(HAVE_OCSP) && !defined(HAVE_ECC)
done += 1; done += 1;
#endif #endif
}
#ifndef NO_PSK #ifndef NO_PSK
done += 1; if (usePsk) {
done += 1; /* don't perform exernal tests if PSK is enabled */
}
#endif #endif
#ifdef NO_SHA #ifdef NO_SHA
@ -1912,7 +1916,7 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args)
#if !defined(HAVE_AESGCM) && defined(NO_AES) && \ #if !defined(HAVE_AESGCM) && defined(NO_AES) && \
!(defined(HAVE_CHACHA) && defined(HAVE_POLY1305)) !(defined(HAVE_CHACHA) && defined(HAVE_POLY1305))
/* need at least on of these for external tests */ /* need at least one of these for external tests */
done += 1; done += 1;
#endif #endif