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

passing interop w/o rk

Browse Source
This commit is contained in:
Conor Patrick 2018-11-12 02:16:00 -05:00 committed by Emanuele Cesena
parent 24e0bd9bc3
commit 36fdc64fab
2 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
fido2/ctap.c
View File

@ -335,8 +335,7 @@ static int ctap_make_auth_data(struct rpId * rp, CborEncoder * map, uint8_t * au
device_set_status(CTAPHID_STATUS_PROCESSING); device_set_status(CTAPHID_STATUS_PROCESSING);
authData->head.flags = (but << 0); authData->head.flags = (but << 0);
// not [yet] doing user verification authData->head.flags |= (ctap_is_pin_set() << 2);
// authData->head.flags |= (ctap_user_verification(0) << 2);
@ -735,8 +734,8 @@ uint8_t ctap_end_get_assertion(CborEncoder * map, CTAP_credentialDescriptor * cr
uint8_t sigbuf[64]; uint8_t sigbuf[64];
uint8_t sigder[72]; uint8_t sigder[72];
ret = ctap_add_user_entity(map, &cred->credential.enc.user); //ret = ctap_add_user_entity(map, &cred->credential.enc.user);
check_retr(ret); //check_retr(ret);
// Re-encrypt the credential // Re-encrypt the credential
crypto_aes256_init(CRYPTO_TRANSPORT_KEY, NULL); crypto_aes256_init(CRYPTO_TRANSPORT_KEY, NULL);
@ -775,7 +774,7 @@ uint8_t ctap_get_next_assertion(CborEncoder * encoder)
auth_data_update_count(authData); auth_data_update_count(authData);
ret = cbor_encoder_create_map(encoder, &map, 4); ret = cbor_encoder_create_map(encoder, &map, 3);
check_ret(ret); check_ret(ret);
{ {
@ -825,7 +824,10 @@ uint8_t ctap_get_assertion(CborEncoder * encoder, uint8_t * request, int length)
return CTAP2_ERR_MISSING_PARAMETER; return CTAP2_ERR_MISSING_PARAMETER;
} }
CborEncoder map; CborEncoder map;
ret = cbor_encoder_create_map(encoder, &map, 5); if (GA.credLen > 1)
ret = cbor_encoder_create_map(encoder, &map, 4);
else
ret = cbor_encoder_create_map(encoder, &map, 3);
check_ret(ret); check_ret(ret);
ret = ctap_make_auth_data(&GA.rp, &map, auth_data_buf, sizeof(auth_data_buf), NULL, 0,0,NULL); ret = ctap_make_auth_data(&GA.rp, &map, auth_data_buf, sizeof(auth_data_buf), NULL, 0,0,NULL);
@ -867,10 +869,13 @@ uint8_t ctap_get_assertion(CborEncoder * encoder, uint8_t * request, int length)
} }
{ {
ret = cbor_encode_int(&map, RESP_numberOfCredentials); if (GA.credLen > 1)
check_ret(ret); {
ret = cbor_encode_int(&map, validCredCount); ret = cbor_encode_int(&map, RESP_numberOfCredentials);
check_ret(ret); check_ret(ret);
ret = cbor_encode_int(&map, validCredCount);
check_ret(ret);
}
} }
CTAP_credentialDescriptor * cred = &GA.creds[validCredCount - 1]; CTAP_credentialDescriptor * cred = &GA.creds[validCredCount - 1];

10
fido2/ctap_parse.c
View File

@ -895,6 +895,16 @@ uint8_t ctap_parse_get_assertion(CTAP_getAssertion * GA, uint8_t * request, int
printf1(TAG_GA,"CTAP_pinAuth\n"); printf1(TAG_GA,"CTAP_pinAuth\n");
ret = parse_fixed_byte_string(&map, GA->pinAuth, 16); ret = parse_fixed_byte_string(&map, GA->pinAuth, 16);
if (CTAP1_ERR_INVALID_LENGTH != ret) // damn microsoft
{
check_retr(ret);
}
else
{
ret = 0;
}
check_retr(ret); check_retr(ret);
GA->pinAuthPresent = 1; GA->pinAuthPresent = 1;