wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-30 10:47:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6646 from embhorn/gh5636_5637

Browse Source 
Fix RFC references and add WOLFSSL_ALLOW_CRIT_AIA
This commit is contained in:
JacobBarthelmeh
2023-10-11 13:30:42 -06:00
committed by GitHub
parent f0bfcc50d7 a19a0537ee
commit 653e5b01b1
1 changed files with 55 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

98
wolfcrypt/src/asn.c
View File

@ -19054,9 +19054,9 @@ enum {
#define authKeyIdASN_Length (sizeof(authKeyIdASN) / sizeof(ASNItem)) #define authKeyIdASN_Length (sizeof(authKeyIdASN) / sizeof(ASNItem))
#endif #endif
/* Decode authority information access extension in a certificate. /* Decode authority key identifier extension in a certificate.
* *
* X.509: RFC 5280, 4.2.2.1 - Authority Information Access. * X.509: RFC 5280, 4.2.1.1 - Authority Key Identifier.
* *
* @param [in] input Buffer holding data. * @param [in] input Buffer holding data.
* @param [in] sz Size of data in buffer. * @param [in] sz Size of data in buffer.
@ -19178,7 +19178,7 @@ static int DecodeAuthKeyId(const byte* input, word32 sz, DecodedCert* cert)
/* Decode subject key id extension in a certificate. /* Decode subject key id extension in a certificate.
* *
* X.509: RFC 5280, 4.2.2.1 - Authority Information Access. * X.509: RFC 5280, 4.2.1.2 - Subject Key Identifier.
* *
* @param [in] input Buffer holding data. * @param [in] input Buffer holding data.
* @param [in] sz Size of data in buffer. * @param [in] sz Size of data in buffer.
@ -19228,7 +19228,7 @@ enum {
/* Decode key usage extension in a certificate. /* Decode key usage extension in a certificate.
* *
* X.509: RFC 5280, 4.2.2.1 - Authority Information Access. * X.509: RFC 5280, 4.2.1.3 - Key Usage.
* *
* @param [in] input Buffer holding data. * @param [in] input Buffer holding data.
* @param [in] sz Size of data in buffer. * @param [in] sz Size of data in buffer.
@ -19970,7 +19970,7 @@ exit:
return ASN_PARSE_E; return ASN_PARSE_E;
} }
#ifndef WOLFSSL_DUP_CERTPOL #ifndef WOLFSSL_DUP_CERTPOL
/* From RFC 5280 section 4.2.1.3 "A certificate policy OID MUST /* From RFC 5280 section 4.2.1.4 "A certificate policy OID MUST
* NOT appear more than once in a certificate policies * NOT appear more than once in a certificate policies
* extension". This is a sanity check for duplicates. * extension". This is a sanity check for duplicates.
* extCertPolicies should only have OID values, additional * extCertPolicies should only have OID values, additional
@ -20079,7 +20079,7 @@ exit:
} }
} }
#ifndef WOLFSSL_DUP_CERTPOL #ifndef WOLFSSL_DUP_CERTPOL
/* From RFC 5280 section 4.2.1.3 "A certificate policy OID MUST /* From RFC 5280 section 4.2.1.4 "A certificate policy OID MUST
* NOT appear more than once in a certificate policies * NOT appear more than once in a certificate policies
* extension". This is a sanity check for duplicates. * extension". This is a sanity check for duplicates.
* extCertPolicies should only have OID values, additional * extCertPolicies should only have OID values, additional
@ -20417,7 +20417,19 @@ static int DecodeExtensionType(const byte* input, word32 length, word32 oid,
case AUTH_INFO_OID: case AUTH_INFO_OID:
VERIFY_AND_SET_OID(cert->extAuthInfoSet); VERIFY_AND_SET_OID(cert->extAuthInfoSet);
cert->extAuthInfoCrit = critical ? 1 : 0; cert->extAuthInfoCrit = critical ? 1 : 0;
if (DecodeAuthInfo(input, length, cert) < 0) { #ifndef WOLFSSL_ALLOW_CRIT_AIA
/* This check is added due to RFC 5280 section 4.2.2.1
* stating that conforming CA's must mark this extension
* as non-critical. When parsing extensions check that
* certificate was made in compliance with this. */
if (critical) {
WOLFSSL_MSG("Critical Authority Information Access is not"
"allowed");
WOLFSSL_MSG("Use macro WOLFSSL_ALLOW_CRIT_AIA if wanted");
ret = ASN_CRIT_EXT_E;
}
#endif
if ((ret == 0) && (DecodeAuthInfo(input, length, cert) < 0)) {
ret = ASN_PARSE_E; ret = ASN_PARSE_E;
} }
break; break;
@ -20433,17 +20445,17 @@ static int DecodeExtensionType(const byte* input, word32 length, word32 oid,
case AUTH_KEY_OID: case AUTH_KEY_OID:
VERIFY_AND_SET_OID(cert->extAuthKeyIdSet); VERIFY_AND_SET_OID(cert->extAuthKeyIdSet);
cert->extAuthKeyIdCrit = critical ? 1 : 0; cert->extAuthKeyIdCrit = critical ? 1 : 0;
#ifndef WOLFSSL_ALLOW_CRIT_SKID #ifndef WOLFSSL_ALLOW_CRIT_AKID
/* This check is added due to RFC 5280 section 4.2.1.1 /* This check is added due to RFC 5280 section 4.2.1.1
* stating that conforming CA's must mark this extension * stating that conforming CA's must mark this extension
* as non-critical. When parsing extensions check that * as non-critical. When parsing extensions check that
* certificate was made in compliance with this. */ * certificate was made in compliance with this. */
if (critical) { if (critical) {
WOLFSSL_MSG("Critical Auth Key ID is not allowed"); WOLFSSL_MSG("Critical Auth Key ID is not allowed");
WOLFSSL_MSG("Use macro WOLFSSL_ALLOW_CRIT_SKID if wanted"); WOLFSSL_MSG("Use macro WOLFSSL_ALLOW_CRIT_AKID if wanted");
ret = ASN_CRIT_EXT_E; ret = ASN_CRIT_EXT_E;
} }
#endif #endif
if ((ret == 0) && (DecodeAuthKeyId(input, length, cert) < 0)) { if ((ret == 0) && (DecodeAuthKeyId(input, length, cert) < 0)) {
ret = ASN_PARSE_E; ret = ASN_PARSE_E;
} }
@ -20453,17 +20465,17 @@ static int DecodeExtensionType(const byte* input, word32 length, word32 oid,
case SUBJ_KEY_OID: case SUBJ_KEY_OID:
VERIFY_AND_SET_OID(cert->extSubjKeyIdSet); VERIFY_AND_SET_OID(cert->extSubjKeyIdSet);
cert->extSubjKeyIdCrit = critical ? 1 : 0; cert->extSubjKeyIdCrit = critical ? 1 : 0;
#ifndef WOLFSSL_ALLOW_CRIT_SKID #ifndef WOLFSSL_ALLOW_CRIT_SKID
/* This check is added due to RFC 5280 section 4.2.1.2 /* This check is added due to RFC 5280 section 4.2.1.2
* stating that conforming CA's must mark this extension * stating that conforming CA's must mark this extension
* as non-critical. When parsing extensions check that * as non-critical. When parsing extensions check that
* certificate was made in compliance with this. */ * certificate was made in compliance with this. */
if (critical) { if (critical) {
WOLFSSL_MSG("Critical Subject Key ID is not allowed"); WOLFSSL_MSG("Critical Subject Key ID is not allowed");
WOLFSSL_MSG("Use macro WOLFSSL_ALLOW_CRIT_SKID if wanted"); WOLFSSL_MSG("Use macro WOLFSSL_ALLOW_CRIT_SKID if wanted");
ret = ASN_CRIT_EXT_E; ret = ASN_CRIT_EXT_E;
} }
#endif #endif
if ((ret == 0) && (DecodeSubjKeyId(input, length, cert) < 0)) { if ((ret == 0) && (DecodeSubjKeyId(input, length, cert) < 0)) {
ret = ASN_PARSE_E; ret = ASN_PARSE_E;
@ -20472,21 +20484,21 @@ static int DecodeExtensionType(const byte* input, word32 length, word32 oid,
/* Certificate policies. */ /* Certificate policies. */
case CERT_POLICY_OID: case CERT_POLICY_OID:
#if defined(WOLFSSL_SEP) || defined(WOLFSSL_QT) #if defined(WOLFSSL_SEP) || defined(WOLFSSL_QT)
VERIFY_AND_SET_OID(cert->extCertPolicySet); VERIFY_AND_SET_OID(cert->extCertPolicySet);
#if defined(OPENSSL_EXTRA) || \ #if defined(OPENSSL_EXTRA) || \
defined(OPENSSL_EXTRA_X509_SMALL) defined(OPENSSL_EXTRA_X509_SMALL)
cert->extCertPolicyCrit = critical ? 1 : 0; cert->extCertPolicyCrit = critical ? 1 : 0;
#endif
#endif
#if defined(WOLFSSL_SEP) || defined(WOLFSSL_CERT_EXT) || \
defined(WOLFSSL_QT)
if (DecodeCertPolicy(input, length, cert) < 0) {
ret = ASN_PARSE_E;
}
#else
WOLFSSL_MSG("Certificate Policy extension not supported yet.");
#endif #endif
#endif
#if defined(WOLFSSL_SEP) || defined(WOLFSSL_CERT_EXT) || \
defined(WOLFSSL_QT)
if (DecodeCertPolicy(input, length, cert) < 0) {
ret = ASN_PARSE_E;
}
#else
WOLFSSL_MSG("Certificate Policy extension not supported yet.");
#endif
break; break;
/* Key usage. */ /* Key usage. */