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

added kernel id and moved some parts of code in ppse

Browse source
This commit is contained in:
merlokk 2018-10-03 18:10:25 +03:00
commit 831096776b
1 changed files with 23 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

31
client/emv/cmdemv.c
View file

@ -1305,21 +1305,33 @@ int CmdHFEMVScan(const char *cmd) {
// EMV PPSE
PrintAndLog("--> PPSE.");
res = EMVSearchPSE(true, true, decodeTLV, tlvSelect);
res = EMVSelectPSE(true, true, 2, buf, sizeof(buf), &len, &sw);
if (!res && sw == 0x9000){
if (decodeTLV)
TLVPrintFromBuffer(buf, len);
JsonSaveBufAsHex(root, "$.PPSE.AID", (uint8_t *)"2PAY.SYS.DDF01", 14);
struct tlvdb *fci = tlvdb_parse_multi(buf, len);
JsonSaveTLVTree(root, "$.PPSE.FCITemplate", fci);
const struct tlv *kernel = tlvdb_get_tlv(tlvdb_find_full(fci, 0x9f2a));
if (kernel) {
JsonSaveBufAsHex(root, "$.Application.KernelID", (uint8_t *)kernel->value, kernel->len);
}
tlvdb_free(fci);
}
res = EMVSearchPSE(false, true, decodeTLV, tlvSelect);
// check PPSE and select application id
if (!res) {
TLVPrintAIDlistFromSelectTLV(tlvSelect);
JsonSaveBufAsHex(root, "$.PPSE.AID", (uint8_t *)"2PAY.SYS.DDF01", 14);
JsonSaveTLVTree(root, "$.PPSE.FCITemplate", tlvdb_find(tlvSelect, 0x6f));
// here save PSE result to JSON
} else {
// EMV SEARCH with AID list
SetAPDULogging(false);
PrintAndLog("--> AID search.");
if (EMVSearch(true, true, decodeTLV, tlvSelect)) {
if (EMVSearch(false, true, decodeTLV, tlvSelect)) {
PrintAndLog("E->Can't found any of EMV AID. Exit...");
tlvdb_free(tlvSelect);
return 3;
@ -1354,8 +1366,9 @@ int CmdHFEMVScan(const char *cmd) {
if (decodeTLV)
TLVPrintFromBuffer(buf, len);
JsonSaveTLVTree(root, "$.Application.FCITemplate", tlvdb_parse_multi(buf, len));
struct tlvdb *fci = tlvdb_parse_multi(buf, len);
JsonSaveTLVTree(root, "$.Application.FCITemplate", fci);
tlvdb_free(fci);