arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-11-22 15:38:11 +00:00
Code Issues Releases Wiki Activity

use Knuth shuffles

Browse Source
This commit is contained in:
Pavol Rusnak 2015-02-13 20:49:53 +01:00
parent 093ba4fd19
commit 60bb2fe2b1
4 changed files with 26 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
firmware/pinmatrix.c
View File

@ -49,20 +49,12 @@ void pinmatrix_draw(const char *text)
void pinmatrix_start(const char *text) void pinmatrix_start(const char *text)
{ {
int i, j, k; int i;
char t;
for (i = 0; i < 9; i++) { for (i = 0; i < 9; i++) {
pinmatrix_perm[i] = '1' + i; pinmatrix_perm[i] = '1' + i;
} }
pinmatrix_perm[9] = 0; pinmatrix_perm[9] = 0;
for (i = 0; i < 10000; i++) { random_permute(pinmatrix_perm, 9);
j = random32() % 9;
k = random32() % 9;
t = pinmatrix_perm[j];
pinmatrix_perm[j] = pinmatrix_perm[k];
pinmatrix_perm[k] = t;
}
pinmatrix_draw(text); pinmatrix_draw(text);
} }

13
firmware/recovery.c
View File

@ -40,7 +40,7 @@ void next_word(void) {
word_pos = word_order[word_index]; word_pos = word_order[word_index];
if (word_pos == 0) { if (word_pos == 0) {
const char **wl = mnemonic_wordlist(); const char **wl = mnemonic_wordlist();
strlcpy(fake_word, wl[random32() & 0x7FF], sizeof(fake_word)); strlcpy(fake_word, wl[random_uniform(2048)], sizeof(fake_word));
layoutDialogSwipe(DIALOG_ICON_INFO, NULL, NULL, NULL, "Please enter the word", NULL, fake_word, NULL, "on your computer", NULL); layoutDialogSwipe(DIALOG_ICON_INFO, NULL, NULL, NULL, "Please enter the word", NULL, fake_word, NULL, "on your computer", NULL);
} else { } else {
fake_word[0] = 0; fake_word[0] = 0;
@ -89,21 +89,14 @@ void recovery_init(uint32_t _word_count, bool passphrase_protection, bool pin_pr
storage_setLanguage(language); storage_setLanguage(language);
storage_setLabel(label); storage_setLabel(label);
uint32_t i, j, k; uint32_t i;
char t;
for (i = 0; i < word_count; i++) { for (i = 0; i < word_count; i++) {
word_order[i] = i + 1; word_order[i] = i + 1;
} }
for (i = word_count; i < 24; i++) { for (i = word_count; i < 24; i++) {
word_order[i] = 0; word_order[i] = 0;
} }
for (i = 0; i < 10000; i++) { random_permute(word_order, 24);
j = random32() % 24;
k = random32() % 24;
t = word_order[j];
word_order[j] = word_order[k];
word_order[k] = t;
}
awaiting_word = true; awaiting_word = true;
word_index = 0; word_index = 0;
next_word(); next_word();

19
rng.c
View File

@ -35,6 +35,13 @@ uint32_t random32(void)
return new; return new;
} }
uint32_t random_uniform(uint32_t n)
{
uint32_t x, max = 0xFFFFFFFF - (0xFFFFFFFF % n);
while ((x = random32()) >= max);
return x / (max / n);
}
void random_buffer(uint8_t *buf, size_t len) void random_buffer(uint8_t *buf, size_t len)
{ {
size_t i; size_t i;
@ -46,3 +53,15 @@ void random_buffer(uint8_t *buf, size_t len)
buf[i] = (r >> ((i % 4) * 8)) & 0xFF; buf[i] = (r >> ((i % 4) * 8)) & 0xFF;
} }
} }
void random_permute(char *str, size_t len)
{
int i, j;
char t;
for (i = len - 1; i >= 1; i--) {
j = random_uniform(i + 1);
t = str[j];
str[j] = str[i];
str[i] = t;
}
}

2
rng.h
View File

@ -24,6 +24,8 @@
#include <stdlib.h> #include <stdlib.h>
uint32_t random32(void); uint32_t random32(void);
uint32_t random_uniform(uint32_t n);
void random_buffer(uint8_t *buf, size_t len); void random_buffer(uint8_t *buf, size_t len);
void random_permute(char *buf, size_t len);
#endif #endif