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

restore button in ctap_make_auth_data

Browse Source
This commit is contained in:
Conor Patrick 2019-04-24 16:54:26 -04:00
parent fecf258116
commit ec98af115f
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fido2/ctap.c
View File

@ -462,8 +462,7 @@ static int ctap_make_auth_data(struct rpId * rp, CborEncoder * map, uint8_t * au
int but; int but;
but = 1; but = ctap_user_presence_test();
if (!but) if (!but)
{ {
@ -1215,14 +1214,13 @@ uint8_t ctap_get_assertion(CborEncoder * encoder, uint8_t * request, int length)
#ifdef ENABLE_U2F_EXTENSIONS #ifdef ENABLE_U2F_EXTENSIONS
if ( is_extension_request((uint8_t*)&GA.creds[validCredCount - 1].credential.id, sizeof(CredentialId)) ) if ( is_extension_request((uint8_t*)&GA.creds[validCredCount - 1].credential.id, sizeof(CredentialId)) )
{ {
memset(auth_data_buf,0,sizeof(CTAP_authDataHeader));
auth_data_buf_sz = sizeof(CTAP_authDataHeader); auth_data_buf_sz = sizeof(CTAP_authDataHeader);
ret = ctap_make_auth_data(&GA.rp, &map, auth_data_buf, &auth_data_buf_sz, NULL); crypto_sha256_init();
check_retr(ret); crypto_sha256_update(GA.rp.id, GA.rp.size);
crypto_sha256_final(((CTAP_authData *)auth_data_buf)->head.rpIdHash);
((CTAP_authData *)auth_data_buf)->head.flags = (1 << 0); ((CTAP_authData *)auth_data_buf)->head.flags = (1 << 0);
((CTAP_authData *)auth_data_buf)->head.flags &= ~(1 << 2);
((CTAP_authData *)auth_data_buf)->head.flags |= (1 << 2); ((CTAP_authData *)auth_data_buf)->head.flags |= (1 << 2);
} }
else else