webadmin/pico-keys-sdk
1
0
Fork 0
mirror of https://github.com/polhenarejos/pico-keys-sdk synced 2026-06-11 21:08:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

select_app now invokes U2F or FIDO depending on the message.

Browse Source 
Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>
This commit is contained in:
Pol Henarejos
2024-08-20 14:29:11 +02:00
parent c1571c02f8
commit 38f0e2cc3a
4 changed files with 32 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/apdu.c
View File

@@ -53,22 +53,8 @@ int process_apdu() {
} }
} }
if (INS(apdu) == 0xA4 && P1(apdu) == 0x04 && (P2(apdu) == 0x00 || P2(apdu) == 0x4)) { //select by AID if (INS(apdu) == 0xA4 && P1(apdu) == 0x04 && (P2(apdu) == 0x00 || P2(apdu) == 0x4)) { //select by AID
for (int a = 0; a < num_apps; a++) { if (select_app(apdu.data, apdu.nc) == CCID_OK) {
if (!memcmp(apps[a].aid + 1, apdu.data, MIN(apdu.nc, apps[a].aid[0]))) { return SW_OK();
if (current_app) {
if (current_app->aid && !memcmp(current_app->aid + 1, apdu.data, apdu.nc)) {
current_app->select_aid(current_app);
return SW_OK();
}
if (current_app->unload) {
current_app->unload();
}
}
current_app = &apps[a];
if (current_app->select_aid(current_app) == CCID_OK) {
return SW_OK();
}
}
} }
return SW_FILE_NOT_FOUND(); return SW_FILE_NOT_FOUND();
} }

1
src/apdu.h
View File

@@ -34,6 +34,7 @@ typedef struct app {
} app_t; } app_t;
extern int register_app(int (*)(app_t *), const uint8_t *); extern int register_app(int (*)(app_t *), const uint8_t *);
extern int select_app(const uint8_t *aid, size_t aid_len);
typedef struct cmd { typedef struct cmd {
uint8_t ins; uint8_t ins;

24
src/main.c
View File

@@ -114,6 +114,30 @@ int register_app(int (*select_aid)(app_t *), const uint8_t *aid) {
return 0; return 0;
} }
int select_app(const uint8_t *aid, size_t aid_len) {
if (current_app && current_app->aid && (current_app->aid + 1 == aid || !memcmp(current_app->aid + 1, aid, aid_len))) {
return CCID_OK;
}
for (int a = 0; a < num_apps; a++) {
if (!memcmp(apps[a].aid + 1, aid, MIN(aid_len, apps[a].aid[0]))) {
if (current_app) {
if (current_app->aid && !memcmp(current_app->aid + 1, aid, aid_len)) {
current_app->select_aid(current_app);
return CCID_OK;
}
if (current_app->unload) {
current_app->unload();
}
}
current_app = &apps[a];
if (current_app->select_aid(current_app) == CCID_OK) {
return CCID_OK;
}
}
}
return CCID_ERR_FILE_NOT_FOUND;
}
int (*button_pressed_cb)(uint8_t) = NULL; int (*button_pressed_cb)(uint8_t) = NULL;
static uint32_t blink_interval_ms = BLINK_NOT_MOUNTED; static uint32_t blink_interval_ms = BLINK_NOT_MOUNTED;

18
src/usb/hid/hid.c
View File

@@ -306,7 +306,7 @@ int driver_process_usb_nopacket_hid() {
return 0; return 0;
} }
const uint8_t *fido_aid = NULL; extern const uint8_t fido_aid[], u2f_aid[];
int driver_process_usb_packet_hid(uint16_t read) { int driver_process_usb_packet_hid(uint16_t read) {
int apdu_sent = 0; int apdu_sent = 0;
@@ -481,19 +481,10 @@ int driver_process_usb_packet_hid(uint16_t read) {
(msg_packet.len == msg_packet.current_len && msg_packet.len > 0))) { (msg_packet.len == msg_packet.current_len && msg_packet.len > 0))) {
if (last_cmd == CTAPHID_OTP) { if (last_cmd == CTAPHID_OTP) {
is_nitrokey = true; is_nitrokey = true;
select_app(fido_aid + 1, fido_aid[0]);
} }
else {
else if (current_app == NULL || select_app(u2f_aid + 1, u2f_aid[0]);
current_app->aid != fido_aid) {
if (current_app && current_app->unload) {
current_app->unload();
}
for (int a = 0; a < num_apps; a++) {
if (!memcmp(apps[a].aid + 1, fido_aid + 1, MIN(fido_aid[0], apps[a].aid[0]))) {
current_app = &apps[a];
current_app->select_aid(current_app);
}
}
} }
//if (thread_type != 1) //if (thread_type != 1)
#ifndef ENABLE_EMULATION #ifndef ENABLE_EMULATION
@@ -515,6 +506,7 @@ int driver_process_usb_packet_hid(uint16_t read) {
(msg_packet.len == 0 || (msg_packet.len == 0 ||
(msg_packet.len == msg_packet.current_len && msg_packet.len > 0))) { (msg_packet.len == msg_packet.current_len && msg_packet.len > 0))) {
thread_type = 2; thread_type = 2;
select_app(fido_aid + 1, fido_aid[0]);
if (cbor_process_cb) { if (cbor_process_cb) {
if (msg_packet.current_len == msg_packet.len && msg_packet.len > 0) { if (msg_packet.current_len == msg_packet.len && msg_packet.len > 0) {
apdu_sent = cbor_process_cb(last_cmd, msg_packet.data, msg_packet.len); apdu_sent = cbor_process_cb(last_cmd, msg_packet.data, msg_packet.len);