Skip to content

Commit 995e63f

Browse files
committed
Fix AKID CA lookup
The `authorityCertIssuer` field refers to the Issuer field of the CA being looked up and not its Subject field.
1 parent 7b82224 commit 995e63f

3 files changed

Lines changed: 3 additions & 3 deletions

File tree

src/ssl.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5760,7 +5760,7 @@ Signer* GetCAByAKID(void* vp, const byte* issuer, word32 issuerSz,
57605760
for (row = 0; row < CA_TABLE_SIZE && ret == NULL; row++) {
57615761
for (signers = cm->caTable[row]; signers != NULL;
57625762
signers = signers->next) {
5763-
if (XMEMCMP(signers->subjectNameHash, nameHash, SIGNER_DIGEST_SIZE)
5763+
if (XMEMCMP(signers->issuerNameHash, nameHash, SIGNER_DIGEST_SIZE)
57645764
== 0 && XMEMCMP(signers->serialHash, serialHash,
57655765
SIGNER_DIGEST_SIZE) == 0) {
57665766
ret = signers;

wolfcrypt/src/asn.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26077,7 +26077,7 @@ int FillSigner(Signer* signer, DecodedCert* cert, int type, DerBuffer *der)
2607726077
#endif
2607826078
XMEMCPY(signer->subjectNameHash, cert->subjectHash,
2607926079
SIGNER_DIGEST_SIZE);
26080-
#if defined(HAVE_OCSP) || defined(HAVE_CRL)
26080+
#if defined(HAVE_OCSP) || defined(HAVE_CRL) || defined(WOLFSSL_AKID_NAME)
2608126081
XMEMCPY(signer->issuerNameHash, cert->issuerHash,
2608226082
SIGNER_DIGEST_SIZE);
2608326083
#endif

wolfssl/wolfcrypt/asn.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1957,7 +1957,7 @@ struct Signer {
19571957
#endif /* !IGNORE_NAME_CONSTRAINTS */
19581958
byte subjectNameHash[SIGNER_DIGEST_SIZE];
19591959
/* sha hash of names in certificate */
1960-
#if defined(HAVE_OCSP) || defined(HAVE_CRL)
1960+
#if defined(HAVE_OCSP) || defined(HAVE_CRL) || defined(WOLFSSL_AKID_NAME)
19611961
byte issuerNameHash[SIGNER_DIGEST_SIZE];
19621962
/* sha hash of issuer names in certificate.
19631963
* Used in OCSP to check for authorized

0 commit comments

Comments
 (0)