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

couple bugs in excludeList fixed..

Browse Source
This commit is contained in:
Conor Patrick 2018-05-24 23:13:47 -04:00
parent d9c5bf2ea1
commit 2b482f0c43
3 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ctap.c
View File

@ -482,6 +482,10 @@ uint8_t ctap_make_credential(CborEncoder * encoder, uint8_t * request, int lengt
for (i = 0; i < MC.excludeListSize; i++) for (i = 0; i < MC.excludeListSize; i++)
{ {
ret = parse_credential_descriptor(&MC.excludeList, excl_cred); ret = parse_credential_descriptor(&MC.excludeList, excl_cred);
if (ret == CTAP2_ERR_CBOR_UNEXPECTED_TYPE)
{
continue;
}
check_retr(ret); check_retr(ret);
if (ctap_authenticate_credential(&MC.rp, excl_cred)) if (ctap_authenticate_credential(&MC.rp, excl_cred))

2
ctap.h
View File

@ -165,7 +165,7 @@ typedef struct
int32_t COSEAlgorithmIdentifier; int32_t COSEAlgorithmIdentifier;
CborValue excludeList; CborValue excludeList;
int excludeListSize; size_t excludeListSize;
uint8_t rk; uint8_t rk;
uint8_t uv; uint8_t uv;

17
ctap_parse.c
View File

@ -473,7 +473,7 @@ uint8_t ctap_parse_make_credential(CTAP_makeCredential * MC, CborEncoder * encod
size_t map_length; size_t map_length;
size_t sz; size_t sz;
CborParser parser; CborParser parser;
CborValue it,map; CborValue it,map,val;
memset(MC, 0, sizeof(CTAP_makeCredential)); memset(MC, 0, sizeof(CTAP_makeCredential));
ret = cbor_parser_init(request, length, CborValidateCanonicalFormat, &parser, &it); ret = cbor_parser_init(request, length, CborValidateCanonicalFormat, &parser, &it);
@ -560,14 +560,15 @@ uint8_t ctap_parse_make_credential(CTAP_makeCredential * MC, CborEncoder * encod
{ {
ret = cbor_value_enter_container(&map, &MC->excludeList); ret = cbor_value_enter_container(&map, &MC->excludeList);
check_ret(ret); check_ret(ret);
ret = cbor_value_get_int_checked(&map, &MC->excludeListSize);
ret = cbor_value_get_array_length(&map, &MC->excludeListSize);
check_ret(ret); check_ret(ret);
} }
else else
{ {
return CTAP2_ERR_INVALID_CBOR_TYPE; return CTAP2_ERR_INVALID_CBOR_TYPE;
} }
printf1(TAG_MC,"CTAP_excludeList done\n");
break; break;
case MC_extensions: case MC_extensions:
printf1(TAG_MC,"CTAP_extensions\n"); printf1(TAG_MC,"CTAP_extensions\n");
@ -608,7 +609,6 @@ uint8_t ctap_parse_make_credential(CTAP_makeCredential * MC, CborEncoder * encod
{ {
return ret; return ret;
} }
cbor_value_advance(&map); cbor_value_advance(&map);
check_ret(ret); check_ret(ret);
} }
@ -624,7 +624,7 @@ uint8_t parse_credential_descriptor(CborValue * arr, CTAP_credentialDescriptor *
CborValue val; CborValue val;
if (cbor_value_get_type(arr) != CborMapType) if (cbor_value_get_type(arr) != CborMapType)
{ {
printf2(TAG_ERR,"Error, CborMapType expected in allow_list\n"); printf2(TAG_ERR,"Error, CborMapType expected in credential\n");
return CTAP2_ERR_INVALID_CBOR_TYPE; return CTAP2_ERR_INVALID_CBOR_TYPE;
} }
@ -666,9 +666,6 @@ uint8_t parse_credential_descriptor(CborValue * arr, CTAP_credentialDescriptor *
cred->type = PUB_KEY_CRED_UNKNOWN; cred->type = PUB_KEY_CRED_UNKNOWN;
} }
ret = cbor_value_advance(arr);
check_ret(ret);
return 0; return 0;
} }
@ -706,6 +703,10 @@ uint8_t parse_allow_list(CTAP_getAssertion * GA, CborValue * it)
ret = parse_credential_descriptor(&arr,cred); ret = parse_credential_descriptor(&arr,cred);
check_retr(ret); check_retr(ret);
ret = cbor_value_advance(&arr);
check_ret(ret);
} }
return 0; return 0;
} }