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

small improvements in auth (#694)

Browse source
This commit is contained in:
Oleg Moiseenko 2018-10-12 15:13:58 +03:00 • committed by pwpiwi
parent ae027818ac
commit 54e3cfcb74
2 changed files with 24 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

16
client/cmdhf14a.c
View file

@ -649,10 +649,12 @@ void DropField() {
} }
int ExchangeRAW14a(uint8_t *datain, int datainlen, bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen) { int ExchangeRAW14a(uint8_t *datain, int datainlen, bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen) {
static bool responseNum = false;
uint16_t cmdc = 0; uint16_t cmdc = 0;
*dataoutlen = 0; *dataoutlen = 0;
if (activateField) { if (activateField) {
responseNum = false;
UsbCommand resp; UsbCommand resp;
// Anticollision + SELECT card // Anticollision + SELECT card
@ -695,8 +697,11 @@ int ExchangeRAW14a(uint8_t *datain, int datainlen, bool activateField, bool leav
if (leaveSignalON) if (leaveSignalON)
cmdc |= ISO14A_NO_DISCONNECT; cmdc |= ISO14A_NO_DISCONNECT;
UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_RAW | ISO14A_APPEND_CRC | cmdc, (datainlen & 0xFFFF), 0}}; UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_RAW | ISO14A_APPEND_CRC | cmdc, (datainlen & 0xFFFF) + 2, 0}};
memcpy(c.d.asBytes, datain, datainlen); uint8_t header[] = {0x0a | responseNum, 0x00};
responseNum ^= 1;
memcpy(c.d.asBytes, header, 2);
memcpy(&c.d.asBytes[2], datain, datainlen);
SendCommand(&c); SendCommand(&c);
uint8_t *recv; uint8_t *recv;
@ -715,7 +720,12 @@ int ExchangeRAW14a(uint8_t *datain, int datainlen, bool activateField, bool leav
return 2; return 2;
} }
memcpy(dataout, recv, *dataoutlen); if (recv[0] != header[0]) {
PrintAndLog("14aRAW ERROR: iso14443-4 framing error. Card send %2x must be %2x", dataout[0], header[0]);
return 2;
}
memcpy(dataout, &recv[2], *dataoutlen);
if(!iLen) { if(!iLen) {
PrintAndLog("14aRAW ERROR: No card response."); PrintAndLog("14aRAW ERROR: No card response.");

30
client/cmdhfmf.c
View file

@ -2708,7 +2708,7 @@ int CmdHF14AMfAuth4(const char *cmd) {
return 1; return 1;
} }
uint8_t cmd1[] = {0x0a, 0x00, 0x70, keyn[1], keyn[0], 0x00}; uint8_t cmd1[] = {0x70, keyn[1], keyn[0], 0x00};
int res = ExchangeRAW14a(cmd1, sizeof(cmd1), true, true, data, sizeof(data), &datalen); int res = ExchangeRAW14a(cmd1, sizeof(cmd1), true, true, data, sizeof(data), &datalen);
if (res) { if (res) {
PrintAndLog("ERROR exchande raw error: %d", res); PrintAndLog("ERROR exchande raw error: %d", res);
@ -2718,45 +2718,37 @@ int CmdHF14AMfAuth4(const char *cmd) {
PrintAndLog("<phase1: %s", sprint_hex(data, datalen)); PrintAndLog("<phase1: %s", sprint_hex(data, datalen));
if (datalen < 3) { if (datalen < 1) {
PrintAndLog("ERROR: card response length: %d", datalen); PrintAndLog("ERROR: card response length: %d", datalen);
DropField(); DropField();
return 3; return 3;
} }
if (data[0] != 0x0a || data[1] != 0x00) { if (data[0] != 0x90) {
PrintAndLog("ERROR: card response. Framing error. :%s", sprint_hex(data, 2));
DropField();
return 3;
}
if (data[2] != 0x90) {
PrintAndLog("ERROR: card response error: %02x", data[2]); PrintAndLog("ERROR: card response error: %02x", data[2]);
DropField(); DropField();
return 3; return 3;
} }
if (datalen != 19) { if (datalen != 19) { // code 1b + 16b + crc 2b
PrintAndLog("ERROR: card response must be 16 bytes long instead of: %d", datalen); PrintAndLog("ERROR: card response must be 19 bytes long instead of: %d", datalen);
DropField(); DropField();
return 3; return 3;
} }
aes_decode(NULL, key, &data[3], Rnd2, 16); aes_decode(NULL, key, &data[1], Rnd2, 16);
Rnd2[16] = Rnd2[0]; Rnd2[16] = Rnd2[0];
PrintAndLog("Rnd2: %s", sprint_hex(Rnd2, 16)); PrintAndLog("Rnd2: %s", sprint_hex(Rnd2, 16));
uint8_t cmd2[35] = {0}; uint8_t cmd2[33] = {0};
cmd2[0] = 0x0b; cmd2[0] = 0x72;
cmd2[1] = 0x00;
cmd2[2] = 0x72;
uint8_t raw[32] = {0}; uint8_t raw[32] = {0};
memmove(raw, Rnd1, 16); memmove(raw, Rnd1, 16);
memmove(&raw[16], &Rnd2[1], 16); memmove(&raw[16], &Rnd2[1], 16);
aes_encode(NULL, key, raw, &cmd2[3], 32); aes_encode(NULL, key, raw, &cmd2[1], 32);
PrintAndLog(">phase2: %s", sprint_hex(cmd2, 35)); PrintAndLog(">phase2: %s", sprint_hex(cmd2, 33));
res = ExchangeRAW14a(cmd2, sizeof(cmd2), false, false, data, sizeof(data), &datalen); res = ExchangeRAW14a(cmd2, sizeof(cmd2), false, false, data, sizeof(data), &datalen);
if (res) { if (res) {
@ -2767,7 +2759,7 @@ int CmdHF14AMfAuth4(const char *cmd) {
PrintAndLog("<phase2: %s", sprint_hex(data, datalen)); PrintAndLog("<phase2: %s", sprint_hex(data, datalen));
aes_decode(NULL, key, &data[3], raw, 32); aes_decode(NULL, key, &data[1], raw, 32);
PrintAndLog("res: %s", sprint_hex(raw, 32)); PrintAndLog("res: %s", sprint_hex(raw, 32));
PrintAndLog("Rnd1`: %s", sprint_hex(&raw[4], 16)); PrintAndLog("Rnd1`: %s", sprint_hex(&raw[4], 16));