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

aid search works

Browse source
This commit is contained in:
merlokk 2019-11-04 21:18:37 +02:00
commit 2a4a9745c9
3 changed files with 69 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

51
client/aidsearch.c
View file

@ -102,37 +102,51 @@ bool aidCompare(const char *aidlarge, const char *aidsmall) {
return false; return false;
} }
bool AIDGetFromElm(json_t *data, uint8_t *aid, size_t aidmaxlen, int *aidlen) {
*aidlen = 0;
const char *hexaid = jsonStrGet(data, "AID");
if (hexaid == NULL || strlen(hexaid) == 0)
return false;
int res = param_gethex_to_eol(hexaid, 0, aid, aidmaxlen, aidlen);
if (res)
return false;
return true;
}
int PrintAIDDescription(char *aid, bool verbose) { int PrintAIDDescription(char *aid, bool verbose) {
int retval = PM3_SUCCESS; int retval = PM3_SUCCESS;
int elmindx = 0;
json_t *root = AIDSearchInit(); json_t *root = AIDSearchInit();
json_t *data = AIDSearchGetElm(root, elmindx); if (root == NULL)
if (data == NULL)
goto out; goto out;
while (aidCompare(jsonStrGet(data, "AID"), aid)) { json_t *elm = NULL;
elmindx++; for (int elmindx = 0; elmindx < json_array_size(root); elmindx++) {
if (elmindx > json_array_size(root)) json_t *data = AIDSearchGetElm(root, elmindx);
goto out;
data = AIDSearchGetElm(root, elmindx);
if (data == NULL) if (data == NULL)
goto out; continue;
if (aidCompare(jsonStrGet(data, "AID"), aid)) {
elm = data;
break;
}
} }
if (elm == NULL)
goto out;
// print here // print here
const char *vaid = jsonStrGet(data, "AID"); const char *vaid = jsonStrGet(elm, "AID");
const char *vendor = jsonStrGet(data, "Vendor"); const char *vendor = jsonStrGet(elm, "Vendor");
const char *name = jsonStrGet(data, "Name"); const char *name = jsonStrGet(elm, "Name");
const char *country = jsonStrGet(data, "Country"); const char *country = jsonStrGet(elm, "Country");
const char *description = jsonStrGet(data, "Description"); const char *description = jsonStrGet(elm, "Description");
const char *type = jsonStrGet(data, "Type"); const char *type = jsonStrGet(elm, "Type");
if (!verbose) { if (!verbose) {
PrintAndLogEx(SUCCESS, "AID %s | %s | %s", vaid, vendor, name); PrintAndLogEx(SUCCESS, "AID %s | %s | %s", vaid, vendor, name);
} else { } else {
PrintAndLogEx(NORMAL, "----------------------------------------");
PrintAndLogEx(SUCCESS, "Input AID: %s", aid); PrintAndLogEx(SUCCESS, "Input AID: %s", aid);
if (aid) if (aid)
PrintAndLogEx(SUCCESS, "Found AID: %s", vaid); PrintAndLogEx(SUCCESS, "Found AID: %s", vaid);
@ -153,4 +167,7 @@ out:
return retval; return retval;
} }
int PrintAIDDescriptionBuf(uint8_t *aid, size_t aidlen, bool verbose) {
return PrintAIDDescription(sprint_hex_inrow(aid, aidlen), verbose);
}

2
client/aidsearch.h
View file

@ -19,8 +19,10 @@
#include <jansson.h> #include <jansson.h>
int PrintAIDDescription(char *aid, bool verbose); int PrintAIDDescription(char *aid, bool verbose);
int PrintAIDDescriptionBuf(uint8_t *aid, size_t aidlen, bool verbose);
json_t *AIDSearchInit(); json_t *AIDSearchInit();
json_t *AIDSearchGetElm(json_t *root, int elmindx); json_t *AIDSearchGetElm(json_t *root, int elmindx);
bool AIDGetFromElm(json_t *data, uint8_t *aid, size_t aidmaxlen, int *aidlen);
int AIDSearchFree(); int AIDSearchFree();
#endif #endif

34
client/cmdhf14a.c
View file

@ -1496,7 +1496,39 @@ int infoHF14A(bool verbose, bool do_nack_test, bool do_aid_search) {
} }
if (do_aid_search) { if (do_aid_search) {
PrintAIDDescription("315041592E5359532E4444463031", true); int elmindx = 0;
json_t *root = AIDSearchInit();
if (root != NULL) {
bool ActivateField = true;
for (elmindx = 0; elmindx < json_array_size(root); elmindx++) {
json_t *data = AIDSearchGetElm(root, elmindx);
uint8_t vaid[200] = {0};
int vaidlen = 0;
if (!AIDGetFromElm(data, vaid, sizeof(vaid), &vaidlen) || !vaidlen)
continue;
uint16_t sw = 0;
uint8_t result[1024] = {0};
size_t resultlen = 0;
int res = EMVSelect(ECC_CONTACTLESS, ActivateField, true, vaid, vaidlen, result, sizeof(result), &resultlen, &sw, NULL);
ActivateField = false;
if (res)
continue;
if (sw == 0x9000) {
PrintAndLogEx(NORMAL, "------------- Application OK -----------");
PrintAndLogEx(NORMAL, "res: %s", sprint_hex(result, resultlen));
PrintAIDDescriptionBuf(vaid, vaidlen, true);
}
if (sw == 0x6283 || sw == 0x6285) {
PrintAndLogEx(NORMAL, "----------- Application blocked --------");
PrintAIDDescriptionBuf(vaid, vaidlen, true);
}
}
DropField();
}
} }
} else { } else {
PrintAndLogEx(INFO, "proprietary non iso14443-4 card found, RATS not supported"); PrintAndLogEx(INFO, "proprietary non iso14443-4 card found, RATS not supported");