wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-08-02 20:24:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix for scan build warning and better check on size

Browse Source
This commit is contained in:
Jacob Barthelmeh
2021-09-13 09:35:55 -06:00
parent 602ec188ad
commit f06414903c
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
wolfcrypt/src/asn.c
View File

@@ -26821,14 +26821,14 @@ static int DecodeAsymKey(const byte* input, word32* inOutIdx, word32 inSz,
if (GetOctetString(input, inOutIdx, &privSz, inSz) < 0) if (GetOctetString(input, inOutIdx, &privSz, inSz) < 0)
return ASN_PARSE_E; return ASN_PARSE_E;
if ((word32)privSz > *privKeyLen)
return BUFFER_E;
priv = input + *inOutIdx; priv = input + *inOutIdx;
*inOutIdx += privSz; *inOutIdx += privSz;
endKeyIdx = *inOutIdx; endKeyIdx = *inOutIdx;
} }
if ((word32)privSz > *privKeyLen)
return BUFFER_E;
if (endKeyIdx == (int)*inOutIdx) { if (endKeyIdx == (int)*inOutIdx) {
*privKeyLen = privSz; *privKeyLen = privSz;
XMEMCPY(privKey, priv, *privKeyLen); XMEMCPY(privKey, priv, *privKeyLen);
@@ -26836,6 +26836,10 @@ static int DecodeAsymKey(const byte* input, word32* inOutIdx, word32 inSz,
*pubKeyLen = 0; *pubKeyLen = 0;
} }
else { else {
if (pubKeyLen == NULL) {
return BAD_FUNC_ARG;
}
if (GetASNHeader(input, ASN_CONTEXT_SPECIFIC | ASN_CONSTRUCTED | 1, if (GetASNHeader(input, ASN_CONTEXT_SPECIFIC | ASN_CONSTRUCTED | 1,
inOutIdx, &length, inSz) < 0) { inOutIdx, &length, inSz) < 0) {
return ASN_PARSE_E; return ASN_PARSE_E;