github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-22 06:13:51 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

hf mf isen: forgot some checks

Browse source
This commit is contained in:
Philippe Teuwen 2024-08-02 23:21:14 +02:00
commit 02af12723c
1 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

18
client/src/cmdhfmf.c
View file

@ -9657,13 +9657,18 @@ static int CmdHF14AMfISEN(const char *Cmd) {
uint8_t keytype = MF_KEY_A; uint8_t keytype = MF_KEY_A;
if (arg_get_lit(ctx, 2) && arg_get_lit(ctx, 3)) { if (arg_get_lit(ctx, 2) && arg_get_lit(ctx, 3)) {
CLIParserFree(ctx); CLIParserFree(ctx);
PrintAndLogEx(WARNING, "Input key type must be A or B"); PrintAndLogEx(WARNING, "Choose one single input key type");
return PM3_EINVARG; return PM3_EINVARG;
} else if (arg_get_lit(ctx, 3)) { } else if (arg_get_lit(ctx, 3)) {
keytype = MF_KEY_B; keytype = MF_KEY_B;
} }
// Should warn if conflict with -a/-b and -c but well... uint8_t prev_keytype = keytype;
keytype = arg_get_int_def(ctx, 4, keytype); keytype = arg_get_int_def(ctx, 4, keytype);
if ((arg_get_lit(ctx, 2) || arg_get_lit(ctx, 3)) && (keytype != prev_keytype)) {
CLIParserFree(ctx);
PrintAndLogEx(WARNING, "Choose one single input key type");
return PM3_EINVARG;
}
int keylen = 0; int keylen = 0;
uint8_t key[MIFARE_KEY_SIZE] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF}; uint8_t key[MIFARE_KEY_SIZE] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};
@ -9674,15 +9679,20 @@ static int CmdHF14AMfISEN(const char *Cmd) {
uint8_t keytype_nested = keytype; uint8_t keytype_nested = keytype;
if (arg_get_lit(ctx, 7) && arg_get_lit(ctx, 8)) { if (arg_get_lit(ctx, 7) && arg_get_lit(ctx, 8)) {
CLIParserFree(ctx); CLIParserFree(ctx);
PrintAndLogEx(WARNING, "Input key type must be A or B"); PrintAndLogEx(WARNING, "Choose one single nested input key type");
return PM3_EINVARG; return PM3_EINVARG;
} else if (arg_get_lit(ctx, 7)) { } else if (arg_get_lit(ctx, 7)) {
keytype_nested = MF_KEY_A; keytype_nested = MF_KEY_A;
} else if (arg_get_lit(ctx, 8)) { } else if (arg_get_lit(ctx, 8)) {
keytype_nested = MF_KEY_B; keytype_nested = MF_KEY_B;
} }
// Should warn if conflict with -a/-b and -c but well... uint8_t prev_keytype_nested = keytype_nested;
keytype_nested = arg_get_int_def(ctx, 9, keytype_nested); keytype_nested = arg_get_int_def(ctx, 9, keytype_nested);
if ((arg_get_lit(ctx, 7) || arg_get_lit(ctx, 8)) && (keytype_nested != prev_keytype_nested)) {
CLIParserFree(ctx);
PrintAndLogEx(WARNING, "Choose one single nested input key type");
return PM3_EINVARG;
}
int keylen_nested = 0; int keylen_nested = 0;
uint8_t key_nested[MIFARE_KEY_SIZE]; uint8_t key_nested[MIFARE_KEY_SIZE];