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

Merge pull request #4936 from julek-wolfssl/no-force-ecc-ca

Browse Source 
Don't force a ECC CA when a custom CA is passed with `-A`
This commit is contained in:
David Garske
2022-03-08 10:58:35 -08:00
committed by GitHub
parent a4229c6cf8 3c64731c4f
commit c256d8ca92
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
examples/client/client.c
View File

@ -1927,6 +1927,7 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args)
unsigned char alpn_opt = 0;
char* cipherList = NULL;
int useDefCipherList = 0;
int customVerifyCert = 0;
const char* verifyCert;
const char* ourCert;
const char* ourKey;
@ -2060,6 +2061,7 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args)
(void)resumeScr;
(void)ourKey;
(void)ourCert;
(void)customVerifyCert;
(void)verifyCert;
(void)useClientCert;
(void)disableCRL;
@ -2284,6 +2286,7 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args)
break;
case 'A' :
customVerifyCert = 1;
verifyCert = myoptarg;
break;
@ -3179,7 +3182,7 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args)
err_sys("can't load ecc ca buffer");
}
#elif !defined(TEST_LOAD_BUFFER)
if (doPeerCheck != 0 &&
if (doPeerCheck != 0 && !customVerifyCert &&
wolfSSL_CTX_load_verify_locations_ex(ctx, eccCertFile, 0, verify_flags)
!= WOLFSSL_SUCCESS) {
wolfSSL_CTX_free(ctx); ctx = NULL;