Skip to content

Commit 8ac291b

Browse files
Merge pull request #6944 from miyazakh/fix_qt_jenkins_failure
skip DATE check if flags is set when calling AddTrustedPeer
2 parents c92d258 + 49121b5 commit 8ac291b

1 file changed

Lines changed: 10 additions & 4 deletions

File tree

src/ssl.c

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7235,10 +7235,10 @@ int ProcessBuffer(WOLFSSL_CTX* ctx, const unsigned char* buff,
72357235
else if (type == TRUSTED_PEER_TYPE) {
72367236
/* add trusted peer cert. der is freed within */
72377237
if (ctx != NULL)
7238-
ret = AddTrustedPeer(ctx->cm, &der, !ctx->verifyNone);
7238+
ret = AddTrustedPeer(ctx->cm, &der, verify);
72397239
else {
72407240
SSL_CM_WARNING(ssl);
7241-
ret = AddTrustedPeer(SSL_CM(ssl), &der, !ssl->options.verifyNone);
7241+
ret = AddTrustedPeer(SSL_CM(ssl), &der, verify);
72427242
}
72437243
if (ret != WOLFSSL_SUCCESS) {
72447244
WOLFSSL_MSG("Error adding trusted peer");
@@ -15714,19 +15714,25 @@ int wolfSSL_set_compression(WOLFSSL* ssl)
1571415714
const unsigned char* in,
1571515715
long sz, int format)
1571615716
{
15717+
int verify;
1571715718
WOLFSSL_ENTER("wolfSSL_CTX_trust_peer_buffer");
1571815719

1571915720
/* sanity check on arguments */
1572015721
if (sz < 0 || in == NULL || ctx == NULL) {
1572115722
return BAD_FUNC_ARG;
1572215723
}
1572315724

15725+
verify = GET_VERIFY_SETTING_CTX(ctx);
15726+
if (WOLFSSL_LOAD_VERIFY_DEFAULT_FLAGS &
15727+
WOLFSSL_LOAD_FLAG_DATE_ERR_OKAY)
15728+
verify = VERIFY_SKIP_DATE;
15729+
1572415730
if (format == WOLFSSL_FILETYPE_PEM)
1572515731
return ProcessChainBuffer(ctx, in, sz, format, TRUSTED_PEER_TYPE,
15726-
NULL, GET_VERIFY_SETTING_CTX(ctx));
15732+
NULL, verify);
1572715733
else
1572815734
return ProcessBuffer(ctx, in, sz, format, TRUSTED_PEER_TYPE, NULL,
15729-
NULL, 0, GET_VERIFY_SETTING_CTX(ctx));
15735+
NULL, 0, verify);
1573015736
}
1573115737
#endif /* WOLFSSL_TRUST_PEER_CERT */
1573215738

0 commit comments

Comments
 (0)