dearsky/pico-openpgp
1
0
Fork 0
Code Issues 10 Pull Requests Actions Packages Projects Releases 15 Wiki Activity

Fix touch policy on mgmt key change.

Browse Source 
Fixes #38.

Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>
This commit is contained in:
Pol Henarejos
2025-07-08 13:51:24 +02:00
parent f2fe6dd5c2
commit 31ac28c7de
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/openpgp/piv.c
View File

@@ -983,12 +983,13 @@ static int cmd_set_mgmkey() {
} }
uint8_t touch = P2(apdu); uint8_t touch = P2(apdu);
if (touch != 0xFF && touch != 0xFE) { if (touch != 0xFF && touch != 0xFE) {
if (touch == 0xFF) { return SW_INCORRECT_P1P2();
touch = TOUCHPOLICY_NEVER; }
} if (touch == 0xFF) {
else if (touch == 0xFE) { touch = TOUCHPOLICY_NEVER;
touch = TOUCHPOLICY_ALWAYS; }
} else if (touch == 0xFE) {
touch = TOUCHPOLICY_ALWAYS;
} }
uint8_t algo = apdu.data[0], key_ref = apdu.data[1], pinlen = apdu.data[2]; uint8_t algo = apdu.data[0], key_ref = apdu.data[1], pinlen = apdu.data[2];
if ((key_ref != EF_PIV_KEY_CARDMGM) || (!(algo == PIV_ALGO_AES128 && pinlen == 16) && !(algo == PIV_ALGO_AES192 && pinlen == 24) && !(algo == PIV_ALGO_AES256 && pinlen == 32) && !(algo == PIV_ALGO_3DES && pinlen == 24))) { if ((key_ref != EF_PIV_KEY_CARDMGM) || (!(algo == PIV_ALGO_AES128 && pinlen == 16) && !(algo == PIV_ALGO_AES192 && pinlen == 24) && !(algo == PIV_ALGO_AES256 && pinlen == 32) && !(algo == PIV_ALGO_3DES && pinlen == 24))) {