arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-12-16 19:38:09 +00:00
Code Issues Releases Wiki Activity

callback: change ratio to 80% waiting, 20% deriving KEK

Browse Source
This commit is contained in:
Pavol Rusnak 2019-02-19 15:31:07 +01:00
parent d7e7d8ef27
commit d715873ee6
No known key found for this signature in database
GPG Key ID: 91F3B339B9A02A3D
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
storage.c
View File

@ -329,7 +329,7 @@ static void derive_kek(uint32_t pin, const uint8_t *random_salt, uint8_t kek[SHA
for (int i = 1; i <= 5; i++) { for (int i = 1; i <= 5; i++) {
pbkdf2_hmac_sha256_Update(&ctx, PIN_ITER_COUNT / 10); pbkdf2_hmac_sha256_Update(&ctx, PIN_ITER_COUNT / 10);
if (show_progress && ui_callback) { if (show_progress && ui_callback) {
ui_callback(0, 900 + i * 10); ui_callback(0, 800 + i * 20);
} }
} }
pbkdf2_hmac_sha256_Final(&ctx, kek); pbkdf2_hmac_sha256_Final(&ctx, kek);
@ -337,7 +337,7 @@ static void derive_kek(uint32_t pin, const uint8_t *random_salt, uint8_t kek[SHA
for (int i = 6; i <= 10; i++) { for (int i = 6; i <= 10; i++) {
pbkdf2_hmac_sha256_Update(&ctx, PIN_ITER_COUNT / 10); pbkdf2_hmac_sha256_Update(&ctx, PIN_ITER_COUNT / 10);
if (show_progress && ui_callback) { if (show_progress && ui_callback) {
ui_callback(0, 900 + i * 10); ui_callback(0, 800 + i * 20);
} }
} }
pbkdf2_hmac_sha256_Final(&ctx, keiv); pbkdf2_hmac_sha256_Final(&ctx, keiv);
@ -766,9 +766,9 @@ secbool storage_unlock(uint32_t pin)
for (int i = 0; i < 10; i++) { for (int i = 0; i < 10; i++) {
if (ui_callback) { if (ui_callback) {
if (wait > 1000000) { // precise enough if (wait > 1000000) { // precise enough
progress = (wait - rem) / (wait / 900); progress = (wait - rem) / (wait / 800);
} else { } else {
progress = ((wait - rem) * 10 + i) * 90 / wait; progress = ((wait - rem) * 10 + i) * 80 / wait;
} }
if (sectrue == ui_callback(rem, progress)) { if (sectrue == ui_callback(rem, progress)) {
return secfalse; return secfalse;
@ -778,7 +778,7 @@ secbool storage_unlock(uint32_t pin)
} }
} }
if (ui_callback) { if (ui_callback) {
if (sectrue == ui_callback(0, 900)) { if (sectrue == ui_callback(0, 800)) {
return secfalse; return secfalse;
} }
} }