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

Fix for verify callback to not report override when there is no error. Cleanup of the myVerify example callback return code handling.

Browse Source
This commit is contained in:
David Garske
2018-10-12 10:45:20 -07:00
parent 6fbeae8f11
commit fc77ed068c
2 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/internal.c
View File

@ -8682,8 +8682,10 @@ static int DoVerifyCallback(WOLFSSL* ssl, int ret, ProcPeerCertArgs* args)
#endif #endif
/* non-zero return code indicates failure override */ /* non-zero return code indicates failure override */
if (ssl->verifyCallback(verify_ok, store)) { if (ssl->verifyCallback(verify_ok, store)) {
WOLFSSL_MSG("Verify callback overriding error!"); if (ret != 0) {
ret = 0; WOLFSSL_MSG("Verify callback overriding error!");
ret = 0;
}
} }
else { else {
/* induce error if one not present */ /* induce error if one not present */

15
wolfssl/test.h
View File

@ -1507,6 +1507,7 @@ static WC_INLINE int myVerify(int preverify, WOLFSSL_X509_STORE_CTX* store)
/* Verify Callback Arguments: /* Verify Callback Arguments:
* preverify: 1=Verify Okay, 0=Failure * preverify: 1=Verify Okay, 0=Failure
* store->error: Failure error code (0 indicates no failure)
* store->current_cert: Current WOLFSSL_X509 object (only with OPENSSL_EXTRA) * store->current_cert: Current WOLFSSL_X509 object (only with OPENSSL_EXTRA)
* store->error_depth: Current Index * store->error_depth: Current Index
* store->domain: Subject CN as string (null term) * store->domain: Subject CN as string (null term)
@ -1549,12 +1550,18 @@ static WC_INLINE int myVerify(int preverify, WOLFSSL_X509_STORE_CTX* store)
printf("\tSubject's domain name at %d is %s\n", store->error_depth, store->domain); printf("\tSubject's domain name at %d is %s\n", store->error_depth, store->domain);
printf("\tAllowing to continue anyway (shouldn't do this)\n"); /* Testing forced fail case by return zero */
if (myVerifyFail) {
return 0; /* test failure case */
}
/* If error indicate we are overriding it for testing purposes */
if (store->error != 0) {
printf("\tAllowing failed certificate check, testing only "
"(shouldn't do this in production)\n");
}
/* A non-zero return code indicates failure override */ /* A non-zero return code indicates failure override */
if (myVerifyFail)
return 0; /* test failure case */
return 1; return 1;
} }