Skip to content

Commit 829fbbc

Browse files
julek-wolfssljulek-wolfssl
committed
Fix namespace collision on CRL reasons
1 parent 6fc93ac commit 829fbbc

4 files changed

Lines changed: 23 additions & 23 deletions

File tree

‎examples/ocsp_responder/ocsp_responder.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -434,7 +434,7 @@ static int PopulateResponderFromIndex(OcspResponder* responder,
434434
word32 serialLen = 0;
435435
enum Ocsp_Cert_Status status;
436436
time_t revTime = 0;
437-
enum WC_CRL_Reason revReason = CRL_REASON_UNSPECIFIED;
437+
enum WC_CRL_Reason revReason = WC_CRL_REASON_UNSPECIFIED;
438438
word32 validity = 86400;
439439
char* p = entry->serial;
440440
word32 i;
@@ -487,7 +487,7 @@ static int PopulateResponderFromIndex(OcspResponder* responder,
487487
else if (entry->status == 'R') {
488488
status = CERT_REVOKED;
489489
revTime = entry->revocationTime;
490-
revReason = CRL_REASON_UNSPECIFIED;
490+
revReason = WC_CRL_REASON_UNSPECIFIED;
491491
validity = 0;
492492
}
493493
else {

‎src/ocsp.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2520,8 +2520,8 @@ int wc_OcspResponder_SetCertStatus(OcspResponder* responder,
25202520
if (status == CERT_REVOKED) {
25212521
if (revocationTime <= 0)
25222522
goto out;
2523-
if (revocationReason < CRL_REASON_UNSPECIFIED ||
2524-
revocationReason > CRL_REASON_AA_COMPROMISE)
2523+
if (revocationReason < WC_CRL_REASON_UNSPECIFIED ||
2524+
revocationReason > WC_CRL_REASON_AA_COMPROMISE)
25252525
goto out;
25262526
/* Skip value 7 which is not used */
25272527
if (revocationReason == 7)

‎tests/api/test_ocsp.c‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1510,7 +1510,7 @@ int test_ocsp_responder(void)
15101510
"./certs/ca-key.der",
15111511
"./certs/server-cert.der",
15121512
CERT_GOOD,
1513-
0, CRL_REASON_UNSPECIFIED,
1513+
0, WC_CRL_REASON_UNSPECIFIED,
15141514
86400, /* validityPeriod - 24 hours */
15151515
0,
15161516
"RSA server cert - GOOD status"
@@ -1521,7 +1521,7 @@ int test_ocsp_responder(void)
15211521
"./certs/ca-key.der",
15221522
"./certs/server-cert.der",
15231523
CERT_REVOKED,
1524-
now, CRL_REASON_KEY_COMPROMISE, /* Revoked due to key compromise */
1524+
now, WC_CRL_REASON_KEY_COMPROMISE, /* Revoked due to key compromise */
15251525
0, /* validityPeriod (not used for REVOKED) */
15261526
OCSP_CERT_REVOKED,
15271527
"RSA server cert - REVOKED status"
@@ -1532,7 +1532,7 @@ int test_ocsp_responder(void)
15321532
"./certs/ca-key.der",
15331533
"./certs/server-cert.der",
15341534
CERT_UNKNOWN,
1535-
0, CRL_REASON_UNSPECIFIED,
1535+
0, WC_CRL_REASON_UNSPECIFIED,
15361536
0, /* validityPeriod (not used for UNKNOWN) */
15371537
OCSP_CERT_UNKNOWN,
15381538
"RSA server cert - UNKNOWN status"
@@ -1543,7 +1543,7 @@ int test_ocsp_responder(void)
15431543
"./certs/ocsp/ocsp-responder-key.der",
15441544
"./certs/ocsp/intermediate1-ca-cert.der",
15451545
CERT_GOOD,
1546-
0, CRL_REASON_UNSPECIFIED,
1546+
0, WC_CRL_REASON_UNSPECIFIED,
15471547
86400, /* validityPeriod - 24 hours */
15481548
0,
15491549
"RSA int1 cert with responder - GOOD status"
@@ -1554,7 +1554,7 @@ int test_ocsp_responder(void)
15541554
"./certs/ocsp/ocsp-responder-key.der",
15551555
"./certs/ocsp/intermediate1-ca-cert.der",
15561556
CERT_REVOKED,
1557-
now, CRL_REASON_KEY_COMPROMISE, /* Revoked due to key compromise */
1557+
now, WC_CRL_REASON_KEY_COMPROMISE, /* Revoked due to key compromise */
15581558
0, /* validityPeriod (not used for REVOKED) */
15591559
OCSP_CERT_REVOKED,
15601560
"RSA int1 cert with responder - REVOKED status"
@@ -1565,7 +1565,7 @@ int test_ocsp_responder(void)
15651565
"./certs/ocsp/ocsp-responder-key.der",
15661566
"./certs/ocsp/intermediate1-ca-cert.der",
15671567
CERT_UNKNOWN,
1568-
0, CRL_REASON_UNSPECIFIED,
1568+
0, WC_CRL_REASON_UNSPECIFIED,
15691569
0, /* validityPeriod (not used for UNKNOWN) */
15701570
OCSP_CERT_UNKNOWN,
15711571
"RSA int1 cert with responder - UNKNOWN status"
@@ -1577,7 +1577,7 @@ int test_ocsp_responder(void)
15771577
"./certs/ca-ecc-key.der",
15781578
"./certs/server-ecc.der",
15791579
CERT_GOOD,
1580-
0, CRL_REASON_UNSPECIFIED,
1580+
0, WC_CRL_REASON_UNSPECIFIED,
15811581
86400, /* validityPeriod - 24 hours */
15821582
0,
15831583
"ECC server cert - GOOD status"
@@ -1588,7 +1588,7 @@ int test_ocsp_responder(void)
15881588
"./certs/ca-ecc-key.der",
15891589
"./certs/server-ecc.der",
15901590
CERT_REVOKED,
1591-
now, CRL_REASON_AFFILIATION_CHANGED,
1591+
now, WC_CRL_REASON_AFFILIATION_CHANGED,
15921592
0, /* validityPeriod (not used for REVOKED) */
15931593
OCSP_CERT_REVOKED,
15941594
"ECC server cert - REVOKED status"
@@ -1599,7 +1599,7 @@ int test_ocsp_responder(void)
15991599
"./certs/ca-ecc-key.der",
16001600
"./certs/server-ecc.der",
16011601
CERT_UNKNOWN,
1602-
0, CRL_REASON_UNSPECIFIED,
1602+
0, WC_CRL_REASON_UNSPECIFIED,
16031603
0, /* validityPeriod (not used for UNKNOWN) */
16041604
OCSP_CERT_UNKNOWN,
16051605
"ECC server cert - UNKNOWN status"

‎wolfssl/wolfcrypt/asn.h‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2899,17 +2899,17 @@ WOLFSSL_LOCAL int OcspDecodeCertID(const byte* input, word32* inOutIdx, word32 i
28992899
#ifdef HAVE_OCSP_RESPONDER
29002900
/* Revocation reason codes from RFC 5280 */
29012901
enum WC_CRL_Reason {
2902-
CRL_REASON_UNSPECIFIED = 0,
2903-
CRL_REASON_KEY_COMPROMISE = 1,
2904-
CRL_REASON_CA_COMPROMISE = 2,
2905-
CRL_REASON_AFFILIATION_CHANGED = 3,
2906-
CRL_REASON_SUPERSEDED = 4,
2907-
CRL_REASON_CESSATION_OF_OPERATION = 5,
2908-
CRL_REASON_CERTIFICATE_HOLD = 6,
2902+
WC_CRL_REASON_UNSPECIFIED = 0,
2903+
WC_CRL_REASON_KEY_COMPROMISE = 1,
2904+
WC_CRL_REASON_CA_COMPROMISE = 2,
2905+
WC_CRL_REASON_AFFILIATION_CHANGED = 3,
2906+
WC_CRL_REASON_SUPERSEDED = 4,
2907+
WC_CRL_REASON_CESSATION_OF_OPERATION = 5,
2908+
WC_CRL_REASON_CERTIFICATE_HOLD = 6,
29092909
/* value 7 is not used */
2910-
CRL_REASON_REMOVE_FROM_CRL = 8,
2911-
CRL_REASON_PRIVILEGE_WITHDRAWN = 9,
2912-
CRL_REASON_AA_COMPROMISE = 10
2910+
WC_CRL_REASON_REMOVE_FROM_CRL = 8,
2911+
WC_CRL_REASON_PRIVILEGE_WITHDRAWN = 9,
2912+
WC_CRL_REASON_AA_COMPROMISE = 10
29132913
};
29142914

29152915
/* Certificate status entry for a single certificate */

0 commit comments

Comments
 (0)