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: Add hardware entropy to storage_init().

Browse Source
This commit is contained in:
andrew 2019-02-08 00:46:16 +01:00 committed by Pavol Rusnak
parent c592a09459
commit 66ffa4c7dc
No known key found for this signature in database
GPG Key ID: 91F3B339B9A02A3D
4 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common.c
View File

@ -24,6 +24,8 @@
#include "oled.h" #include "oled.h"
#include "firmware/usb.h" #include "firmware/usb.h"
uint8_t HW_ENTROPY_DATA[HW_ENTROPY_LEN];
static void __attribute__((noreturn)) shutdown(void) static void __attribute__((noreturn)) shutdown(void)
{ {
for (;;); for (;;);

3
common.h
View File

@ -23,6 +23,9 @@
#include <stdint.h> #include <stdint.h>
#include "secbool.h" #include "secbool.h"
#define HW_ENTROPY_LEN 12
extern uint8_t HW_ENTROPY_DATA[HW_ENTROPY_LEN];
void __attribute__((noreturn)) __fatal_error(const char *expr, const char *msg, const char *file, int line, const char *func); void __attribute__((noreturn)) __fatal_error(const char *expr, const char *msg, const char *file, int line, const char *func);
void __attribute__((noreturn)) error_shutdown(const char *line1, const char *line2, const char *line3, const char *line4); void __attribute__((noreturn)) error_shutdown(const char *line1, const char *line2, const char *line3, const char *line4);

6
firmware/config.c
View File

@ -279,8 +279,7 @@ static bool config_upgrade_v10(void)
} }
} }
// TODO Add salt. storage_init(NULL, HW_ENTROPY_DATA, HW_ENTROPY_LEN);
storage_init(NULL, (const uint8_t*)"", 0);
storage_unlock(PIN_EMPTY); storage_unlock(PIN_EMPTY);
if (config.has_pin) { if (config.has_pin) {
storage_change_pin(PIN_EMPTY, pin_to_int(config.pin)); storage_change_pin(PIN_EMPTY, pin_to_int(config.pin));
@ -344,8 +343,7 @@ void config_init(void)
{ {
config_upgrade_v10(); config_upgrade_v10();
// TODO Add salt. storage_init(&protectPinUiCallback, HW_ENTROPY_DATA, HW_ENTROPY_LEN);
storage_init(&protectPinUiCallback, (const uint8_t*)"", 0);
uint16_t len = 0; uint16_t len = 0;
if (sectrue == storage_get(KEY_UUID, config_uuid, sizeof(config_uuid), &len) && len == sizeof(config_uuid)) { if (sectrue == storage_get(KEY_UUID, config_uuid, sizeof(config_uuid), &len) && len == sizeof(config_uuid)) {

10
firmware/trezor.c
View File

@ -17,6 +17,7 @@
* along with this library. If not, see <http://www.gnu.org/licenses/>. * along with this library. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "common.h"
#include "trezor.h" #include "trezor.h"
#include "oled.h" #include "oled.h"
#include "bitmaps.h" #include "bitmaps.h"
@ -31,6 +32,8 @@
#include "buttons.h" #include "buttons.h"
#include "gettext.h" #include "gettext.h"
#include "bl_check.h" #include "bl_check.h"
#include "memzero.h"
#include <libopencm3/stm32/desig.h>
/* Screen timeout */ /* Screen timeout */
uint32_t system_millis_lock_start; uint32_t system_millis_lock_start;
@ -86,6 +89,13 @@ void check_lock_screen(void)
int main(void) int main(void)
{ {
#if EMULATOR
memzero(HW_ENTROPY_DATA, HW_ENTROPY_LEN);
HW_ENTROPY_DATA[0] = 1;
#else
desig_get_unique_id((uint32_t*)HW_ENTROPY_DATA);
#endif
#ifndef APPVER #ifndef APPVER
setup(); setup();
__stack_chk_guard = random32(); // this supports compiler provided unpredictable stack protection checks __stack_chk_guard = random32(); // this supports compiler provided unpredictable stack protection checks