Skip to content

Commit e269c50

Browse files
committed
Move ee cert path variables inside client-auth guard to fix unused-variable errors
1 parent 85c07b6 commit e269c50

1 file changed

Lines changed: 26 additions & 25 deletions

File tree

tests/api/test_asn.c

Lines changed: 26 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -802,8 +802,6 @@ int test_SerialNumber0_RootCA(void)
802802
WOLFSSL_CERT_MANAGER* cm = NULL;
803803
const char* rootSerial0File = "./certs/test-serial0/root_serial0.pem";
804804
const char* rootNormalFile = "./certs/test-serial0/root.pem";
805-
const char* eeSerial0File = "./certs/test-serial0/ee_serial0.pem";
806-
const char* eeNormalFile = "./certs/test-serial0/ee_normal.pem";
807805
const char* selfSignedNonCASerial0File =
808806
"./certs/test-serial0/selfsigned_nonca_serial0.pem";
809807

@@ -821,31 +819,34 @@ int test_SerialNumber0_RootCA(void)
821819
ExpectIntEQ(wolfSSL_CertManagerLoadCA(cm, rootNormalFile, NULL),
822820
WOLFSSL_SUCCESS);
823821

824-
/* Test 3: End-entity cert with serial 0 should be rejected during verify */
825822
#if (!defined(NO_WOLFSSL_CLIENT) || !defined(WOLFSSL_NO_CLIENT_AUTH)) || \
826823
defined(OPENSSL_EXTRA)
827-
ExpectIntEQ(wolfSSL_CertManagerVerify(cm, eeSerial0File,
828-
WOLFSSL_FILETYPE_PEM), WC_NO_ERR_TRACE(ASN_PARSE_E));
829-
#endif
830-
831-
if (cm != NULL) {
832-
wolfSSL_CertManagerFree(cm);
833-
cm = NULL;
834-
}
835-
836-
/* Test 4: Normal end-entity cert signed by root CA with serial 0
837-
* should verify successfully */
838-
#if (!defined(NO_WOLFSSL_CLIENT) || !defined(WOLFSSL_NO_CLIENT_AUTH)) || \
839-
defined(OPENSSL_EXTRA)
840-
ExpectNotNull(cm = wolfSSL_CertManagerNew());
841-
ExpectIntEQ(wolfSSL_CertManagerLoadCA(cm, rootSerial0File, NULL),
842-
WOLFSSL_SUCCESS);
843-
ExpectIntEQ(wolfSSL_CertManagerVerify(cm, eeNormalFile,
844-
WOLFSSL_FILETYPE_PEM), WOLFSSL_SUCCESS);
845-
846-
if (cm != NULL) {
847-
wolfSSL_CertManagerFree(cm);
848-
cm = NULL;
824+
{
825+
const char* eeSerial0File = "./certs/test-serial0/ee_serial0.pem";
826+
const char* eeNormalFile = "./certs/test-serial0/ee_normal.pem";
827+
828+
/* Test 3: End-entity cert with serial 0 should be rejected during
829+
* verify */
830+
ExpectIntEQ(wolfSSL_CertManagerVerify(cm, eeSerial0File,
831+
WOLFSSL_FILETYPE_PEM), WC_NO_ERR_TRACE(ASN_PARSE_E));
832+
833+
if (cm != NULL) {
834+
wolfSSL_CertManagerFree(cm);
835+
cm = NULL;
836+
}
837+
838+
/* Test 4: Normal end-entity cert signed by root CA with serial 0
839+
* should verify successfully */
840+
ExpectNotNull(cm = wolfSSL_CertManagerNew());
841+
ExpectIntEQ(wolfSSL_CertManagerLoadCA(cm, rootSerial0File, NULL),
842+
WOLFSSL_SUCCESS);
843+
ExpectIntEQ(wolfSSL_CertManagerVerify(cm, eeNormalFile,
844+
WOLFSSL_FILETYPE_PEM), WOLFSSL_SUCCESS);
845+
846+
if (cm != NULL) {
847+
wolfSSL_CertManagerFree(cm);
848+
cm = NULL;
849+
}
849850
}
850851
#endif
851852

0 commit comments

Comments
 (0)