dash/proxmark3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hf 14a apdu - textual

Browse Source
This commit is contained in:
iceman1001
2020-11-11 18:29:27 +01:00
parent bf4cdf6eb7
commit 14ea72ca5d
2 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
client/src/cmdhf14a.c
View File

@@ -1027,7 +1027,7 @@ static int CmdExchangeAPDU(bool chainingin, uint8_t *datain, int datainlen, bool
return 4; return 4;
} }
return 0; return PM3_SUCCESS;
} }
int ExchangeAPDU14a(uint8_t *datain, int datainlen, bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen) { int ExchangeAPDU14a(uint8_t *datain, int datainlen, bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen) {
@@ -1146,7 +1146,7 @@ static int CmdHF14AAPDU(const char *Cmd) {
if (makeAPDU && headerlen != 4) { if (makeAPDU && headerlen != 4) {
PrintAndLogEx(ERR, "header length must be 4 bytes instead of %d", headerlen); PrintAndLogEx(ERR, "header length must be 4 bytes instead of %d", headerlen);
CLIParserFree(ctx); CLIParserFree(ctx);
return 1; return PM3_EINVARG;
} }
extendedAPDU = arg_get_lit(ctx, 6); extendedAPDU = arg_get_lit(ctx, 6);
le = arg_get_int_def(ctx, 7, 0); le = arg_get_int_def(ctx, 7, 0);
@@ -1172,19 +1172,19 @@ static int CmdHF14AAPDU(const char *Cmd) {
if (APDUEncode(&apdu, data, &datalen)) { if (APDUEncode(&apdu, data, &datalen)) {
PrintAndLogEx(ERR, "can't make apdu with provided parameters."); PrintAndLogEx(ERR, "can't make apdu with provided parameters.");
CLIParserFree(ctx); CLIParserFree(ctx);
return 2; return PM3_EINVARG;
} }
} else { } else {
if (extendedAPDU) { if (extendedAPDU) {
PrintAndLogEx(ERR, "make mode not set but here `e` option."); PrintAndLogEx(ERR, "make mode not set but here `e` option.");
CLIParserFree(ctx); CLIParserFree(ctx);
return 3; return PM3_EINVARG;
} }
if (le > 0) { if (le > 0) {
PrintAndLogEx(ERR, "make mode not set but here `l` option."); PrintAndLogEx(ERR, "make mode not set but here `l` option.");
CLIParserFree(ctx); CLIParserFree(ctx);
return 3; return PM3_EINVARG;
} }
// len = data + PCB(1b) + CRC(2b) // len = data + PCB(1b) + CRC(2b)
@@ -1192,7 +1192,12 @@ static int CmdHF14AAPDU(const char *Cmd) {
} }
CLIParserFree(ctx); CLIParserFree(ctx);
PrintAndLogEx(NORMAL, ">>>>[%s%s%s] %s", activateField ? "sel " : "", leaveSignalON ? "keep " : "", decodeTLV ? "TLV" : "", sprint_hex(data, datalen)); PrintAndLogEx(SUCCESS, "( " _YELLOW_("%s%s%s")" )",
activateField ? "select" : "",
leaveSignalON ? ", keep" : "",
decodeTLV ? ", TLV" : ""
);
PrintAndLogEx(SUCCESS, ">>> %s", sprint_hex_inrow(data, datalen));
if (decodeAPDU) { if (decodeAPDU) {
APDUStruct apdu; APDUStruct apdu;
@@ -1208,16 +1213,15 @@ static int CmdHF14AAPDU(const char *Cmd) {
if (res) if (res)
return res; return res;
PrintAndLogEx(NORMAL, "<<<< %s", sprint_hex(data, datalen)); PrintAndLogEx(SUCCESS, "<<< %s | %s", sprint_hex_inrow(data, datalen), sprint_ascii(data, datalen));
PrintAndLogEx(SUCCESS, "<<< status: %02x %02x - %s", data[datalen - 2], data[datalen - 1], GetAPDUCodeDescription(data[datalen - 2], data[datalen - 1]));
PrintAndLogEx(SUCCESS, "APDU response: %02x %02x - %s", data[datalen - 2], data[datalen - 1], GetAPDUCodeDescription(data[datalen - 2], data[datalen - 1]));
// TLV decoder // TLV decoder
if (decodeTLV && datalen > 4) { if (decodeTLV && datalen > 4) {
TLVPrintFromBuffer(data, datalen - 2); TLVPrintFromBuffer(data, datalen - 2);
} }
return 0; return PM3_SUCCESS;
} }
static int CmdHF14ACmdRaw(const char *Cmd) { static int CmdHF14ACmdRaw(const char *Cmd) {
@@ -2038,7 +2042,7 @@ int infoHF14A(bool verbose, bool do_nack_test, bool do_aid_search) {
break; break;
} }
} else { } else {
dump_buffer(&card.ats[pos], calen, NULL, 1); PrintAndLogEx(SUCCESS, " %s", sprint_hex_inrow(card.ats + pos, calen));
} }
} }

1
client/src/emv/dump.h
View File

@@ -21,6 +21,5 @@
#include <stdio.h> // FILE #include <stdio.h> // FILE
void dump_buffer(const unsigned char *ptr, size_t len, FILE *f, int level); void dump_buffer(const unsigned char *ptr, size_t len, FILE *f, int level);
void dump_buffer_tab(const unsigned char *ptr, size_t len, FILE *f, int tabs);
#endif #endif