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

Fix factory-reset.

Browse Source
This commit is contained in:
NIIBE Yutaka
2017-08-01 13:26:26 +09:00
parent db45e62ebe
commit 22156ea7f9
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@@ -1,3 +1,8 @@
2017-08-01 NIIBE Yutaka <gniibe@fsij.org>
* src/openpgp.c (FILE_CARD_TERMINATED_OPENPGP): Remove.
(cmd_select_file): Don't change file_selection.
2017-07-19 NIIBE Yutaka <gniibe@fsij.org> 2017-07-19 NIIBE Yutaka <gniibe@fsij.org>
* src/mod.c (mod_inv): Clear TMP. * src/mod.c (mod_inv): Clear TMP.

4
src/openpgp.c
View File

@@ -98,7 +98,6 @@ set_res_sw (uint8_t sw1, uint8_t sw2)
#define FILE_EF_UPDATE_KEY_2 7 #define FILE_EF_UPDATE_KEY_2 7
#define FILE_EF_UPDATE_KEY_3 8 #define FILE_EF_UPDATE_KEY_3 8
#define FILE_EF_CH_CERTIFICATE 9 #define FILE_EF_CH_CERTIFICATE 9
#define FILE_CARD_TERMINATED_OPENPGP 254
#define FILE_CARD_TERMINATED 255 #define FILE_CARD_TERMINATED 255
uint8_t file_selection; uint8_t file_selection;
@@ -760,7 +759,6 @@ cmd_select_file (void)
if (file_selection == FILE_CARD_TERMINATED) if (file_selection == FILE_CARD_TERMINATED)
{ {
file_selection = FILE_CARD_TERMINATED_OPENPGP;
GPG_APPLICATION_TERMINATED (); GPG_APPLICATION_TERMINATED ();
return; return;
} }
@@ -1323,7 +1321,7 @@ cmd_get_challenge (void)
static void static void
cmd_activate_file (void) cmd_activate_file (void)
{ {
if (file_selection != FILE_CARD_TERMINATED_OPENPGP) if (file_selection != FILE_CARD_TERMINATED)
{ {
GPG_NO_RECORD (); GPG_NO_RECORD ();
return; return;