Fix for unit.test fails with -H verifyFail.

This commit is contained in:
David Garske
2018-10-18 11:58:00 -07:00
parent cdd8f6b950
commit 4a4ae446aa

View File

@ -1875,7 +1875,7 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args)
#endif #endif
} }
if (!usePsk && !useAnon && (!useVerifyCb || myVerifyFail)) { if (!usePsk && !useAnon && !useVerifyCb && !myVerifyFail) {
#ifndef TEST_LOAD_BUFFER #ifndef TEST_LOAD_BUFFER
if (wolfSSL_CTX_load_verify_locations(ctx, verifyCert, 0) if (wolfSSL_CTX_load_verify_locations(ctx, verifyCert, 0)
!= WOLFSSL_SUCCESS) { != WOLFSSL_SUCCESS) {
@ -1908,7 +1908,7 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args)
} }
#endif /* WOLFSSL_TRUST_PEER_CERT && !NO_FILESYSTEM */ #endif /* WOLFSSL_TRUST_PEER_CERT && !NO_FILESYSTEM */
} }
if (useVerifyCb) if (useVerifyCb || myVerifyFail)
wolfSSL_CTX_set_verify(ctx, WOLFSSL_VERIFY_PEER, myVerify); wolfSSL_CTX_set_verify(ctx, WOLFSSL_VERIFY_PEER, myVerify);
else if (!usePsk && !useAnon && doPeerCheck == 0) else if (!usePsk && !useAnon && doPeerCheck == 0)
wolfSSL_CTX_set_verify(ctx, WOLFSSL_VERIFY_NONE, 0); wolfSSL_CTX_set_verify(ctx, WOLFSSL_VERIFY_NONE, 0);