github/proxmark3
1
0
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2025-08-21 22:03:19 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

added work with application data section

Browse source
This commit is contained in:
merlokk 2018-10-08 17:00:41 +03:00
commit a0af1061c9
1 changed files with 76 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

112
client/emv/cmdemv.c
View file

@ -15,12 +15,12 @@
#include "cliparser/cliparser.h" #include "cliparser/cliparser.h"
#include <jansson.h> #include <jansson.h>
struct ApplicationDataElm { typedef struct {
tlv_tag_t Tag; tlv_tag_t Tag;
char *Name; char *Name;
}; } ApplicationDataElm;
static const struct ApplicationDataElm ApplicationData[] = { static const ApplicationDataElm ApplicationData[] = {
{0x82, "AIP"}, {0x82, "AIP"},
{0x94, "AFL"}, {0x94, "AFL"},
@ -31,19 +31,36 @@ static const struct ApplicationDataElm ApplicationData[] = {
{0x5F28, "IssuerCountryCode"}, {0x5F28, "IssuerCountryCode"},
{0x50, "ApplicationLabel"}, {0x50, "ApplicationLabel"},
{0x9F08, "VersionNumber"},
{0x9F42, "CurrencyCode"},
{0x5F2D, "LanguagePreference"}, {0x5F2D, "LanguagePreference"},
{0x87, "PriorityIndicator"}, {0x87, "PriorityIndicator"},
{0x5F34, "PAN"}, {0x9F07, "AUC"}, // Application Usage Control
{0x5F34, "PAN"}, {0x9F6C, "CTQ"},
{0x5F34, "PAN"}, {0x8E, "CVMList"},
{0x5F34, "PAN"}, {0x9F0D, "IACDefault"},
{0x5F34, "PAN"}, {0x9F0E, "IACDeny"},
{0x5F34, "PAN"}, {0x9F0F, "IACOnline"},
{0x5F34, "PAN"},
{0x5F34, "PAN"}, {0x8F, "CertificationAuthorityPublicKeyIndex"},
{0x5F34, "PAN"} {0x9F32, "IssuerPublicKeyExponent"},
{0x92, "IssuerPublicKeyRemainder"},
{0x90, "IssuerPublicKeyCertificate"},
{0x9F47, "ICCPublicKeyExponent"},
{0x9F46, "ICCPublicKeyCertificate"},
{0x00, "end..."}
}; };
int ApplicationDataLen = sizeof(ApplicationData) / sizeof(ApplicationDataElm);
char* GetApplicationDataName(tlv_tag_t tag) {
for (int i = 0; i < ApplicationDataLen; i++)
if (ApplicationData[i].Tag == tag)
return ApplicationData[i].Name;
return NULL;
}
#define TLV_ADD(tag, value)( tlvdb_change_or_add_node(tlvRoot, tag, sizeof(value) - 1, (const unsigned char *)value) ) #define TLV_ADD(tag, value)( tlvdb_change_or_add_node(tlvRoot, tag, sizeof(value) - 1, (const unsigned char *)value) )
void ParamLoadDefaults(struct tlvdb *tlvRoot) { void ParamLoadDefaults(struct tlvdb *tlvRoot) {
@ -1206,7 +1223,7 @@ int JsonSaveTLVValue(json_t *root, char *path, struct tlvdb *tlvdbelm) {
return 1; return 1;
} }
int JsonSaveTLVElm(json_t *elm, char *path, struct tlv *tlvelm, bool saveValue) { int JsonSaveTLVElm(json_t *elm, char *path, struct tlv *tlvelm, bool saveName, bool saveValue, bool saveAppDataLink) {
json_error_t error; json_error_t error;
if (strlen(path) < 1 || !tlvelm) if (strlen(path) < 1 || !tlvelm)
@ -1231,33 +1248,51 @@ int JsonSaveTLVElm(json_t *elm, char *path, struct tlv *tlvelm, bool saveValue)
} }
} }
char * name = emv_get_tag_name(tlvelm); if (saveAppDataLink) {
if (name && strlen(name) > 0 && strncmp(name, "Unknown", 7)) char * AppDataName = GetApplicationDataName(tlvelm->tag);
JsonSaveStr(obj, "name", emv_get_tag_name(tlvelm)); if (AppDataName)
JsonSaveHex(obj, "tag", tlvelm->tag, 0); JsonSaveStr(obj, "appdata", AppDataName);
JsonSaveHex(obj, "length", tlvelm->len, 0); } else {
if (saveValue) char * name = emv_get_tag_name(tlvelm);
JsonSaveBufAsHex(obj, "value", (uint8_t *)tlvelm->value, tlvelm->len); if (saveName && name && strlen(name) > 0 && strncmp(name, "Unknown", 7))
JsonSaveStr(obj, "name", emv_get_tag_name(tlvelm));
JsonSaveHex(obj, "tag", tlvelm->tag, 0);
if (saveValue) {
JsonSaveHex(obj, "length", tlvelm->len, 0);
JsonSaveBufAsHex(obj, "value", (uint8_t *)tlvelm->value, tlvelm->len);
};
}
} }
return 0; return 0;
} }
int JsonSaveTLVTreeElm(json_t *elm, char *path, struct tlvdb *tlvdbelm, bool saveValue) { int JsonSaveTLVTreeElm(json_t *elm, char *path, struct tlvdb *tlvdbelm, bool saveName, bool saveValue, bool saveAppDataLink) {
return JsonSaveTLVElm(elm, path, (struct tlv *)tlvdb_get_tlv(tlvdbelm), saveValue); return JsonSaveTLVElm(elm, path, (struct tlv *)tlvdb_get_tlv(tlvdbelm), saveName, saveValue, saveAppDataLink);
} }
int JsonSaveTLVTree(json_t *elm, char *path, struct tlvdb *tlvdbelm) { int JsonSaveTLVTree(json_t *root, json_t *elm, char *path, struct tlvdb *tlvdbelm) {
struct tlvdb *tlvp = tlvdbelm; struct tlvdb *tlvp = tlvdbelm;
while (tlvp) { while (tlvp) {
const struct tlv * tlvpelm = tlvdb_get_tlv(tlvp);
char * AppDataName = NULL;
if (tlvpelm)
AppDataName = GetApplicationDataName(tlvpelm->tag);
if (AppDataName) {
char appdatalink[200] = {0};
sprintf(appdatalink, "$.ApplicationData.%s", AppDataName);
JsonSaveBufAsHex(root, appdatalink, (uint8_t *)tlvpelm->value, tlvpelm->len);
}
json_t *pelm = json_path_get(elm, path); json_t *pelm = json_path_get(elm, path);
if (pelm && json_is_array(pelm)) { if (pelm && json_is_array(pelm)) {
json_t *appendelm = json_object(); json_t *appendelm = json_object();
json_array_append_new(pelm, appendelm); json_array_append_new(pelm, appendelm);
JsonSaveTLVTreeElm(appendelm, "$", tlvp, true); JsonSaveTLVTreeElm(appendelm, "$", tlvp, !AppDataName, !tlvdb_elm_get_children(tlvp), AppDataName);
pelm = appendelm; pelm = appendelm;
} else { } else {
JsonSaveTLVTreeElm(elm, path, tlvp, true); JsonSaveTLVTreeElm(elm, path, tlvp, !AppDataName, !tlvdb_elm_get_children(tlvp), AppDataName);
pelm = json_path_get(elm, path); pelm = json_path_get(elm, path);
} }
@ -1281,7 +1316,7 @@ int JsonSaveTLVTree(json_t *elm, char *path, struct tlvdb *tlvdbelm) {
} }
// Recursion // Recursion
JsonSaveTLVTree(chjson, "$", tlvdb_elm_get_children(tlvp)); JsonSaveTLVTree(root, chjson, "$", tlvdb_elm_get_children(tlvp));
} }
tlvp = tlvdb_elm_get_next(tlvp); tlvp = tlvdb_elm_get_next(tlvp);
@ -1309,6 +1344,7 @@ int CmdHFEMVScan(const char *cmd) {
arg_param_begin, arg_param_begin,
arg_lit0("aA", "apdu", "show APDU reqests and responses."), arg_lit0("aA", "apdu", "show APDU reqests and responses."),
arg_lit0("tT", "tlv", "TLV decode results."), arg_lit0("tT", "tlv", "TLV decode results."),
arg_lit0("eE", "extract", "Extract TLV elements and fill Application Data"),
arg_lit0("jJ", "jload", "Load transaction parameters from `emv/defparams.json` file."), arg_lit0("jJ", "jload", "Load transaction parameters from `emv/defparams.json` file."),
arg_rem("By default:", "Transaction type - MSD"), arg_rem("By default:", "Transaction type - MSD"),
arg_lit0("vV", "qvsdc", "Transaction type - qVSDC or M/Chip."), arg_lit0("vV", "qvsdc", "Transaction type - qVSDC or M/Chip."),
@ -1323,18 +1359,19 @@ int CmdHFEMVScan(const char *cmd) {
bool showAPDU = arg_get_lit(1); bool showAPDU = arg_get_lit(1);
bool decodeTLV = arg_get_lit(2); bool decodeTLV = arg_get_lit(2);
bool paramLoadJSON = arg_get_lit(3); bool extractTLVElements = arg_get_lit(3);
bool paramLoadJSON = arg_get_lit(4);
enum TransactionType TrType = TT_MSD; enum TransactionType TrType = TT_MSD;
if (arg_get_lit(4))
TrType = TT_QVSDCMCHIP;
if (arg_get_lit(5)) if (arg_get_lit(5))
TrType = TT_CDA; TrType = TT_QVSDCMCHIP;
if (arg_get_lit(6)) if (arg_get_lit(6))
TrType = TT_CDA;
if (arg_get_lit(7))
TrType = TT_VSDC; TrType = TT_VSDC;
bool GenACGPO = arg_get_lit(7); bool GenACGPO = arg_get_lit(8);
bool MergeJSON = arg_get_lit(8); bool MergeJSON = arg_get_lit(9);
CLIParserFree(); CLIParserFree();
SetAPDULogging(showAPDU); SetAPDULogging(showAPDU);
@ -1394,7 +1431,10 @@ int CmdHFEMVScan(const char *cmd) {
JsonSaveBufAsHex(root, "$.PPSE.AID", (uint8_t *)"2PAY.SYS.DDF01", 14); JsonSaveBufAsHex(root, "$.PPSE.AID", (uint8_t *)"2PAY.SYS.DDF01", 14);
struct tlvdb *fci = tlvdb_parse_multi(buf, len); struct tlvdb *fci = tlvdb_parse_multi(buf, len);
JsonSaveTLVTree(root, "$.PPSE.FCITemplate", fci); if (extractTLVElements)
JsonSaveTLVTree(root, root, "$.PPSE.FCITemplate", fci);
else
JsonSaveTLVTreeElm(root, "$.PPSE.FCITemplate", fci, true, true, false);
JsonSaveTLVValue(root, "$.Application.KernelID", tlvdb_find_full(fci, 0x9f2a)); JsonSaveTLVValue(root, "$.Application.KernelID", tlvdb_find_full(fci, 0x9f2a));
tlvdb_free(fci); tlvdb_free(fci);
} }
@ -1449,7 +1489,7 @@ int CmdHFEMVScan(const char *cmd) {
TLVPrintFromBuffer(buf, len); TLVPrintFromBuffer(buf, len);
struct tlvdb *fci = tlvdb_parse_multi(buf, len); struct tlvdb *fci = tlvdb_parse_multi(buf, len);
JsonSaveTLVTree(root, "$.Application.FCITemplate", fci); JsonSaveTLVTree(root, root, "$.Application.FCITemplate", fci);
tlvdb_free(fci); tlvdb_free(fci);
// create transaction parameters // create transaction parameters
@ -1512,7 +1552,7 @@ int CmdHFEMVScan(const char *cmd) {
} }
struct tlvdb *gpofci = tlvdb_parse_multi(buf, len); struct tlvdb *gpofci = tlvdb_parse_multi(buf, len);
JsonSaveTLVTree(root, "$.Application.GPO", gpofci); JsonSaveTLVTree(root, root, "$.Application.GPO", gpofci);
JsonSaveTLVValue(root, "$.ApplicationData.AIP", tlvdb_find_full(gpofci, 0x82)); JsonSaveTLVValue(root, "$.ApplicationData.AIP", tlvdb_find_full(gpofci, 0x82));
JsonSaveTLVValue(root, "$.ApplicationData.AFL", tlvdb_find_full(gpofci, 0x94)); JsonSaveTLVValue(root, "$.ApplicationData.AFL", tlvdb_find_full(gpofci, 0x94));
@ -1573,7 +1613,7 @@ int CmdHFEMVScan(const char *cmd) {
JsonSaveHex(jsonelm, "Offline", SFIoffline, 1); JsonSaveHex(jsonelm, "Offline", SFIoffline, 1);
struct tlvdb *rsfi = tlvdb_parse_multi(buf, len); struct tlvdb *rsfi = tlvdb_parse_multi(buf, len);
JsonSaveTLVTree(jsonelm, "$.Data", rsfi); JsonSaveTLVTree(root, jsonelm, "$.Data", rsfi);
tlvdb_free(rsfi); tlvdb_free(rsfi);
} }
} }