Archives/openpgp-card-app
2
0
Fork 0
mirror of https://github.com/LedgerHQ/openpgp-card-app synced 2024-11-09 07:10:30 +00:00
Code Issues Projects Releases Wiki Activity

fix XL version

Browse Source
This commit is contained in:
cslashm 2019-08-08 13:04:39 +02:00
parent f217b4539f
commit 6eb81afec9
3 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Makefile
View File

@ -23,15 +23,16 @@ include $(BOLOS_SDK)/Makefile.defines
APP_LOAD_PARAMS=--appFlags 0x240 --path "2152157255'" --curve secp256k1 $(COMMON_LOAD_PARAMS)
ifeq ($(MULTISLOT),)
MULTISLOT := 0
ifeq ($(APPNAME),)
APPNAME = OpenPGP
endif
ifeq ($(MULTISLOT),0)
ifeq ($(APPNAME),OpenPGP)
GPG_MULTISLOT:=0
APPNAME:=OpenPGP
else
else ifeq ($(APPNAME),OpenPGP.XL)
GPG_MULTISLOT:=1
APPNAME:=OpenPGP.XL
else
$(error APPNAME ($(APPNAME)) is not set or unknown)
endif
ifeq ($(TARGET_NAME),TARGET_BLUE)
@ -80,7 +81,7 @@ all: default
listvariants:
@echo VARIANTS MULTISLOT 0 1
@echo VARIANTS APPNAME OpenPGP OpenPGP.XL
allvariants:
make MULTISLOT=0 clean all

1
pytools/gpgcard/gpgcard.py
View File

@ -369,7 +369,6 @@ class GPGCard() :
self.put_data(0xd8, self.UIF_AUT)
if len(self.sig_key):
print('COUCOU')
self.put_data(0x00B6, self.sig_key)
if len(self.dec_key):
self.put_data(0x00B8, self.dec_key)

15
src/gpg_ux_nanox.c
View File

@ -1027,9 +1027,9 @@ void ui_menu_settings_display(unsigned int value) {
void ui_menu_slot_action(unsigned int value);
void ui_menu_slot_predisplay(void);
#define SIG_BUFF G_gpg_vstate.ux_buff1
#define DEC_BUFF G_gpg_vstate.ux_buff2
#define AUT_BUFF G_gpg_vstate.ux_buff3
#define SLOT1 G_gpg_vstate.ux_buff1
#define SLOT2 G_gpg_vstate.ux_buff2
#define SLOT3 G_gpg_vstate.ux_buff3
UX_STEP_CB_INIT(ux_menu_slot_1_step, bn, ui_menu_slot_predisplay(), ui_menu_slot_action(1), {"Select Slot", SLOT1});
@ -1039,9 +1039,9 @@ UX_STEP_CB_INIT(ux_menu_slot_3_step, bn, ui_menu_slot_predisplay(), ui_menu_slot
UX_STEP_CB(ux_menu_slot_4_step, bn, ui_menu_slot_action(128), {"Set selected Slot", "as default slot"});
UX_STEP_CB(ux_menu_uif_5_step,
bn,
ui_menu_settings_display(0),
UX_STEP_CB(ux_menu_slot_5_step,
pn,
ui_menu_main_display(1),
{
&C_icon_back,
"Back",
@ -1051,7 +1051,8 @@ UX_FLOW(ux_flow_slot,
&ux_menu_slot_1_step,
&ux_menu_slot_2_step,
&ux_menu_slot_3_step,
&ux_menu_slot_4_step &ux_menu_slot_5_step);
&ux_menu_slot_4_step,
&ux_menu_slot_5_step);
void ui_menu_slot_predisplay() {
snprintf(SLOT1, sizeof(SLOT1), "1 %s %s", 1 == N_gpg_pstate->config_slot[1] + 1 ? "#" : " ",