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

config: Store cleartext PIN for DEBUG_LINK.

Browse Source
This commit is contained in:
Andrew Kozlik 2019-02-14 15:13:47 +01:00 committed by Pavol Rusnak
parent 6b66c7540c
commit 0b79d0e596
No known key found for this signature in database
GPG Key ID: 91F3B339B9A02A3D
3 changed files with 45 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
firmware/config.c
View File

@ -53,23 +53,24 @@ static const uint32_t CONFIG_MAGIC_V10 = 0x726f7473; // 'stor' as uint32_t
#define FLAG_PUBLIC 0x8000
#define FLAGS_WRITE 0xC000
static const uint16_t KEY_UUID = 0 | APP | FLAG_PUBLIC; // bytes(12)
static const uint16_t KEY_VERSION = 1 | APP; // uint32
static const uint16_t KEY_MNEMONIC = 2 | APP; // string(241)
static const uint16_t KEY_LANGUAGE = 3 | APP | FLAG_PUBLIC; // string(17)
static const uint16_t KEY_LABEL = 4 | APP | FLAG_PUBLIC; // string(33)
static const uint16_t KEY_PASSPHRASE_PROTECTION = 5 | APP; // bool
static const uint16_t KEY_HOMESCREEN = 6 | APP | FLAG_PUBLIC; // bytes(1024)
static const uint16_t KEY_NEEDS_BACKUP = 7 | APP; // bool
static const uint16_t KEY_FLAGS = 8 | APP; // uint32
static const uint16_t KEY_U2F_COUNTER = 9 | APP | FLAGS_WRITE; // uint32
static const uint16_t KEY_UNFINISHED_BACKUP = 11 | APP; // bool
static const uint16_t KEY_AUTO_LOCK_DELAY_MS = 12 | APP; // uint32
static const uint16_t KEY_NO_BACKUP = 13 | APP; // bool
static const uint16_t KEY_INITIALIZED = 14 | APP | FLAG_PUBLIC; // uint32
static const uint16_t KEY_NODE = 15 | APP; // node
static const uint16_t KEY_IMPORTED = 16 | APP; // bool
static const uint16_t KEY_U2F_ROOT = 17 | APP | FLAG_PUBLIC; // node
#define KEY_UUID ( 0 | APP | FLAG_PUBLIC) // bytes(12)
#define KEY_VERSION ( 1 | APP) // uint32
#define KEY_MNEMONIC ( 2 | APP) // string(241)
#define KEY_LANGUAGE ( 3 | APP | FLAG_PUBLIC) // string(17)
#define KEY_LABEL ( 4 | APP | FLAG_PUBLIC) // string(33)
#define KEY_PASSPHRASE_PROTECTION ( 5 | APP | FLAG_PUBLIC) // bool
#define KEY_HOMESCREEN ( 6 | APP | FLAG_PUBLIC) // bytes(1024)
#define KEY_NEEDS_BACKUP ( 7 | APP) // bool
#define KEY_FLAGS ( 8 | APP) // uint32
#define KEY_U2F_COUNTER ( 9 | APP | FLAGS_WRITE) // uint32
#define KEY_UNFINISHED_BACKUP ( 11 | APP) // bool
#define KEY_AUTO_LOCK_DELAY_MS ( 12 | APP) // uint32
#define KEY_NO_BACKUP ( 13 | APP) // bool
#define KEY_INITIALIZED ( 14 | APP | FLAG_PUBLIC) // uint32
#define KEY_NODE ( 15 | APP) // node
#define KEY_IMPORTED ( 16 | APP) // bool
#define KEY_U2F_ROOT ( 17 | APP | FLAG_PUBLIC) // node
#define KEY_DEBUG_LINK_PIN (255 | APP | FLAG_PUBLIC) // string(10)
// The PIN value corresponding to an empty PIN.
static const uint32_t PIN_EMPTY = 1;
@ -167,6 +168,10 @@ static secbool config_get_bool(uint16_t key, bool *value)
static secbool config_get_string(uint16_t key, char *dest, uint16_t dest_size)
{
if (dest_size == 0) {
return secfalse;
}
uint16_t len = 0;
if (sectrue != storage_get(key, dest, dest_size - 1, &len)) {
dest[0] = '\0';
@ -712,12 +717,30 @@ bool config_changePin(const char *old_pin, const char *new_pin)
return false;
}
if (sectrue == storage_change_pin(pin_to_int(old_pin), new_pin_int)) {
return true;
secbool ret = storage_change_pin(pin_to_int(old_pin), new_pin_int);
#if DEBUG_LINK
if (sectrue == ret) {
if (new_pin_int != PIN_EMPTY) {
storage_set(KEY_DEBUG_LINK_PIN, new_pin, strnlen(new_pin, MAX_PIN_LEN));
} else {
storage_delete(KEY_DEBUG_LINK_PIN);
}
return false;
}
#endif
memzero(&new_pin_int, sizeof(new_pin_int));
return sectrue == ret;
}
#if DEBUG_LINK
bool config_getPin(char *dest, uint16_t dest_size)
{
return sectrue == config_get_string(KEY_DEBUG_LINK_PIN, dest, dest_size);
}
#endif
void session_cachePassphrase(const char *passphrase)
{
strlcpy(sessionPassphrase, passphrase, sizeof(sessionPassphrase));

1
firmware/config.h
View File

@ -117,6 +117,7 @@ bool config_getMnemonic(char *dest, uint16_t dest_size);
#if DEBUG_LINK
bool config_dumpNode(HDNodeType *node);
bool config_getPin(char *dest, uint16_t dest_size);
#endif
bool config_containsPin(const char *pin);

5
firmware/fsm_msg_debug.h
View File

@ -32,10 +32,7 @@ void fsm_msgDebugLinkGetState(const DebugLinkGetState *msg)
resp.layout.size = OLED_BUFSIZE;
memcpy(resp.layout.bytes, oledGetBuffer(), OLED_BUFSIZE);
if (config_hasPin()) {
resp.has_pin = true;
strlcpy(resp.pin, "1", sizeof(resp.pin));
}
resp.has_pin = config_getPin(resp.pin, sizeof(resp.pin));
resp.has_matrix = true;
strlcpy(resp.matrix, pinmatrix_get(), sizeof(resp.matrix));