wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2026-01-30 17:32:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5164 from cconlon/x509date

Browse Source 
Remove WOLFSSL_ALT_NAMES restriction on notBefore/notAfter use in Cert struct
This commit is contained in:
David Garske
2022-05-24 12:41:00 -07:00
committed by GitHub
parent 5f148c3dcc 6a26dab73a
commit 74cbd08ff5
4 changed files with 34 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
wolfcrypt/src/asn.c
View File

@@ -21752,7 +21752,6 @@ static void SetTime(struct tm* date, byte* output)
}
#endif
#ifdef WOLFSSL_ALT_NAMES
#ifndef WOLFSSL_ASN_TEMPLATE
/* Copy Dates from cert, return bytes written */
@@ -21773,7 +21772,6 @@ static int CopyValidity(byte* output, Cert* cert)
}
#endif /* !WOLFSSL_ASN_TEMPLATE */
#endif
/* Simple name OID size. */
@@ -23997,16 +23995,14 @@ static int EncodeCert(Cert* cert, DerCert* der, RsaKey* rsaKey, ecc_key* eccKey,
return PUBLIC_KEY_E;
der->validitySz = 0;
#ifdef WOLFSSL_ALT_NAMES
/* date validity copy ? */
/* copy date validity if already set in cert struct */
if (cert->beforeDateSz && cert->afterDateSz) {
der->validitySz = CopyValidity(der->validity, cert);
if (der->validitySz <= 0)
return DATE_E;
}
#endif
/* date validity */
/* set date validity using daysValid if not set already */
if (der->validitySz == 0) {
der->validitySz = SetValidity(der->validity, cert->daysValid);
if (der->validitySz <= 0)