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

apdu format and print works

Browse source
This commit is contained in:
merlokk 2019-07-15 17:26:42 +03:00
commit df1dd71d14
3 changed files with 18 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

20
client/cmdhf14a.c
View file

@ -859,9 +859,9 @@ static int CmdHF14AAPDU(const char *Cmd) {
arg_lit0("kK", "keep", "leave the signal field ON after receive response"), arg_lit0("kK", "keep", "leave the signal field ON after receive response"),
arg_lit0("tT", "tlv", "executes TLV decoder if it possible"), arg_lit0("tT", "tlv", "executes TLV decoder if it possible"),
arg_lit0("dD", "decapdu", "decode apdu request if it possible"), arg_lit0("dD", "decapdu", "decode apdu request if it possible"),
arg_lit0("mM", "make", "<head (CLA INS P1 P2) hex>", "make apdu with head from this field and data from data field. Must be 4 bytes length: <CLA INS P1 P2>"), arg_str0("mM", "make", "<head (CLA INS P1 P2) hex>", "make apdu with head from this field and data from data field. Must be 4 bytes length: <CLA INS P1 P2>"),
arg_lit0("eE", "extended", "make extended length apdu if `m` parameter included"), arg_lit0("eE", "extended", "make extended length apdu if `m` parameter included"),
arg_lit0("lL", "le", "Le apdu parameter if `m` parameter included"), arg_int0("lL", "le", "<Le (int)>", "Le apdu parameter if `m` parameter included"),
arg_strx1(NULL, NULL, "<APDU (hex) | data (hex)>", "data if `m` parameter included"), arg_strx1(NULL, NULL, "<APDU (hex) | data (hex)>", "data if `m` parameter included"),
arg_param_end arg_param_end
}; };
@ -871,9 +871,15 @@ static int CmdHF14AAPDU(const char *Cmd) {
leaveSignalON = arg_get_lit(2); leaveSignalON = arg_get_lit(2);
decodeTLV = arg_get_lit(3); decodeTLV = arg_get_lit(3);
decodeAPDU = arg_get_lit(4); decodeAPDU = arg_get_lit(4);
makeAPDU = arg_get_lit(5);
CLIGetHexWithReturn(5, header, &headerlen);
makeAPDU = headerlen > 0;
if (makeAPDU && headerlen != 4) {
PrintAndLogEx(ERR, "header length must be 4 bytes instead of %d", headerlen);
return 1;
}
extendedAPDU = arg_get_lit(6); extendedAPDU = arg_get_lit(6);
le = arg_get_lit(7); le = arg_get_int_def(7, 0);
if (makeAPDU) { if (makeAPDU) {
uint8_t apdudata[PM3_CMD_DATA_SIZE] = {0}; uint8_t apdudata[PM3_CMD_DATA_SIZE] = {0};
@ -895,17 +901,17 @@ 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.");
return 1; return 2;
} }
} 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.");
return 2; return 3;
} }
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.");
return 2; return 3;
} }
// len = data + PCB(1b) + CRC(2b) // len = data + PCB(1b) + CRC(2b)

6
client/emv/apduinfo.c
View file

@ -317,7 +317,7 @@ const char *GetAPDUCodeDescription(uint8_t sw1, uint8_t sw2) {
return APDUCodeTable[0].Description; //empty string return APDUCodeTable[0].Description; //empty string
} }
int APDUDecode(uint8_t *data, size_t len, APDUStruct *apdu) { int APDUDecode(uint8_t *data, int len, APDUStruct *apdu) {
ExtAPDUHeader *hapdu = (ExtAPDUHeader *)data; ExtAPDUHeader *hapdu = (ExtAPDUHeader *)data;
apdu->cla = hapdu->cla; apdu->cla = hapdu->cla;
@ -417,11 +417,11 @@ int APDUDecode(uint8_t *data, size_t len, APDUStruct *apdu) {
return 0; return 0;
} }
int APDUEncode(APDUStruct *apdu, uint8_t *data, size_t *len) { int APDUEncode(APDUStruct *apdu, uint8_t *data, int *len) {
if (len) if (len)
*len = 0; *len = 0;
if (apdu->le > 0x10000 || apdu->lc != 0xffff) if (apdu->le > 0x10000 || apdu->lc > 0xffff)
return 1; return 1;
size_t dptr = 0; size_t dptr = 0;

4
client/emv/apduinfo.h
View file

@ -52,8 +52,8 @@ typedef struct {
uint8_t case_type; uint8_t case_type;
} __attribute__((packed)) APDUStruct; } __attribute__((packed)) APDUStruct;
extern int APDUDecode(uint8_t *data, size_t len, APDUStruct *apdu); extern int APDUDecode(uint8_t *data, int len, APDUStruct *apdu);
extern int APDUEncode(APDUStruct *apdu, uint8_t *data, size_t *len); extern int APDUEncode(APDUStruct *apdu, uint8_t *data, int *len);
extern void APDUPrint(APDUStruct apdu); extern void APDUPrint(APDUStruct apdu);
#endif #endif