github/proxmark3
1
0
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2025-07-16 02:03:00 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

More work on iclass full simulation, and some work on iclass tag dump parsing

Browse source
This commit is contained in:
Martin Holst Swende 2015-02-19 10:48:33 +01:00
parent b67f7ec359
commit 1defcf606f
6 changed files with 44 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

1
client/Makefile
View file

@ -94,6 +94,7 @@ CMDSRCS = nonce2key/crapto1.c\
cmdscript.c\
pm3_bitlib.c\
aes.c\
protocols.c\
COREOBJS = $(CORESRCS:%.c=$(OBJDIR)/%.o)

15
client/cmdhficlass.c
View file

@ -29,6 +29,7 @@
#include "loclass/ikeys.h"
#include "loclass/elite_crack.h"
#include "loclass/fileutils.h"
#include "protocols.h"
static int CmdHelp(const char *Cmd);
@ -75,10 +76,9 @@ int CmdHFiClassSim(const char *Cmd)
uint8_t CSN[8] = {0, 0, 0, 0, 0, 0, 0, 0};
if (strlen(Cmd)<1) {
usage_hf_iclass_sim();
return usage_hf_iclass_sim();
}
simType = param_get8(Cmd, 0);
simType = param_get8ex(Cmd, 0, 0, 10);
if(simType == 0)
{
@ -322,7 +322,7 @@ int CmdHFiClassReader_Dump(const char *Cmd)
PrintAndLog("Hash0, a.k.a diversified key, that is computed using Ksel and stored in the card (Block 3):");
printvar("Div key", div_key, 8);
printvar("CC_NR:",CCNR,12);
doMAC(CCNR,12,div_key, MAC);
doMAC(CCNR,div_key, MAC);
printvar("MAC", MAC, 4);
uint8_t iclass_data[32000] = {0};
@ -421,9 +421,12 @@ int CmdHFiClassELoad(const char *Cmd)
fseek(f, 0, SEEK_SET);
uint8_t *dump = malloc(fsize);
size_t bytes_read = fread(dump, 1, fsize, f);
fclose(f);
printIclassDumpInfo(dump);
//Validate
if (bytes_read < fsize)
@ -456,7 +459,7 @@ int usage_hf_iclass_decrypt()
PrintAndLog("OBS! In order to use this function, the file 'iclass_decryptionkey.bin' must reside");
PrintAndLog("in the working directory. The file should be 16 bytes binary data");
PrintAndLog("");
PrintAndLog("example: hf iclass decrypt tagdump_12312342343.bin");
PrintAndLog("example: hf iclass decrypt f tagdump_12312342343.bin");
PrintAndLog("");
PrintAndLog("OBS! This is pretty stupid implementation, it tries to decrypt every block after block 6. ");
PrintAndLog("Correct behaviour would be to decrypt only the application areas where the key is valid,");
@ -604,7 +607,7 @@ int CmdHFiClass_iso14443A_write(const char *Cmd)
diversifyKey(CSN,KEY, div_key);
PrintAndLog("Div Key: %s",sprint_hex(div_key,8));
doMAC(CCNR, 12,div_key, MAC);
doMAC(CCNR, div_key, MAC);
UsbCommand c2 = {CMD_ICLASS_ISO14443A_WRITE, {readerType,blockNo}};
memcpy(c2.d.asBytes, bldata, 8);

2
client/loclass/elite_crack.c
View file

@ -394,7 +394,7 @@ int bruteforceItem(dumpdata item, uint16_t keytable[])
//Diversify
diversifyKey(item.csn, key_sel_p, div_key);
//Calc mac
doMAC(item.cc_nr,12, div_key,calculated_MAC);
doMAC(item.cc_nr, div_key,calculated_MAC);
if(memcmp(calculated_MAC, item.mac, 4) == 0)
{