arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-01-03 12:00:59 +00:00
Code Issues Releases Wiki Activity

update trezor-crypto

Browse Source
This commit is contained in:
Pavol Rusnak 2014-10-30 01:38:40 +01:00
parent 8b70713e2b
commit c051dfde9d
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
demo/demo.c
View File

@ -265,7 +265,7 @@ int main(void)
switch (state) { switch (state) {
case 1: case 1:
layoutProgress("WORKING", frame % 41 * 25, frame % 4); layoutProgress("WORKING", frame % 41 * 25, frame % 4);
pbkdf2(pass, passlen, salt, saltlen, 100, seed, 64, NULL); pbkdf2_hmac_sha512(pass, passlen, salt, saltlen, 100, seed, 64, NULL);
usbd_ep_write_packet(usbd_dev, 0x81, seed, 64); usbd_ep_write_packet(usbd_dev, 0x81, seed, 64);
break; break;
} }

2
firmware/storage.c
View File

@ -229,7 +229,7 @@ bool storage_getRootNode(HDNode *node)
// decrypt hd node // decrypt hd node
uint8_t secret[64]; uint8_t secret[64];
layoutProgressSwipe("Waking up", 0, 0); layoutProgressSwipe("Waking up", 0, 0);
pbkdf2((const uint8_t *)sessionPassphrase, strlen(sessionPassphrase), (uint8_t *)"TREZORHD", 8, BIP39_PBKDF2_ROUNDS, secret, 64, get_root_node_callback); pbkdf2_hmac_sha512((const uint8_t *)sessionPassphrase, strlen(sessionPassphrase), (uint8_t *)"TREZORHD", 8, BIP39_PBKDF2_ROUNDS, secret, 64, get_root_node_callback);
aes_decrypt_ctx ctx; aes_decrypt_ctx ctx;
aes_decrypt_key256(secret, &ctx); aes_decrypt_key256(secret, &ctx);
aes_cbc_decrypt(sessionRootNode.chain_code, sessionRootNode.chain_code, 32, secret + 32, &ctx); aes_cbc_decrypt(sessionRootNode.chain_code, sessionRootNode.chain_code, 32, secret + 32, &ctx);

2
trezor-crypto

@ -1 +1 @@
Subproject commit ad8e618ed28f4dca108461a9afdbbaadeb26746c Subproject commit f6560c7d1303a50d215cffab87acc7fc8c8964a4