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

add aes in keygen

Browse Source
This commit is contained in:
Conor Patrick 2018-10-28 22:14:36 -04:00
parent ba82400b6c
commit 898a7a303c
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fido2/ctap.c
View File

@ -354,7 +354,7 @@ static int ctap_make_auth_data(struct rpId * rp, CborEncoder * map, uint8_t * au
ctap_generate_rng(authData->attest.credential.nonce, CREDENTIAL_NONCE_SIZE); ctap_generate_rng(authData->attest.credential.nonce, CREDENTIAL_NONCE_SIZE);
memmove(&authData->attest.credential.enc.user, user, sizeof(CTAP_userEntity)); //TODO encrypt this memmove(&authData->attest.credential.enc.user, user, sizeof(CTAP_userEntity));
authData->attest.credential.enc.count = count; authData->attest.credential.enc.count = count;
// Make a tag we can later check to make sure this is a token we made // Make a tag we can later check to make sure this is a token we made
@ -1550,7 +1550,6 @@ int8_t ctap_store_key(uint8_t index, uint8_t * key, uint16_t len)
memmove(STATE.key_space + offset, key, len); memmove(STATE.key_space + offset, key, len);
ctap_flush_state(0);
ctap_flush_state(1); ctap_flush_state(1);
return 0; return 0;
@ -1602,5 +1601,5 @@ void ctap_reset()
memset(PIN_CODE_HASH,0,sizeof(PIN_CODE_HASH)); memset(PIN_CODE_HASH,0,sizeof(PIN_CODE_HASH));
crypto_ecc256_make_key_pair(KEY_AGREEMENT_PUB, KEY_AGREEMENT_PRIV); crypto_ecc256_make_key_pair(KEY_AGREEMENT_PUB, KEY_AGREEMENT_PRIV);
crypto_reset_master_secret(); // Not sure what the significance of this is?? crypto_reset_master_secret();
} }

3
targets/stm32l442/src/crypto.c
View File

@ -233,6 +233,9 @@ void generate_private_key(uint8_t * data, int len, uint8_t * data2, int len2, ui
crypto_sha256_update(data2, len2); crypto_sha256_update(data2, len2);
crypto_sha256_update(master_secret, 32); // TODO AES crypto_sha256_update(master_secret, 32); // TODO AES
crypto_sha256_hmac_final(CRYPTO_MASTER_KEY, 0, privkey); crypto_sha256_hmac_final(CRYPTO_MASTER_KEY, 0, privkey);
crypto_aes256_init(master_secret + 32, NULL);
crypto_aes256_encrypt(privkey, 32);
} }