Archives
/
openpgp-card-app
mirror of https://github.com/LedgerHQ/openpgp-card-app
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

UIF for PSO:ENC + minor fixes

Browse Source 
Add UIF-decryption rule for "PSO:ENC" command
Fix Makefile load rule
Fix display glitch in "back" menus
pull/45/head 1.3.1
cslashm 5 years ago
parent a43bef7014
commit f92dd4730c
3 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File

15
Makefile
Unescape Escape View File

@ -122,17 +122,10 @@ SDK_SOURCE_PATH += lib_stusb
load: all
ifeq ($(MULTISLOT),0)
cp -a release/openpgp.elf bin/app.elf
cp -a release/openpgp.hex bin/app.hex
cp -a release/openpgp.asm debug/app.asm
cp -a release/openpgp.map debug/app.map
else
cp -a release/openpgp-XL.elf bin/app.elf
cp -a release/openpgp-XL.hex bin/app.hex
cp -a release/openpgp-XL.asm debug/app.asm
cp -a release/openpgp-XL.map debug/app.map
endif
cp -a release/$(APPNAME).elf bin/app.elf
cp -a release/$(APPNAME).hex bin/app.hex
cp -a release/$(APPNAME).asm debug/app.asm
cp -a release/$(APPNAME).map debug/app.map
python -m ledgerblue.loadApp $(APP_LOAD_PARAMS)
run:

1
src/gpg_pso.c
Unescape Escape View File

@ -163,6 +163,7 @@ int gpg_apdu_pso() {
break;
// --- PSO:DEC ---
case 0x8086:
case 0x8680:
if (G_gpg_vstate.kslot->dec.UIF[0]) {
if ((G_gpg_vstate.UIF_flags)==0) {
ui_menu_uifconfirm_display(0);

10
src/gpg_ux_nanos.c
Unescape Escape View File

@ -151,7 +151,7 @@ unsigned int ui_uifconfirm_prepro(const bagl_element_t* element) {
case 0x002A8086:
snprintf(G_gpg_vstate.menu, sizeof(G_gpg_vstate.menu), "Decryption");
return 1;
case 0x0088000:
case 0x00880000:
snprintf(G_gpg_vstate.menu, sizeof(G_gpg_vstate.menu), "Authentication");
return 1;
}
@ -714,7 +714,7 @@ const ux_menu_entry_t ui_menu_tmpl_type[] = {
// {NULL, ui_menu_tmpl_type_action, CX_CURVE_BrainPoolP384R1, NULL, LABEL_BPOOL384R1, NULL, 0, 0},
// {NULL, ui_menu_tmpl_type_action, CX_CURVE_BrainPoolP512R1, NULL, LABEL_BPOOL512R1, NULL, 0, 0},
{NULL, ui_menu_tmpl_type_action, CX_CURVE_Ed25519, NULL, LABEL_Ed25519, NULL, 0, 0},
{ui_menu_template, NULL, 1, &C_badge_back, "Back", NULL, 61, 40},
{ui_menu_template, NULL, 0, &C_badge_back, "Back", NULL, 61, 40},
UX_MENU_END
};
@ -729,7 +729,7 @@ const ux_menu_entry_t ui_menu_seed[] = {
{NULL, NULL, 0, NULL, "", NULL, 0, 0},
{NULL, ui_menu_seed_action, 1, NULL, "Set on", NULL, 0, 0},
{NULL, ui_menu_seed_action, 0, NULL, "Set off", NULL, 0, 0},
{ui_menu_settings, NULL, 1, &C_badge_back, "Back", NULL, 61, 40},
{ui_menu_settings, NULL, 0, &C_badge_back, "Back", NULL, 61, 40},
UX_MENU_END
};
@ -766,7 +766,7 @@ const ux_menu_entry_t ui_menu_pinmode[] = {
{NULL, ui_menu_pinmode_action, 0x8000|PIN_MODE_CONFIRM, NULL, "Confirm only", NULL, 0, 0},
{NULL, ui_menu_pinmode_action, 0x8000|PIN_MODE_TRUST, NULL, "Trust", NULL, 0, 0},
{NULL, ui_menu_pinmode_action, 128, NULL, "Set Default", NULL, 0, 0},
{ui_menu_settings, NULL, 1, &C_badge_back, "Back", NULL, 61, 40},
{ui_menu_settings, NULL, 0, &C_badge_back, "Back", NULL, 61, 40},
UX_MENU_END
};
@ -852,7 +852,7 @@ const ux_menu_entry_t ui_menu_uifmode[] = {
{NULL, ui_menu_uifmode_action, 1, NULL, "Signature", NULL, 0, 0},
{NULL, ui_menu_uifmode_action, 2, NULL, "Decryption", NULL, 0, 0},
{NULL, ui_menu_uifmode_action, 3, NULL, "Authentication", NULL, 0, 0},
{ui_menu_settings, NULL, 1, &C_badge_back, "Back", NULL, 61, 40},
{ui_menu_settings, NULL, 0, &C_badge_back, "Back", NULL, 61, 40},
UX_MENU_END
};

Write Preview
Loading…
Cancel
Save