From 2d72a157d50253de23f2e94cce7b7585a4d711d4 Mon Sep 17 00:00:00 2001 From: Pol Henarejos Date: Mon, 1 Dec 2025 01:44:29 +0100 Subject: [PATCH] Fix on AID selection. It should support shorter AID if matches. Signed-off-by: Pol Henarejos --- src/main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main.c b/src/main.c index e59b5e3..e3b5ac8 100644 --- a/src/main.c +++ b/src/main.c @@ -58,7 +58,7 @@ const uint8_t *ccid_atr = NULL; bool app_exists(const uint8_t *aid, size_t aid_len) { for (int a = 0; a < num_apps; a++) { - if (apps[a].aid[0] == aid_len && !memcmp(apps[a].aid + 1, aid, MIN(aid_len, apps[a].aid[0]))) { + if (!memcmp(apps[a].aid + 1, aid, apps[a].aid[0])) { return true; } } @@ -79,14 +79,14 @@ int register_app(int (*select_aid)(app_t *, uint8_t), const uint8_t *aid) { } int select_app(const uint8_t *aid, size_t aid_len) { - if (current_app && current_app->aid && current_app->aid[0] == aid_len && (current_app->aid + 1 == aid || !memcmp(current_app->aid + 1, aid, MIN(current_app->aid[0], aid_len)))) { + if (current_app && current_app->aid && (current_app->aid + 1 == aid || !memcmp(current_app->aid + 1, aid, current_app->aid[0]))) { current_app->select_aid(current_app, 0); return PICOKEY_OK; } for (int a = 0; a < num_apps; a++) { - if (apps[a].aid[0] == aid_len && !memcmp(apps[a].aid + 1, aid, MIN(aid_len, apps[a].aid[0]))) { + if (!memcmp(apps[a].aid + 1, aid, apps[a].aid[0])) { if (current_app) { - if (current_app->aid && !memcmp(current_app->aid + 1, aid, MIN(current_app->aid[0], aid_len))) { + if (current_app->aid && !memcmp(current_app->aid + 1, aid, current_app->aid[0])) { current_app->select_aid(current_app, 1); return PICOKEY_OK; }