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

Merge pull request #2669 from SparkiDev/name_joi_fix

Browse Source 
Decode X.509 name - check input length for jurisdiction
This commit is contained in:
toddouska
2019-12-17 16:46:30 -08:00
committed by GitHub
parent 435d4bf427 b3cbab4bf3
commit 892e951c8a
2 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
wolfcrypt/src/asn.c
View File

@@ -5269,14 +5269,13 @@ static int GetName(DecodedCert* cert, int nameType, int maxIdx)
#endif /* WOLFSSL_CERT_EXT */ #endif /* WOLFSSL_CERT_EXT */
} }
#ifdef WOLFSSL_CERT_EXT #ifdef WOLFSSL_CERT_EXT
else if ((0 == XMEMCMP(&cert->source[cert->srcIdx], ASN_JOI_PREFIX, else if ((cert->srcIdx + ASN_JOI_PREFIX_SZ + 2 <= (word32)maxIdx) &&
XSTRLEN(ASN_JOI_PREFIX))) && (0 == XMEMCMP(&cert->source[cert->srcIdx], ASN_JOI_PREFIX,
((cert->source[cert->srcIdx + XSTRLEN(ASN_JOI_PREFIX)] == ASN_JOI_PREFIX_SZ)) &&
ASN_JOI_C) || ((cert->source[cert->srcIdx+ASN_JOI_PREFIX_SZ] == ASN_JOI_C) ||
(cert->source[cert->srcIdx + XSTRLEN(ASN_JOI_PREFIX)] == (cert->source[cert->srcIdx+ASN_JOI_PREFIX_SZ] == ASN_JOI_ST)))
ASN_JOI_ST)))
{ {
cert->srcIdx += 10; cert->srcIdx += ASN_JOI_PREFIX_SZ;
id = cert->source[cert->srcIdx++]; id = cert->source[cert->srcIdx++];
b = cert->source[cert->srcIdx++]; /* encoding */ b = cert->source[cert->srcIdx++]; /* encoding */
@@ -5342,8 +5341,7 @@ static int GetName(DecodedCert* cert, int nameType, int maxIdx)
cert->srcIdx += oidSz + 1; cert->srcIdx += oidSz + 1;
if (GetLength(cert->source, &cert->srcIdx, &strLen, if (GetLength(cert->source, &cert->srcIdx, &strLen, maxIdx) < 0)
maxIdx) < 0)
return ASN_PARSE_E; return ASN_PARSE_E;
if (strLen > (int)(ASN_NAME_MAX - idx)) { if (strLen > (int)(ASN_NAME_MAX - idx)) {

1
wolfssl/wolfcrypt/asn.h
View File

@@ -239,6 +239,7 @@ enum ECC_TYPES
#endif /* WOLFSSL_CERT_PIV */ #endif /* WOLFSSL_CERT_PIV */
#define ASN_JOI_PREFIX_SZ 10
#define ASN_JOI_PREFIX "\x2b\x06\x01\x04\x01\x82\x37\x3c\x02\x01" #define ASN_JOI_PREFIX "\x2b\x06\x01\x04\x01\x82\x37\x3c\x02\x01"
#define ASN_JOI_C 0x3 #define ASN_JOI_C 0x3
#define ASN_JOI_ST 0x2 #define ASN_JOI_ST 0x2