Skip to content

Commit

Permalink
Exclude unit tests failing with WOLFSSL_CRL_ALLOW_MISSING_CDP
Browse files Browse the repository at this point in the history
  • Loading branch information
embhorn committed Jul 16, 2024
1 parent 305b245 commit 4a89384
Showing 1 changed file with 19 additions and 6 deletions.
25 changes: 19 additions & 6 deletions tests/api.c
Original file line number Diff line number Diff line change
Expand Up @@ -3709,6 +3709,7 @@ static int test_wolfSSL_CertManagerCRL(void)
wolfSSL_CertManagerLoadCRL(cm, crl2, WOLFSSL_FILETYPE_PEM, 0));
wolfSSL_CertManagerFreeCRL(cm);

#ifndef WOLFSSL_CRL_ALLOW_MISSING_CDP
ExpectIntEQ(WOLFSSL_SUCCESS,
wolfSSL_CertManagerLoadCRL(cm, crl1, WOLFSSL_FILETYPE_PEM, 0));
ExpectIntEQ(WOLFSSL_SUCCESS,
Expand All @@ -3717,6 +3718,7 @@ static int test_wolfSSL_CertManagerCRL(void)
sizeof_server_cert_der_2048), CRL_MISSING);
ExpectIntEQ(wolfSSL_CertManagerVerifyBuffer(cm, server_cert_der_2048,
sizeof_server_cert_der_2048, WOLFSSL_FILETYPE_ASN1), CRL_MISSING);
#endif /* !WOLFSSL_CRL_ALLOW_MISSING_CDP */

ExpectIntEQ(wolfSSL_CertManagerLoadCRLBuffer(cm, crl_buff, sizeof(crl_buff),
WOLFSSL_FILETYPE_ASN1), 1);
Expand Down Expand Up @@ -48722,13 +48724,15 @@ static int test_wolfSSL_X509_STORE(void)

#ifdef HAVE_CRL
X509_STORE_CTX *storeCtx = NULL;
X509_CRL *crl = NULL;
X509 *ca = NULL;
X509 *cert = NULL;
const char crlPem[] = "./certs/crl/crl.revoked";
const char srvCert[] = "./certs/server-revoked-cert.pem";
const char caCert[] = "./certs/ca-cert.pem";
#ifndef WOLFSSL_CRL_ALLOW_MISSING_CDP
X509_CRL *crl = NULL;
const char crlPem[] = "./certs/crl/crl.revoked";
XFILE fp = XBADFILE;
#endif /* !WOLFSSL_CRL_ALLOW_MISSING_CDP */

ExpectNotNull(store = (X509_STORE *)X509_STORE_new());
ExpectNotNull((ca = wolfSSL_X509_load_certificate_file(caCert,
Expand All @@ -48748,6 +48752,7 @@ static int test_wolfSSL_X509_STORE(void)
X509_free(ca);
ca = NULL;

#ifndef WOLFSSL_CRL_ALLOW_MISSING_CDP
/* should fail to verify now after adding in CRL */
ExpectNotNull(store = (X509_STORE *)X509_STORE_new());
ExpectNotNull((ca = wolfSSL_X509_load_certificate_file(caCert,
Expand Down Expand Up @@ -48777,6 +48782,7 @@ static int test_wolfSSL_X509_STORE(void)
cert = NULL;
X509_free(ca);
ca = NULL;
#endif /* !WOLFSSL_CRL_ALLOW_MISSING_CDP */
#endif /* HAVE_CRL */


Expand Down Expand Up @@ -66996,7 +67002,8 @@ static int test_wolfSSL_X509_load_crl_file(void)
{
EXPECT_DECLS;
#if defined(OPENSSL_EXTRA) && defined(HAVE_CRL) && !defined(NO_FILESYSTEM) && \
!defined(NO_STDIO_FILESYSTEM) && !defined(NO_RSA) && !defined(NO_BIO)
!defined(NO_STDIO_FILESYSTEM) && !defined(NO_RSA) && !defined(NO_BIO) && \
!defined(WOLFSSL_CRL_ALLOW_MISSING_CDP)
int i;
char pem[][100] = {
"./certs/crl/crl.pem",
Expand Down Expand Up @@ -73696,7 +73703,8 @@ static int test_multiple_crls_same_issuer_ctx_ready(WOLFSSL_CTX* ctx)
static int test_multiple_crls_same_issuer(void)
{
EXPECT_DECLS;
#if defined(HAVE_SSL_MEMIO_TESTS_DEPENDENCIES) && defined(HAVE_CRL)
#if defined(HAVE_SSL_MEMIO_TESTS_DEPENDENCIES) && defined(HAVE_CRL) && \
!defined(WOLFSSL_CRL_ALLOW_MISSING_CDP)
test_ssl_cbf client_cbs, server_cbs;
struct {
const char* server_cert;
Expand All @@ -73720,6 +73728,8 @@ static int test_multiple_crls_same_issuer(void)
ExpectIntEQ(test_wolfSSL_client_server_nofail_memio(&client_cbs,
&server_cbs, NULL), TEST_FAIL);
}
#else
(void)test_multiple_crls_same_issuer_ctx_ready;
#endif
return EXPECT_RESULT();
}
Expand Down Expand Up @@ -81349,7 +81359,8 @@ static int test_revoked_loaded_int_cert_ctx_ready2(WOLFSSL_CTX* ctx)
static int test_revoked_loaded_int_cert(void)
{
EXPECT_DECLS;
#if defined(HAVE_CRL) && defined(HAVE_SSL_MEMIO_TESTS_DEPENDENCIES)
#if defined(HAVE_CRL) && defined(HAVE_SSL_MEMIO_TESTS_DEPENDENCIES) && \
!defined(WOLFSSL_CRL_ALLOW_MISSING_CDP)
test_ssl_cbf client_cbf;
test_ssl_cbf server_cbf;
struct {
Expand Down Expand Up @@ -81389,7 +81400,9 @@ static int test_revoked_loaded_int_cert(void)
break;
printf("\t%s passed\n", test_params[i].certPemFile);
}

#else
(void)test_revoked_loaded_int_cert_ctx_ready1;
(void)test_revoked_loaded_int_cert_ctx_ready2;
#endif
return EXPECT_RESULT();
}
Expand Down

0 comments on commit 4a89384

Please sign in to comment.