Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow critical alt and basic constraints extensions #8542

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
+482 −10
Open

Allow critical alt and basic constraints extensions #8542

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f8506c3
Allow critical alt and basic constraints extensions
anhu Mar 6, 2025
6d6c5f5
unit tests
anhu Mar 7, 2025
b608946
Guard fix.
anhu Mar 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/internal.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13477,7 +13477,9 @@ int CopyDecodedToX509(WOLFSSL_X509* x509, DecodedCert* dCert)

x509->isCa = dCert->isCA;
#if defined(OPENSSL_EXTRA) || defined(OPENSSL_EXTRA_X509_SMALL)
x509->basicConstCrit = dCert->extBasicConstCrit;
x509->pathLength = dCert->pathLength;
x509->pathLengthSet = dCert->pathLengthSet;
x509->keyUsage = dCert->extKeyUsage;

x509->CRLdistSet = dCert->extCRLdistSet;
Expand Down Expand Up @@ -13531,7 +13533,6 @@ int CopyDecodedToX509(WOLFSSL_X509* x509, DecodedCert* dCert)
}
#endif
x509->basicConstSet = dCert->extBasicConstSet;
x509->basicConstCrit = dCert->extBasicConstCrit;
x509->basicConstPlSet = dCert->pathLengthSet;
x509->subjAltNameSet = dCert->extSubjAltNameSet;
x509->subjAltNameCrit = dCert->extSubjAltNameCrit;
Expand Down Expand Up @@ -13644,6 +13645,7 @@ int CopyDecodedToX509(WOLFSSL_X509* x509, DecodedCert* dCert)
if (x509->sapkiDer != NULL) {
XMEMCPY(x509->sapkiDer, dCert->sapkiDer, dCert->sapkiLen);
x509->sapkiLen = dCert->sapkiLen;
x509->sapkiCrit = dCert->extSapkiCrit;
}
else {
ret = MEMORY_E;
Expand All @@ -13656,6 +13658,7 @@ int CopyDecodedToX509(WOLFSSL_X509* x509, DecodedCert* dCert)
XMEMCPY(x509->altSigAlgDer, dCert->altSigAlgDer,
dCert->altSigAlgLen);
x509->altSigAlgLen = dCert->altSigAlgLen;
x509->altSigAlgCrit = dCert->extAltSigAlgCrit;
}
else {
ret = MEMORY_E;
Expand All @@ -13668,6 +13671,7 @@ int CopyDecodedToX509(WOLFSSL_X509* x509, DecodedCert* dCert)
XMEMCPY(x509->altSigValDer, dCert->altSigValDer,
dCert->altSigValLen);
x509->altSigValLen = dCert->altSigValLen;
x509->altSigValCrit = dCert->extAltSigValCrit;
}
else {
ret = MEMORY_E;
Expand Down
8 changes: 7 additions & 1 deletion src/x509.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10674,7 +10674,10 @@ static int CertFromX509(Cert* cert, WOLFSSL_X509* x509)
cert->sigType = wolfSSL_X509_get_signature_type(x509);
cert->keyType = x509->pubKeyOID;
cert->isCA = wolfSSL_X509_get_isCA(x509);
cert->basicConstCrit = x509->basicConstCrit;
cert->basicConstSet = x509->basicConstSet;
cert->pathLen = x509->pathLength;
cert->pathLenSet = x509->pathLengthSet;

#ifdef WOLFSSL_CERT_EXT
if (x509->subjKeyIdSz <= CTC_MAX_SKID_SIZE) {
Expand Down Expand Up @@ -10741,10 +10744,13 @@ static int CertFromX509(Cert* cert, WOLFSSL_X509* x509)
/* We point to instance in x509 so DON'T need to be free'd. */
cert->sapkiDer = x509->sapkiDer;
cert->sapkiLen = x509->sapkiLen;
cert->sapkiCrit = x509->sapkiCrit;
cert->altSigAlgDer = x509->altSigAlgDer;
cert->altSigAlgLen = x509->altSigAlgLen;
cert->altSigAlgLen = x509->altSigAlgLen;
cert->altSigAlgCrit = x509->altSigAlgCrit;
cert->altSigValDer = x509->altSigValDer;
cert->altSigValLen = x509->altSigValLen;
cert->altSigValCrit = x509->altSigValCrit;
#endif /* WOLFSSL_DUAL_ALG_CERTS */
#endif /* WOLFSSL_CERT_EXT */

Expand Down
Loading
Loading