WolfSSL
/
wolfssl
mirror of https://github.com/wolfSSL/wolfssl.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix ASN template code to use the subject as issuer if cert is selfsigned.

pull/5411/head
Anthony Hu 2022-07-27 16:38:17 -04:00
parent a56d25d58e
commit 33579045f2
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
wolfcrypt/src/asn.c
View File

@ -25757,8 +25757,10 @@ static int MakeAnyCert(Cert* cert, byte* derBuffer, word32 derSz,
else else
#endif #endif
{ {
/* Calcuate issuer name encoding size. */ /* Calcuate issuer name encoding size. If the cert is self-signed
issuerSz = SetNameEx(NULL, WC_ASN_NAME_MAX, &cert->issuer, cert->heap); * use the subject instead of the issuer. */
issuerSz = SetNameEx(NULL, WC_ASN_NAME_MAX, cert->selfSigned ?
&cert->subject : &cert->issuer, cert->heap);
ret = issuerSz; ret = issuerSz;
} }
} }
@ -25774,7 +25776,8 @@ static int MakeAnyCert(Cert* cert, byte* derBuffer, word32 derSz,
#endif #endif
{ {
/* Calcuate subject name encoding size. */ /* Calcuate subject name encoding size. */
subjectSz = SetNameEx(NULL, WC_ASN_NAME_MAX, &cert->subject, cert->heap); subjectSz = SetNameEx(NULL, WC_ASN_NAME_MAX, &cert->subject,
cert->heap);
ret = subjectSz; ret = subjectSz;
} }
} }
@ -25906,11 +25909,13 @@ static int MakeAnyCert(Cert* cert, byte* derBuffer, word32 derSz,
SetASN_Items(x509CertASN, dataASN, x509CertASN_Length, derBuffer); SetASN_Items(x509CertASN, dataASN, x509CertASN_Length, derBuffer);
if (issRawLen == 0) { if (issRawLen == 0) {
/* Encode issuer name into buffer. */ /* Encode issuer name into buffer. Use the subject as the issuer
* if it is self-signed. Size will be correct because we did the
* same for size. */
ret = SetNameEx( ret = SetNameEx(
(byte*)dataASN[X509CERTASN_IDX_TBS_ISSUER_SEQ].data.buffer.data, (byte*)dataASN[X509CERTASN_IDX_TBS_ISSUER_SEQ].data.buffer.data,
dataASN[X509CERTASN_IDX_TBS_ISSUER_SEQ].data.buffer.length, dataASN[X509CERTASN_IDX_TBS_ISSUER_SEQ].data.buffer.length,
&cert->issuer, cert->heap); cert->selfSigned ? &cert->subject : &cert->issuer, cert->heap);
} }
} }
if ((ret >= 0) && (sbjRawLen == 0)) { if ((ret >= 0) && (sbjRawLen == 0)) {