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

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