Skip to content

Commit 481ae20

Browse files
committed
Maintain consistent behavior when activating CRL
1 parent fd17fa3 commit 481ae20

2 files changed

Lines changed: 8 additions & 5 deletions

File tree

src/ssl.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8208,19 +8208,19 @@ int wolfSSL_CertManagerEnableCRL(WOLFSSL_CERT_MANAGER* cm, int options)
82088208
{
82098209
int ret = WOLFSSL_SUCCESS;
82108210

8211-
(void)options;
8212-
82138211
WOLFSSL_ENTER("wolfSSL_CertManagerEnableCRL");
82148212
if (cm == NULL)
82158213
return BAD_FUNC_ARG;
8216-
#if defined(OPENSSL_COMPATIBLE_DEFAULTS)
82178214
if (options == 0) {
8215+
#if defined(OPENSSL_COMPATIBLE_DEFAULTS)
82188216
/* Turn off doing Leaf CRL check */
82198217
cm->crlEnabled = 0;
82208218
/* Turn off all checks */
82218219
cm->crlCheckAll = 0;
8222-
}
82238220
#endif
8221+
return ret;
8222+
}
8223+
82248224
#ifdef HAVE_CRL
82258225
if (cm->crl == NULL) {
82268226
cm->crl = (WOLFSSL_CRL*)XMALLOC(sizeof(WOLFSSL_CRL), cm->heap,

src/x509_str.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -979,7 +979,10 @@ int wolfSSL_X509_STORE_set_flags(WOLFSSL_X509_STORE* store, unsigned long flag)
979979
if (store == NULL)
980980
return WOLFSSL_FAILURE;
981981

982-
ret = wolfSSL_CertManagerEnableCRL(store->cm, (int)flag);
982+
if ((flag & WOLFSSL_CRL_CHECKALL) || (flag & WOLFSSL_CRL_CHECK) ||
983+
flag == 0 ) {
984+
ret = wolfSSL_CertManagerEnableCRL(store->cm, (int)flag);
985+
}
983986

984987
return ret;
985988
}

0 commit comments

Comments
 (0)