mirrors/pico-keys-sdk
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

New format for applet selection.

Browse source 
AID comparison is performed by the kernel. If it is the same as previously loaded, do nothing. If not found, do nothing. If found and is different, unload old and load the new one.

All other applets shall be migrated to new format.

Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>
This commit is contained in:
Pol Henarejos 2023-10-11 21:02:04 +02:00
parent dbfb89f959
commit eef2f190f2
No known key found for this signature in database
GPG key ID: C0095B7870A4CCD3
4 changed files with 20 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/apdu.c
View file

@ -27,11 +27,18 @@ extern uint32_t timeout;
int process_apdu() {
led_set_blink(BLINK_PROCESSING);
if (INS(apdu) == 0xA4 && P1(apdu) == 0x04 && (P2(apdu) == 0x00 || P2(apdu) == 0x4)) { //select by AID
if (current_app && current_app->unload) {
current_app->unload();
}
for (int a = 0; a < num_apps; a++) {
if ((current_app = apps[a].select_aid(&apps[a], apdu.data, apdu.nc))) {
if (!memcmp(apps[a].aid + 1, apdu.data, MIN(apdu.nc, apps[a].aid[0]))) {
if (current_app) {
if (current_app->aid && !memcmp(current_app->aid + 1, apdu.data, apdu.nc)) {
return set_res_sw(0x90, 0x00);
}
if (current_app->unload) {
current_app->unload();
}
}
current_app = &apps[a];
current_app->select_aid(current_app);
return set_res_sw(0x90, 0x00);
}
}

4
src/apdu.h
View file

@ -28,11 +28,11 @@
typedef struct app {
const uint8_t *aid;
int (*process_apdu)();
struct app * (*select_aid)(struct app *, const uint8_t *, uint8_t);
int (*select_aid)(struct app *);
int (*unload)();
} app_t;
extern int register_app(app_t *(*)(app_t *, const uint8_t *, uint8_t));
extern int register_app(int (*)(app_t *), const uint8_t *);
typedef struct cmd {
uint8_t ins;

3
src/main.c
View file

@ -113,9 +113,10 @@ app_t *current_app = NULL;
const uint8_t *ccid_atr = NULL;
int register_app(app_t *(*select_aid)(app_t *, const uint8_t *, uint8_t)) {
int register_app(int (*select_aid)(app_t *), const uint8_t *aid) {
if (num_apps < sizeof(apps) / sizeof(app_t)) {
apps[num_apps].select_aid = select_aid;
apps[num_apps].aid = aid;
num_apps++;
return 1;
}

11
src/usb/hid/hid.c
View file

@ -550,13 +550,12 @@ int driver_process_usb_packet_hid(uint16_t read) {
}
else if (current_app == NULL ||
memcmp(current_app->aid, fido_aid + 1,
MIN(current_app->aid[0], fido_aid[0])) != 0) {
for (int a = 0; a < num_apps; a++) {
if ((current_app = apps[a].select_aid(&apps[a], fido_aid + 1, fido_aid[0]))) {
break;
current_app->aid != fido_aid) {
if (current_app && current_app->unload) {
current_app->unload();
}
}
current_app = &apps[a];
current_app->select_aid(current_app);
}
//if (thread_type != 1)
#ifndef ENABLE_EMULATION