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 #5220 from kaleb-himes/ZD14318

Browse Source 
Resolves inter-library API conflict reported in ZD14318
This commit is contained in:
David Garske
2022-06-13 14:28:13 -07:00
committed by GitHub
parent f401a3b53d 37ee5e2540
commit af3a55a94c
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
wolfcrypt/src/asn.c
View File

@ -9954,7 +9954,7 @@ static int GetCertHeader(DecodedCert* cert)
cert->sigIndex) < 0) cert->sigIndex) < 0)
return ASN_PARSE_E; return ASN_PARSE_E;
if (GetSerialNumber(cert->source, &cert->srcIdx, cert->serial, if (wc_GetSerialNumber(cert->source, &cert->srcIdx, cert->serial,
&cert->serialSz, cert->sigIndex) < 0) &cert->serialSz, cert->sigIndex) < 0)
return ASN_PARSE_E; return ASN_PARSE_E;
@ -19343,13 +19343,13 @@ int SetSerialNumber(const byte* sn, word32 snSz, byte* output,
#endif /* !NO_CERTS */ #endif /* !NO_CERTS */
#ifndef WOLFSSL_ASN_TEMPLATE #ifndef WOLFSSL_ASN_TEMPLATE
int GetSerialNumber(const byte* input, word32* inOutIdx, int wc_GetSerialNumber(const byte* input, word32* inOutIdx,
byte* serial, int* serialSz, word32 maxIdx) byte* serial, int* serialSz, word32 maxIdx)
{ {
int result = 0; int result = 0;
int ret; int ret;
WOLFSSL_ENTER("GetSerialNumber"); WOLFSSL_ENTER("wc_GetSerialNumber");
if (serial == NULL || input == NULL || serialSz == NULL) { if (serial == NULL || input == NULL || serialSz == NULL) {
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
@ -29754,7 +29754,8 @@ static int DecodeSingleResponse(byte* source, word32* ioIndex, word32 size,
idx += length; idx += length;
/* Get serial number */ /* Get serial number */
if (GetSerialNumber(source, &idx, single->status->serial, &single->status->serialSz, size) < 0) if (wc_GetSerialNumber(source, &idx, single->status->serial,
&single->status->serialSz, size) < 0)
return ASN_PARSE_E; return ASN_PARSE_E;
single->rawCertIdSize = idx - certIdIdx; single->rawCertIdSize = idx - certIdIdx;
@ -31532,7 +31533,7 @@ static int GetRevoked(const byte* buff, word32* idx, DecodedCRL* dcrl,
return MEMORY_E; return MEMORY_E;
} }
if (GetSerialNumber(buff, idx, rc->serialNumber, &rc->serialSz, if (wc_GetSerialNumber(buff, idx, rc->serialNumber, &rc->serialSz,
maxIdx) < 0) { maxIdx) < 0) {
XFREE(rc, dcrl->heap, DYNAMIC_TYPE_REVOKED); XFREE(rc, dcrl->heap, DYNAMIC_TYPE_REVOKED);
return ASN_PARSE_E; return ASN_PARSE_E;

2
wolfssl/wolfcrypt/asn.h
View File

@ -2024,7 +2024,7 @@ WOLFSSL_LOCAL int SetMyVersion(word32 version, byte* output, int header);
WOLFSSL_LOCAL int SetSerialNumber(const byte* sn, word32 snSz, byte* output, WOLFSSL_LOCAL int SetSerialNumber(const byte* sn, word32 snSz, byte* output,
word32 outputSz, int maxSnSz); word32 outputSz, int maxSnSz);
#ifndef WOLFSSL_ASN_TEMPLATE #ifndef WOLFSSL_ASN_TEMPLATE
WOLFSSL_LOCAL int GetSerialNumber(const byte* input, word32* inOutIdx, WOLFSSL_LOCAL int wc_GetSerialNumber(const byte* input, word32* inOutIdx,
byte* serial, int* serialSz, word32 maxIdx); byte* serial, int* serialSz, word32 maxIdx);
#endif #endif
WOLFSSL_LOCAL int GetNameHash(const byte* source, word32* idx, byte* hash, WOLFSSL_LOCAL int GetNameHash(const byte* source, word32* idx, byte* hash,