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

validate saltAuth

Browse Source
This commit is contained in:
Conor Patrick 2019-03-20 18:10:52 -04:00
parent e8d5bc5829
commit bb9b2ea9d4
3 changed files with 35 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
fido2/ctap.c
View File

@ -325,7 +325,7 @@ static int is_matching_rk(CTAP_residentKey * rk, CTAP_residentKey * rk2)
} }
static int ctap_make_auth_data(struct rpId * rp, CborEncoder * map, uint8_t * auth_data_buf, uint32_t * len, CTAP_credInfo * credInfo) static int ctap_make_auth_data(struct rpId * rp, CborEncoder * map, uint8_t * auth_data_buf, uint32_t * len, CTAP_credInfo * credInfo, CTAP_extensions * ext)
{ {
CborEncoder cose_key; CborEncoder cose_key;
int auth_data_sz, ret; int auth_data_sz, ret;
@ -438,6 +438,36 @@ done_rk:
auth_data_sz = sizeof(CTAP_authDataHeader); auth_data_sz = sizeof(CTAP_authDataHeader);
} }
if (ext != NULL)
{
if (ext->hmac_secret_present == EXT_HMAC_SECRET_PARSED)
{
printf1(TAG_CTAP, "Processing hmac-secret..\r\n");
uint8_t shared_secret[32];
uint8_t hmac[32];
crypto_ecc256_shared_secret((uint8_t*) &ext->hmac_secret.keyAgreement.pubkey,
KEY_AGREEMENT_PRIV,
shared_secret);
crypto_sha256_init();
crypto_sha256_update(shared_secret, 32);
crypto_sha256_final(shared_secret);
crypto_sha256_hmac_init(shared_secret, 32, hmac);
crypto_sha256_update(ext->hmac_secret.saltEnc, ext->hmac_secret.saltLen);
crypto_sha256_hmac_final(shared_secret, 32, hmac);
if (memcmp(ext->hmac_secret.saltAuth, hmac, 16) == 0)
{
printf1(TAG_CTAP, "saltAuth is valid\r\n");
}
else
{
printf1(TAG_CTAP, "saltAuth is invalid\r\n");
return CTAP1_ERR_OTHER;
}
}
}
{ {
ret = cbor_encode_int(map,RESP_authData); ret = cbor_encode_int(map,RESP_authData);
check_ret(ret); check_ret(ret);
@ -640,7 +670,7 @@ uint8_t ctap_make_credential(CborEncoder * encoder, uint8_t * request, int lengt
uint32_t auth_data_sz = sizeof(auth_data_buf); uint32_t auth_data_sz = sizeof(auth_data_buf);
ret = ctap_make_auth_data(&MC.rp, &map, auth_data_buf, &auth_data_sz, ret = ctap_make_auth_data(&MC.rp, &map, auth_data_buf, &auth_data_sz,
&MC.credInfo); &MC.credInfo,NULL);
check_retr(ret); check_retr(ret);
@ -1044,7 +1074,7 @@ uint8_t ctap_get_assertion(CborEncoder * encoder, uint8_t * request, int length)
#endif #endif
{ {
uint32_t len = sizeof(auth_data_buf); uint32_t len = sizeof(auth_data_buf);
ret = ctap_make_auth_data(&GA.rp, &map, auth_data_buf, &len, NULL); ret = ctap_make_auth_data(&GA.rp, &map, auth_data_buf, &len, NULL, &GA.extensions);
check_retr(ret); check_retr(ret);
} }

2
fido2/ctap.h
View File

@ -201,7 +201,7 @@ typedef struct
typedef struct typedef struct
{ {
uint8_t salt_len; uint8_t saltLen;
uint8_t saltEnc[64]; uint8_t saltEnc[64];
uint8_t saltAuth[32]; uint8_t saltAuth[32];
COSE_key keyAgreement; COSE_key keyAgreement;

2
fido2/ctap_parse.c
View File

@ -606,7 +606,7 @@ uint8_t ctap_parse_hmac_secret(CborValue * val, CTAP_hmac_secret * hs)
{ {
return CTAP1_ERR_INVALID_LENGTH; return CTAP1_ERR_INVALID_LENGTH;
} }
hs->salt_len = salt_len; hs->saltLen = salt_len;
parsed_count++; parsed_count++;
break; break;
case EXT_HMAC_SECRET_SALT_AUTH: case EXT_HMAC_SECRET_SALT_AUTH: