Merge pull request #2731 from SparkiDev/auth_key_id_set

Fix when extAuthKeyIdSet is set.
This commit is contained in:
toddouska
2020-01-17 13:14:22 -08:00
committed by GitHub

View File

@@ -8082,6 +8082,7 @@ static int DecodeAuthKeyId(const byte* input, int sz, DecodedCert* cert)
if (tag != (ASN_CONTEXT_SPECIFIC | 0)) {
WOLFSSL_MSG("\tinfo: OPTIONAL item 0, not available\n");
cert->extAuthKeyIdSet = 0;
return 0;
}
@@ -9024,7 +9025,6 @@ static int CheckCertSignature_ex(const byte* cert, word32 certSz, void* heap,
if (ret == 0) {
switch (oid) {
case AUTH_KEY_OID:
extAuthKeyIdSet = 1;
if (GetSequence(cert, &extIdx, &extLen, certSz) < 0)
ret = ASN_PARSE_E;
@@ -9037,6 +9037,7 @@ static int CheckCertSignature_ex(const byte* cert, word32 certSz, void* heap,
if (GetLength(cert, &extIdx, &extLen, certSz) <= 0)
ret = ASN_PARSE_E;
if (ret == 0) {
extAuthKeyIdSet = 1;
if (extLen == KEYID_SIZE)
XMEMCPY(hash, cert + extIdx, extLen);
else {