From f4d2d2e5dbbbaf6f35a0593a2464bec3cc5ada5a Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 1 Oct 2024 09:57:38 +0200
Subject: [PATCH] simplify logic and continue to check use_elite even in
 default mode key

---
 client/src/cmdhficlass.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/src/cmdhficlass.c b/client/src/cmdhficlass.c
index 36d1622d5..a04143a20 100644
--- a/client/src/cmdhficlass.c
+++ b/client/src/cmdhficlass.c
@@ -297,7 +297,7 @@ static int generate_config_card(const iclass_config_card_item_t *o,  uint8_t *ke
 
     if (got_krki) {
         HFiClassCalcDivKey(configcard.csn, card_key, configcard.key_d, use_elite);
-    } else if (!got_krki) {
+    } else {
         // defaulting to AA1 ki 0
         HFiClassCalcDivKey(configcard.csn, iClass_Key_Table[0], configcard.key_d, use_elite);
     }
@@ -313,9 +313,9 @@ static int generate_config_card(const iclass_config_card_item_t *o,  uint8_t *ke
         // calc diversified key for selected card
         if (got_krki) {
             HFiClassCalcDivKey(cc->csn, card_key, cc->key_d, use_elite);
-        } else if (!got_krki) {
+        } else {
             // defaulting to AA1 ki 0
-            HFiClassCalcDivKey(cc->csn, iClass_Key_Table[0], cc->key_d, false);
+            HFiClassCalcDivKey(cc->csn, iClass_Key_Table[0], cc->key_d, use_elite);
         }
     } else {
         PrintAndLogEx(FAILED, "failed to read a card");