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

bring pc crypto impl up to date

Browse Source
This commit is contained in:
Conor Patrick 2019-03-02 23:10:43 -05:00
parent e883c5aa6e
commit 1507758ad1
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
fido2/crypto.c
View File

@ -60,7 +60,7 @@ static const uint8_t * _signing_key = NULL;
static int _key_len = 0; static int _key_len = 0;
// Secrets for testing only // Secrets for testing only
static uint8_t master_secret[32]; static uint8_t master_secret[64];
static uint8_t transport_secret[32]; static uint8_t transport_secret[32];
@ -73,13 +73,17 @@ void crypto_sha256_init()
void crypto_reset_master_secret() void crypto_reset_master_secret()
{ {
ctap_generate_rng(master_secret, 32); ctap_generate_rng(master_secret, 64);
ctap_generate_rng(transport_secret, 32);
} }
void crypto_load_master_secret(uint8_t * key) void crypto_load_master_secret(uint8_t * key)
{ {
memmove(master_secret, key, 32); #if KEY_SPACE_BYTES < 96
memmove(transport_secret, key+32, 32); #error "need more key bytes"
#endif
memmove(master_secret, key, 64);
memmove(transport_secret, key+64, 32);
} }
void crypto_sha256_update(uint8_t * data, size_t len) void crypto_sha256_update(uint8_t * data, size_t len)
@ -108,6 +112,11 @@ void crypto_sha256_hmac_init(uint8_t * key, uint32_t klen, uint8_t * hmac)
key = master_secret; key = master_secret;
klen = sizeof(master_secret); klen = sizeof(master_secret);
} }
else if (key == CRYPTO_TRANSPORT_KEY)
{
key = transport_secret;
klen = 32;
}
if(klen > 64) if(klen > 64)
{ {