dearsky/pico-fido
1
0
Fork 0
Code Issues 46 Pull Requests 1 Actions Packages Projects Releases 22 Wiki Activity

Adding check UP if not provided.

Browse Source 
Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>
This commit is contained in:
Pol Henarejos
2022-09-23 18:07:16 +02:00
parent bfc82d5de4
commit 0e4532a22c
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/fido/cbor_get_assertion.c
View File

@@ -87,7 +87,6 @@ int cbor_get_assertion(const uint8_t *data, size_t len, bool next) {
int64_t kty = 2, alg = 0, crv = 0; int64_t kty = 2, alg = 0, crv = 0;
CborByteString kax = {0}, kay = {0}, salt_enc = {0}, salt_auth = {0}; CborByteString kax = {0}, kay = {0}, salt_enc = {0}, salt_auth = {0};
DEBUG_DATA(data, len);
CBOR_CHECK(cbor_parser_init(data, len, 0, &parser, &map)); CBOR_CHECK(cbor_parser_init(data, len, 0, &parser, &map));
uint64_t val_c = 1; uint64_t val_c = 1;
CBOR_PARSE_MAP_START(map, 1) { CBOR_PARSE_MAP_START(map, 1) {
@@ -313,6 +312,12 @@ int cbor_get_assertion(const uint8_t *data, size_t len, bool next) {
CBOR_ERROR(CTAP2_ERR_OPERATION_DENIED); CBOR_ERROR(CTAP2_ERR_OPERATION_DENIED);
} }
} }
else {
if (!(flags & FIDO2_AUT_FLAG_UP)) {
if (check_user_presence() == false)
CBOR_ERROR(CTAP2_ERR_OPERATION_DENIED);
}
}
flags |= FIDO2_AUT_FLAG_UP; flags |= FIDO2_AUT_FLAG_UP;
clearUserPresentFlag(); clearUserPresentFlag();
clearUserVerifiedFlag(); clearUserVerifiedFlag();
@@ -482,7 +487,7 @@ int cbor_get_assertion(const uint8_t *data, size_t len, bool next) {
} }
CBOR_CHECK(cbor_encoder_close_container(&encoder, &mapEncoder)); CBOR_CHECK(cbor_encoder_close_container(&encoder, &mapEncoder));
resp_size = cbor_encoder_get_buffer_size(&encoder, ctap_resp->init.data + 1); resp_size = cbor_encoder_get_buffer_size(&encoder, ctap_resp->init.data + 1);
DEBUG_DATA(ctap_resp->init.data + 1,resp_size);
err: err:
if (asserted == false) { if (asserted == false) {
CBOR_FREE_BYTE_STRING(clientDataHash); CBOR_FREE_BYTE_STRING(clientDataHash);