From 6fae96094c973be880919f3a7798ca69d9365b69 Mon Sep 17 00:00:00 2001 From: NIIBE Yutaka Date: Wed, 21 Aug 2019 12:42:32 +0900 Subject: scd: Fix check_application_conflict. * scd/scd/app.c (check_application_conflict): Compare APPTYPE. Fixes-commit: 5a5288d051a551a1a8f169225e62572f6ee8cb10 Signed-off-by: NIIBE Yutaka --- scd/app.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/scd/app.c b/scd/app.c index af2da023c..6455f7287 100644 --- a/scd/app.c +++ b/scd/app.c @@ -275,6 +275,8 @@ check_application_conflict (card_t card, const char *name, const unsigned char *serialno_bin, size_t serialno_bin_len) { + apptype_t apptype; + if (!card || !name) return 0; if (!card->app) @@ -287,6 +289,10 @@ check_application_conflict (card_t card, const char *name, return 0; /* The card does not match the requested S/N. */ } + apptype = apptype_from_name (name); + if (card->app->apptype == apptype) + return 0; + if (card->app->apptype == APPTYPE_UNDEFINED) return 0; -- cgit v1.2.3