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

Settings proper phy options

Browse Source 
Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>
This commit is contained in:
Pol Henarejos
2024-06-21 22:08:36 +02:00
parent c4a08aff0f
commit 9a7be98e6e
2 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pico-keys-sdk

Submodule pico-keys-sdk updated: f8480291fe...2700163e1f

18
src/hsm/cmd_extras.c
View File

@@ -37,7 +37,7 @@ int cmd_extras() {
} }
#endif #endif
//check button (if enabled) //check button (if enabled)
if (wait_button_pressed() == true) { if (wait_button_pressed() == true) {
return SW_SECURE_MESSAGE_EXEC_ERROR(); return SW_SECURE_MESSAGE_EXEC_ERROR();
} }
if (P1(apdu) == 0xA) { //datetime operations if (P1(apdu) == 0xA) { //datetime operations
@@ -243,30 +243,44 @@ int cmd_extras() {
else { else {
uint8_t tmp[PHY_MAX_SIZE]; uint8_t tmp[PHY_MAX_SIZE];
memset(tmp, 0, sizeof(tmp)); memset(tmp, 0, sizeof(tmp));
uint16_t opts = 0;
if (file_has_data(ef_phy)) { if (file_has_data(ef_phy)) {
memcpy(tmp, file_get_data(ef_phy), MIN(sizeof(tmp), file_get_size(ef_phy))); memcpy(tmp, file_get_data(ef_phy), MIN(sizeof(tmp), file_get_size(ef_phy)));
if (file_get_size(ef_phy) >= 8) {
opts = (tmp[PHY_OPTS] << 8) | tmp[PHY_OPTS + 1];
}
} }
if (P2(apdu) == PHY_VID) { // VIDPID if (P2(apdu) == PHY_VID) { // VIDPID
if (apdu.nc != 4) { if (apdu.nc != 4) {
return SW_WRONG_LENGTH(); return SW_WRONG_LENGTH();
} }
memcpy(tmp + PHY_VID, apdu.data, 4); memcpy(tmp + PHY_VID, apdu.data, 4);
opts |= PHY_OPT_VPID;
} }
else if (P2(apdu) == PHY_LED_GPIO || P2(apdu) == PHY_LED_MODE) { else if (P2(apdu) == PHY_LED_GPIO || P2(apdu) == PHY_LED_MODE) {
if (apdu.nc != 1) { if (apdu.nc != 1) {
return SW_WRONG_LENGTH(); return SW_WRONG_LENGTH();
} }
tmp[P2(apdu)] = apdu.data[0]; tmp[P2(apdu)] = apdu.data[0];
if (P2(apdu) == PHY_LED_GPIO) {
opts |= PHY_OPT_GPIO;
}
else if (P2(apdu) == PHY_LED_MODE) {
opts |= PHY_OPT_LED;
}
} }
else if (P2(apdu) == PHY_OPTS) { else if (P2(apdu) == PHY_OPTS) {
if (apdu.nc != 2) { if (apdu.nc != 2) {
return SW_WRONG_LENGTH(); return SW_WRONG_LENGTH();
} }
memcpy(tmp + PHY_OPTS, apdu.data, 2); uint16_t opt = (apdu.data[0] << 8) | apdu.data[1];
opts = (opts & ~PHY_OPT_MASK) | (opt & PHY_OPT_MASK);
} }
else { else {
return SW_INCORRECT_P1P2(); return SW_INCORRECT_P1P2();
} }
tmp[PHY_OPTS] = opts >> 8;
tmp[PHY_OPTS + 1] = opts & 0xff;
file_put_data(ef_phy, tmp, sizeof(tmp)); file_put_data(ef_phy, tmp, sizeof(tmp));
low_flash_available(); low_flash_available();
} }