dearsky/pico-hsm
1
0
Fork 0
Code Issues 17 Pull Requests 4 Actions Packages Projects Releases 26 Wiki Activity

Merge branch 'master' into development

Browse Source 
Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>
This commit is contained in:
Pol Henarejos
2024-06-21 21:14:43 +02:00
parent 79f76a176d 47acef71c8
commit d1fb4d0c65
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/hsm/cmd_extras.c
View File

@@ -36,6 +36,10 @@ int cmd_extras() {
return SW_SECURITY_STATUS_NOT_SATISFIED(); return SW_SECURITY_STATUS_NOT_SATISFIED();
} }
#endif #endif
//check button (if enabled)
if (wait_button_pressed() == true) {
return SW_SECURE_MESSAGE_EXEC_ERROR();
}
if (P1(apdu) == 0xA) { //datetime operations if (P1(apdu) == 0xA) { //datetime operations
if (P2(apdu) != 0x0) { if (P2(apdu) != 0x0) {
return SW_INCORRECT_P1P2(); return SW_INCORRECT_P1P2();

6
src/hsm/cmd_list_keys.c
View File

@@ -60,5 +60,11 @@ int cmd_list_keys() {
res_APDU[res_APDU_size++] = f->fid & 0xff; res_APDU[res_APDU_size++] = f->fid & 0xff;
} }
} }
#if !defined(ENABLE_EMULATION)
if ((apdu.rlen + 2 + 10) % 64 == 0) { // FIX for strange behaviour with PSCS and multiple of 64
res_APDU[res_APDU_size++] = 0;
res_APDU[res_APDU_size++] = 0;
}
#endif
return SW_OK(); return SW_OK();
} }