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

PICC Format fixes

Browse source
This commit is contained in:
Bjoern Kerler 2020-04-13 01:19:26 +02:00
commit e543637897
2 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
armsrc/mifaredesfire.c
View file

@ -334,12 +334,17 @@ void MifareDES_Auth1(uint8_t *datain) {
return; return;
} }
int rndlen=8;
int expectedlen = 1 + 8 + 2 + 2; int expectedlen = 1 + 8 + 2 + 2;
if (payload->algo == MFDES_ALGO_AES || payload->algo == MFDES_ALGO_3K3DES) { if (payload->algo == MFDES_ALGO_AES || payload->algo == MFDES_ALGO_3K3DES) {
expectedlen = 1 + 16 + 2 + 2; expectedlen = 1 + 16 + 2 + 2;
rndlen=16;
} }
int rndlen = len - 1 - 2 - 2; if (payload->mode == MFDES_AUTH_PICC) {
expectedlen = 1 + 1 + 8 + 2;
rndlen=8;
}
if (len != expectedlen) { if (len != expectedlen) {
if (DBGLEVEL >= DBG_ERROR) { if (DBGLEVEL >= DBG_ERROR) {

4
client/cmdhfmfdes.c
View file

@ -1664,7 +1664,6 @@ static int CmdHF14ADesCreateStdFile(const char *Cmd) {
} }
mfdes_file_t ft; mfdes_file_t ft;
bool usefid = true;
memcpy(ft.fid, fid, 2); memcpy(ft.fid, fid, 2);
memcpy(ft.filesize, filesize, 3); memcpy(ft.filesize, filesize, 3);
ft.fileno = fileno; ft.fileno = fileno;
@ -2347,6 +2346,9 @@ static command_t CommandTable[] = {
'88' Internal Authenticate '88' Internal Authenticate
'82' External Authenticate '82' External Authenticate
Write Data:
90 3d 00 00 16 01 00 00 00 0f 00 00 00 0f 20 00 3b 00 34 04 06 e1 04 0f fe 00 00 00
90 3d 00 00 09 02 00 00 00 02 00 00 00 00 00
*/ */
{NULL, NULL, NULL, NULL} {NULL, NULL, NULL, NULL}
}; };