wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-30 10:47:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3520 from ejohnstown/vrf-fix

Browse Source 
Verify Callback Fix
This commit is contained in:
David Garske
2020-11-25 11:37:06 -08:00
committed by GitHub
parent 1668b7060c 4baf923218
commit 9f07f3e96e
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/internal.c
View File

@ -10017,8 +10017,6 @@ int DoVerifyCallback(WOLFSSL_CERT_MANAGER* cm, WOLFSSL* ssl, int ret,
/* Determine if verify was okay */ /* Determine if verify was okay */
if (ret == 0) { if (ret == 0) {
verify_ok = 1; verify_ok = 1;
use_cb = 1; /* use verify callback on success, in case callback
* could force fail a cert */
} }
/* Determine if verify callback should be used */ /* Determine if verify callback should be used */

9
tests/test-fails.conf
View File

@ -114,6 +114,7 @@
# server # server
-v 3 -v 3
-l ECDHE-RSA-AES128-GCM-SHA256 -l ECDHE-RSA-AES128-GCM-SHA256
-H verifyFail
# client verify should fail # client verify should fail
-v 3 -v 3
@ -128,10 +129,12 @@
# client # client
-v 3 -v 3
-l ECDHE-RSA-AES128-GCM-SHA256 -l ECDHE-RSA-AES128-GCM-SHA256
-H verifyFail
# server # server
-v 3 -v 3
-l ECDHE-ECDSA-AES128-GCM-SHA256 -l ECDHE-ECDSA-AES128-GCM-SHA256
-H verifyFail
# client verify should fail # client verify should fail
-v 3 -v 3
@ -146,6 +149,7 @@
# client # client
-v 3 -v 3
-l ECDHE-ECDSA-AES128-GCM-SHA256 -l ECDHE-ECDSA-AES128-GCM-SHA256
-H verifyFail
# error going into callback, return error # error going into callback, return error
# server # server
@ -153,6 +157,7 @@
-l ECDHE-RSA-AES128-GCM-SHA256 -l ECDHE-RSA-AES128-GCM-SHA256
-c ./certs/test/server-cert-rsa-badsig.pem -c ./certs/test/server-cert-rsa-badsig.pem
-k ./certs/server-key.pem -k ./certs/server-key.pem
-H verifyFail
# client verify should fail # client verify should fail
-v 3 -v 3
@ -164,6 +169,7 @@
-l ECDHE-ECDSA-AES128-GCM-SHA256 -l ECDHE-ECDSA-AES128-GCM-SHA256
-c ./certs/test/server-cert-ecc-badsig.pem -c ./certs/test/server-cert-ecc-badsig.pem
-k ./certs/ecc-key.pem -k ./certs/ecc-key.pem
-H verifyFail
# client verify should fail # client verify should fail
-v 3 -v 3
@ -173,10 +179,12 @@
# server send alert on no mutual authentication # server send alert on no mutual authentication
-v 3 -v 3
-F -F
-H verifyFail
# client send alert on no mutual authentication # client send alert on no mutual authentication
-v 3 -v 3
-x -x
-H verifyFail
# server TLSv1.3 fail on no client certificate # server TLSv1.3 fail on no client certificate
# server always sets WOLFSSL_VERIFY_FAIL_IF_NO_PEER_CERT unless using -d # server always sets WOLFSSL_VERIFY_FAIL_IF_NO_PEER_CERT unless using -d
@ -187,4 +195,3 @@
-v 4 -v 4
-l TLS13-AES128-GCM-SHA256 -l TLS13-AES128-GCM-SHA256
-x -x