feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

Merge pull request #2625 from SparkiDev/set_ser_num_2

Browse Source 
Support 20-byte serial numbers and disallow 0.
This commit is contained in:
toddouska
2019-12-05 16:17:54 -08:00
committed by GitHub
parent bd8a612d6c 16ac0d8eb6
commit 8cc4c62c14
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
wolfcrypt/src/asn.c
View File

@ -9042,10 +9042,14 @@ WOLFSSL_LOCAL int SetSerialNumber(const byte* sn, word32 snSz, byte* output,
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
/* remove leading zeros */ /* remove leading zeros */
while (snSzInt > 1 && sn[0] == 0) { while (snSzInt > 0 && sn[0] == 0) {
snSzInt--; snSzInt--;
sn++; sn++;
} }
/* RFC 5280 - 4.1.2.2:
* Serial numbers must be a postive value (and not zero) */
if (snSzInt == 0)
return BAD_FUNC_ARG;
if (sn[0] & 0x80) if (sn[0] & 0x80)
maxSnSz--; maxSnSz--;
@ -9055,8 +9059,8 @@ WOLFSSL_LOCAL int SetSerialNumber(const byte* sn, word32 snSz, byte* output,
i = SetASNInt(snSzInt, sn[0], NULL); i = SetASNInt(snSzInt, sn[0], NULL);
/* truncate if input is too long */ /* truncate if input is too long */
if ((word32)snSzInt > outputSz - i) if (snSzInt > (int)outputSz - i)
snSzInt = outputSz - i; snSzInt = (int)outputSz - i;
/* sanity check number of bytes to copy */ /* sanity check number of bytes to copy */
if (snSzInt <= 0) { if (snSzInt <= 0) {
return BUFFER_E; return BUFFER_E;
@ -11920,7 +11924,7 @@ static int EncodeCert(Cert* cert, DerCert* der, RsaKey* rsaKey, ecc_key* eccKey,
/* serial number (must be positive) */ /* serial number (must be positive) */
if (cert->serialSz == 0) { if (cert->serialSz == 0) {
/* generate random serial */ /* generate random serial */
cert->serialSz = CTC_SERIAL_SIZE; cert->serialSz = CTC_GEN_SERIAL_SZ;
ret = wc_RNG_GenerateBlock(rng, cert->serial, cert->serialSz); ret = wc_RNG_GenerateBlock(rng, cert->serial, cert->serialSz);
if (ret != 0) if (ret != 0)
return ret; return ret;

3
wolfssl/wolfcrypt/asn_public.h
View File

@ -146,7 +146,8 @@ enum Ctc_Misc {
CTC_NAME_SIZE = WC_CTC_NAME_SIZE, CTC_NAME_SIZE = WC_CTC_NAME_SIZE,
CTC_DATE_SIZE = 32, CTC_DATE_SIZE = 32,
CTC_MAX_ALT_SIZE = WC_CTC_MAX_ALT_SIZE, /* may be huge, default: 16384 */ CTC_MAX_ALT_SIZE = WC_CTC_MAX_ALT_SIZE, /* may be huge, default: 16384 */
CTC_SERIAL_SIZE = 16, CTC_SERIAL_SIZE = 20,
CTC_GEN_SERIAL_SZ = 16,
#ifdef WOLFSSL_CERT_EXT #ifdef WOLFSSL_CERT_EXT
/* AKID could contains: hash + (Option) AuthCertIssuer,AuthCertSerialNum /* AKID could contains: hash + (Option) AuthCertIssuer,AuthCertSerialNum
* We support only hash */ * We support only hash */