Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix parsing errors in ctap_parse_hmac_secret #582

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix parsing errors in ctap_parse_hmac_secret #582

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
91429c3
Fix parsing errors in ctap_parse_hmac_secret: saltEnc type was not ch…
stevenwdv Oct 14, 2021
38e7182
Fixed other type checking bug in ctap_parse_hmac_secret
stevenwdv Oct 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 35 additions & 12 deletions fido2/ctap_parse.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -561,7 +561,7 @@ uint8_t ctap_parse_hmac_secret(CborValue * val, CTAP_hmac_secret * hs)
{
size_t map_length;
size_t salt_len;
uint8_t parsed_count = 0;
size_t cose_key_parsed = 0, salt_enc_parsed = 0, salt_auth_parsed = 0;
int key;
int ret;
unsigned int i;
Expand Down Expand Up @@ -595,36 +595,59 @@ uint8_t ctap_parse_hmac_secret(CborValue * val, CTAP_hmac_secret * hs)
switch(key)
{
case EXT_HMAC_SECRET_COSE_KEY:
++cose_key_parsed;
ret = parse_cose_key(&map, &hs->keyAgreement);
check_retr(ret);
parsed_count++;
break;
case EXT_HMAC_SECRET_SALT_ENC:
++salt_enc_parsed;
salt_len = 64;
ret = cbor_value_copy_byte_string(&map, hs->saltEnc, &salt_len, NULL);
if ((salt_len != 32 && salt_len != 64) || ret == CborErrorOutOfMemory)
if (cbor_value_get_type(&map) == CborByteStringType)
{
return CTAP1_ERR_INVALID_LENGTH;
ret = cbor_value_copy_byte_string(&map, hs->saltEnc, &salt_len, NULL);
if ((salt_len != 32 && salt_len != 64) || ret == CborErrorOutOfMemory)
{
return CTAP1_ERR_INVALID_LENGTH;
}
check_ret(ret);
}
else
{
printf2(TAG_ERR, "error, CborByteStringType expected\r\n");
return CTAP2_ERR_INVALID_CBOR_TYPE;
}
check_ret(ret);
hs->saltLen = salt_len;
parsed_count++;
break;
case EXT_HMAC_SECRET_SALT_AUTH:
++salt_auth_parsed;
salt_len = 32;
ret = cbor_value_copy_byte_string(&map, hs->saltAuth, &salt_len, NULL);
check_ret(ret);
parsed_count++;
if (cbor_value_get_type(&map) == CborByteStringType)
{
ret = cbor_value_copy_byte_string(&map, hs->saltAuth, &salt_len, NULL);
check_ret(ret);
}
else
{
printf2(TAG_ERR, "error, CborByteStringType expected\r\n");
return CTAP2_ERR_INVALID_CBOR_TYPE;
}
break;
}

ret = cbor_value_advance(&map);
check_ret(ret);
}

if (parsed_count != 3)
if (cose_key_parsed > 1 || salt_enc_parsed > 1 || salt_auth_parsed > 1)
{
printf2(TAG_ERR, "ctap_parse_hmac_secret duplicate key.\r\n");
return CTAP2_ERR_INVALID_CBOR;
}

if (!(cose_key_parsed && salt_enc_parsed && salt_auth_parsed))
{
printf2(TAG_ERR, "ctap_parse_hmac_secret missing parameter. Got %d.\r\n", parsed_count);
printf2(TAG_ERR, "ctap_parse_hmac_secret missing parameter. Got %d.\r\n",
cose_key_parsed + salt_enc_parsed + salt_auth_parsed);
return CTAP2_ERR_MISSING_PARAMETER;
}

Expand Down