From 27bd37781ae2631ce7079dfa7e41cd6b2b8197c0 Mon Sep 17 00:00:00 2001 From: NIIBE Yutaka Date: Sat, 15 Oct 2016 19:29:23 +0900 Subject: [PATCH] Fix flash initialization --- ChangeLog | 4 ++++ src/openpgp.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 234737b..e83e379 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2016-10-15 Niibe Yutaka + * src/openpgp.c (gpg_init): flash_init_keys shoule be after + gpg_data_scan since flash_init_keys accesses Data Object for + key attributes. + * src/usb-ccid.c (ccid_power_on): Don't waste stack. 2016-10-14 Niibe Yutaka diff --git a/src/openpgp.c b/src/openpgp.c index a30450a..b6a2873 100644 --- a/src/openpgp.c +++ b/src/openpgp.c @@ -108,7 +108,6 @@ gpg_init (void) { const uint8_t *flash_data_start; - flash_init_keys (); flash_data_start = flash_init (); if (flash_data_start == NULL) @@ -117,6 +116,7 @@ gpg_init (void) file_selection = FILE_NONE; gpg_data_scan (flash_data_start); + flash_init_keys (); } static void