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 #6944 from miyazakh/fix_qt_jenkins_failure

Browse Source 
skip DATE check if flags is set when calling AddTrustedPeer
This commit is contained in:
JacobBarthelmeh
2023-11-06 11:35:22 -07:00
committed by GitHub
parent c92d25816a 49121b5c47
commit 8ac291bbe1
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/ssl.c
View File

@ -7235,10 +7235,10 @@ int ProcessBuffer(WOLFSSL_CTX* ctx, const unsigned char* buff,
else if (type == TRUSTED_PEER_TYPE) { else if (type == TRUSTED_PEER_TYPE) {
/* add trusted peer cert. der is freed within */ /* add trusted peer cert. der is freed within */
if (ctx != NULL) if (ctx != NULL)
ret = AddTrustedPeer(ctx->cm, &der, !ctx->verifyNone); ret = AddTrustedPeer(ctx->cm, &der, verify);
else { else {
SSL_CM_WARNING(ssl); SSL_CM_WARNING(ssl);
ret = AddTrustedPeer(SSL_CM(ssl), &der, !ssl->options.verifyNone); ret = AddTrustedPeer(SSL_CM(ssl), &der, verify);
} }
if (ret != WOLFSSL_SUCCESS) { if (ret != WOLFSSL_SUCCESS) {
WOLFSSL_MSG("Error adding trusted peer"); WOLFSSL_MSG("Error adding trusted peer");
@ -15714,6 +15714,7 @@ int wolfSSL_set_compression(WOLFSSL* ssl)
const unsigned char* in, const unsigned char* in,
long sz, int format) long sz, int format)
{ {
int verify;
WOLFSSL_ENTER("wolfSSL_CTX_trust_peer_buffer"); WOLFSSL_ENTER("wolfSSL_CTX_trust_peer_buffer");
/* sanity check on arguments */ /* sanity check on arguments */
@ -15721,12 +15722,17 @@ int wolfSSL_set_compression(WOLFSSL* ssl)
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
} }
verify = GET_VERIFY_SETTING_CTX(ctx);
if (WOLFSSL_LOAD_VERIFY_DEFAULT_FLAGS &
WOLFSSL_LOAD_FLAG_DATE_ERR_OKAY)
verify = VERIFY_SKIP_DATE;
if (format == WOLFSSL_FILETYPE_PEM) if (format == WOLFSSL_FILETYPE_PEM)
return ProcessChainBuffer(ctx, in, sz, format, TRUSTED_PEER_TYPE, return ProcessChainBuffer(ctx, in, sz, format, TRUSTED_PEER_TYPE,
NULL, GET_VERIFY_SETTING_CTX(ctx)); NULL, verify);
else else
return ProcessBuffer(ctx, in, sz, format, TRUSTED_PEER_TYPE, NULL, return ProcessBuffer(ctx, in, sz, format, TRUSTED_PEER_TYPE, NULL,
NULL, 0, GET_VERIFY_SETTING_CTX(ctx)); NULL, 0, verify);
} }
#endif /* WOLFSSL_TRUST_PEER_CERT */ #endif /* WOLFSSL_TRUST_PEER_CERT */