mirror of
https://github.com/RfidResearchGroup/proxmark3.git
synced 2025-08-20 21:33:47 -07:00
simplify logic and continue to check use_elite even in default mode key
This commit is contained in:
parent
01a191f385
commit
f4d2d2e5db
1 changed files with 3 additions and 3 deletions
|
@ -297,7 +297,7 @@ static int generate_config_card(const iclass_config_card_item_t *o, uint8_t *ke
|
||||||
|
|
||||||
if (got_krki) {
|
if (got_krki) {
|
||||||
HFiClassCalcDivKey(configcard.csn, card_key, configcard.key_d, use_elite);
|
HFiClassCalcDivKey(configcard.csn, card_key, configcard.key_d, use_elite);
|
||||||
} else if (!got_krki) {
|
} else {
|
||||||
// defaulting to AA1 ki 0
|
// defaulting to AA1 ki 0
|
||||||
HFiClassCalcDivKey(configcard.csn, iClass_Key_Table[0], configcard.key_d, use_elite);
|
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
|
// calc diversified key for selected card
|
||||||
if (got_krki) {
|
if (got_krki) {
|
||||||
HFiClassCalcDivKey(cc->csn, card_key, cc->key_d, use_elite);
|
HFiClassCalcDivKey(cc->csn, card_key, cc->key_d, use_elite);
|
||||||
} else if (!got_krki) {
|
} else {
|
||||||
// defaulting to AA1 ki 0
|
// 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 {
|
} else {
|
||||||
PrintAndLogEx(FAILED, "failed to read a card");
|
PrintAndLogEx(FAILED, "failed to read a card");
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue