deon/gnuk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix flash initialization

Browse Source
This commit is contained in:
NIIBE Yutaka
2016-10-15 19:29:23 +09:00
parent bed43d4049
commit 27bd37781a
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -1,5 +1,9 @@
2016-10-15 Niibe Yutaka <gniibe@fsij.org> 2016-10-15 Niibe Yutaka <gniibe@fsij.org>
* 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. * src/usb-ccid.c (ccid_power_on): Don't waste stack.
2016-10-14 Niibe Yutaka <gniibe@fsij.org> 2016-10-14 Niibe Yutaka <gniibe@fsij.org>

2
src/openpgp.c
View File

@@ -108,7 +108,6 @@ gpg_init (void)
{ {
const uint8_t *flash_data_start; const uint8_t *flash_data_start;
flash_init_keys ();
flash_data_start = flash_init (); flash_data_start = flash_init ();
if (flash_data_start == NULL) if (flash_data_start == NULL)
@@ -117,6 +116,7 @@ gpg_init (void)
file_selection = FILE_NONE; file_selection = FILE_NONE;
gpg_data_scan (flash_data_start); gpg_data_scan (flash_data_start);
flash_init_keys ();
} }
static void static void