shimun/solo
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

check errors

Browse Source
This commit is contained in:
Conor Patrick
2019-03-21 12:47:15 -04:00
parent d68011ef04
commit a1a75e4ab5
3 changed files with 81 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fido2/ctap.c
View File

@@ -354,7 +354,7 @@ static int ctap_make_extensions(CTAP_extensions * ext, uint8_t * ext_encoder_buf
else
{
printf1(TAG_CTAP, "saltAuth is invalid\r\n");
return CTAP1_ERR_OTHER;
return CTAP2_ERR_EXTENSION_FIRST;
}
// Generate credRandom

4
fido2/ctap_parse.c
View File

@@ -601,11 +601,11 @@ uint8_t ctap_parse_hmac_secret(CborValue * val, CTAP_hmac_secret * hs)
case EXT_HMAC_SECRET_SALT_ENC:
salt_len = 64;
ret = cbor_value_copy_byte_string(&map, hs->saltEnc, &salt_len, NULL);
check_ret(ret);
if (salt_len != 32 && salt_len != 64)
if ((salt_len != 32 && salt_len != 64) || ret == CborErrorOutOfMemory)
{
return CTAP1_ERR_INVALID_LENGTH;
}
check_ret(ret);
hs->saltLen = salt_len;
parsed_count++;
break;