mirror of
https://github.com/RfidResearchGroup/proxmark3.git
synced 2025-03-20 12:07:05 +08:00
Merge branch 'master' of https://github.com/Proxmark/proxmark3
Conflicts: armsrc/appmain.c armsrc/apps.h armsrc/iclass.c client/Makefile client/cmdhficlass.c client/loclass/cipher.c client/loclass/fileutils.c client/loclass/ikeys.h include/usb_cmd.h
This commit is contained in:
iceman1001
commit
75465377b9
10 changed files with 131 additions and 68 deletions
|
|
@ -85,4 +85,3 @@ Jonathan Westhues
|
|||
user jwesthues, at host cq.cx
|
||||
|
||||
May 2007, Cambridge MA
|
||||
|
||||
|
|
|
|||
|
|
@ -47,6 +47,7 @@
|
|||
// different initial value (CRC_ICLASS)
|
||||
#include "../common/iso14443crc.h"
|
||||
#include "../common/iso15693tools.h"
|
||||
#include "iso15693tools.h"
|
||||
|
||||
|
||||
static int timeout = 4096;
|
||||
|
|
|
|||
|
|
@ -40,11 +40,20 @@ bool InitDesfireCard(){
|
|||
return true;
|
||||
}
|
||||
|
||||
// ARG0 flag enums
|
||||
enum {
|
||||
NONE = 0x00,
|
||||
INIT = 0x01,
|
||||
DISCONNECT = 0x02,
|
||||
FOO = 0x04,
|
||||
BAR = 0x08,
|
||||
} CmdOptions ;
|
||||
|
||||
void MifareSendCommand(uint8_t arg0, uint8_t arg1, uint8_t *datain){
|
||||
|
||||
/* ARG0 contains flags.
|
||||
0x01 = init card.
|
||||
0x02 =
|
||||
0x02 = No Disconnect
|
||||
0x03
|
||||
*/
|
||||
uint8_t flags = arg0;
|
||||
|
|
@ -53,17 +62,18 @@ void MifareSendCommand(uint8_t arg0, uint8_t arg1, uint8_t *datain){
|
|||
memset(resp,0,sizeof(resp));
|
||||
|
||||
if (MF_DBGLEVEL >= 4) {
|
||||
Dbprintf(" flags: %02X", flags);
|
||||
Dbprintf(" flags : %02X", flags);
|
||||
Dbprintf(" len : %02X", datalen);
|
||||
print_result("to send: ", datain, datalen);
|
||||
print_result(" RX : ", datain, datalen);
|
||||
}
|
||||
|
||||
if ( flags & 0x01 ){
|
||||
if ( flags & INIT ){
|
||||
if ( !InitDesfireCard() )
|
||||
return;
|
||||
}
|
||||
|
||||
int len = DesfireAPDU(datain, datalen, resp);
|
||||
print_result(" <--: ", resp, len);
|
||||
if ( !len ) {
|
||||
if (MF_DBGLEVEL >= 4) {
|
||||
print_result("ERR <--: ", resp, len);
|
||||
|
|
@ -71,10 +81,14 @@ void MifareSendCommand(uint8_t arg0, uint8_t arg1, uint8_t *datain){
|
|||
OnError();
|
||||
return;
|
||||
}
|
||||
cmd_send(CMD_ACK,1,len,0,resp,len);
|
||||
|
||||
// reset the pcb_blocknum,
|
||||
pcb_blocknum = 0;
|
||||
|
||||
if ( flags & DISCONNECT )
|
||||
OnSuccess();
|
||||
|
||||
cmd_send(CMD_ACK,1,len,0,resp,len);
|
||||
}
|
||||
|
||||
void MifareDesfireGetInformation(){
|
||||
|
|
@ -556,19 +570,16 @@ void MifareDES_Auth2(uint32_t arg0, uint8_t *datain){
|
|||
}
|
||||
|
||||
void OnSuccess(){
|
||||
// transmit a DESELECT COMMAND for Desfire.
|
||||
ReaderTransmit(deselect_cmd, 3 , NULL);
|
||||
// reset the pcb_blocknum,
|
||||
pcb_blocknum = 0;
|
||||
ReaderTransmit(deselect_cmd, 3 , NULL);
|
||||
FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
|
||||
LEDsoff();
|
||||
}
|
||||
|
||||
void OnError(){
|
||||
cmd_send(CMD_ACK,0,0,0,0,0);
|
||||
ReaderTransmit(deselect_cmd, 3 , NULL);
|
||||
// reset the pcb_blocknum,
|
||||
pcb_blocknum = 0;
|
||||
ReaderTransmit(deselect_cmd, 3 , NULL);
|
||||
FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
|
||||
cmd_send(CMD_ACK,0,0,0,0,0);
|
||||
LEDsoff();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -23,6 +23,11 @@ CXXFLAGS = -I$(QTDIR)/include -I$(QTDIR)/include/QtCore -I$(QTDIR)/include/QtGui
|
|||
QTLDLIBS = -L$(QTDIR)/lib -lQt5Core -lQt5Gui -lQt5Widgets
|
||||
MOC = $(QTDIR)/bin/moc
|
||||
LUAPLATFORM = mingw
|
||||
else ifeq ($(platform),Darwin)
|
||||
CXXFLAGS = $(shell pkg-config --cflags QtCore QtGui 2>/dev/null) -Wall -O4
|
||||
QTLDLIBS = $(shell pkg-config --libs QtCore QtGui 2>/dev/null)
|
||||
MOC = $(shell pkg-config --variable=moc_location QtCore)
|
||||
LUAPLATFORM = macosx
|
||||
else
|
||||
CXXFLAGS = $(shell pkg-config --cflags QtCore QtGui 2>/dev/null) -Wall -O4
|
||||
QTLDLIBS = $(shell pkg-config --libs QtCore QtGui 2>/dev/null)
|
||||
|
|
@ -78,8 +83,8 @@ CMDSRCS = nonce2key/crapto1.c\
|
|||
cmdhfdes.c \
|
||||
cmdhw.c \
|
||||
cmdlf.c \
|
||||
cmdlfhid.c \
|
||||
cmdlfio.c \
|
||||
cmdlfhid.c \
|
||||
cmdlfem4x.c \
|
||||
cmdlfhitag.c \
|
||||
cmdlfti.c \
|
||||
|
|
|
|||
|
|
@ -97,7 +97,7 @@ int CmdHFiClassList(const char *Cmd)
|
|||
first_timestamp = timestamp;
|
||||
}
|
||||
|
||||
// Break and stick with current result if buffer was not completely full
|
||||
// Break and stick with current result idf buffer was not completely full
|
||||
if (frame[0] == 0x44 && frame[1] == 0x44 && frame[2] == 0x44 && frame[3] == 0x44) break;
|
||||
|
||||
char line[1000] = "";
|
||||
|
|
@ -477,7 +477,8 @@ int CmdHFiClassReader_Dump(const char *Cmd)
|
|||
return 0;
|
||||
}
|
||||
|
||||
if (param_gethex(Cmd, 0, KEY, 16)) {
|
||||
if (param_gethex(Cmd, 0, KEY, 16))
|
||||
{
|
||||
PrintAndLog("KEY must include 16 HEX symbols");
|
||||
return 1;
|
||||
}
|
||||
|
|
@ -649,7 +650,10 @@ static command_t CommandTable[] =
|
|||
{"list", CmdHFiClassList, 0, "List iClass history"},
|
||||
{"snoop", CmdHFiClassSnoop, 0, "Eavesdrop iClass communication"},
|
||||
{"sim", CmdHFiClassSim, 0, "Simulate iClass tag"},
|
||||
{"reader", CmdHFiClassReader, 0, "Read an iClass tag"},
|
||||
{"reader",CmdHFiClassReader, 0, "Read an iClass tag"},
|
||||
{"replay",CmdHFiClassReader_Replay, 0, "Read an iClass tag via Reply Attack"},
|
||||
{"dump", CmdHFiClassReader_Dump, 0, "Authenticate and Dump iClass tag"},
|
||||
{"write", CmdHFiClass_iso14443A_write, 0, "Authenticate and Write iClass block"},
|
||||
{"replay", CmdHFiClassReader_Replay, 0, "Read an iClass tag via Reply Attack"},
|
||||
{"dump", CmdHFiClassReader_Dump, 0, "Authenticate and Dump iClass tag"},
|
||||
{"write", CmdHFiClass_iso14443A_write, 0, "Authenticate and Write iClass block"},
|
||||
|
|
|
|||
|
|
@ -172,7 +172,7 @@ int CmdHF14ADesInfo(const char *Cmd){
|
|||
PrintAndLog("-------------------------------------------------------------");
|
||||
|
||||
|
||||
UsbCommand c1 = {CMD_MIFARE_DESFIRE, { 0x01, 0x01 }};
|
||||
UsbCommand c1 = {CMD_MIFARE_DESFIRE, { 0x03, 0x01 }};
|
||||
c1.d.asBytes[0] = GET_KEY_SETTINGS;
|
||||
SendCommand(&c1);
|
||||
if ( !WaitForResponseTimeout(CMD_ACK,&resp,1500) ) {
|
||||
|
|
@ -181,27 +181,27 @@ int CmdHF14ADesInfo(const char *Cmd){
|
|||
|
||||
PrintAndLog(" Master Key settings");
|
||||
if ( resp.d.asBytes[3] & (1 << 3 ) )
|
||||
PrintAndLog(" 0x08 Configuration changeable;");
|
||||
PrintAndLog(" 0x08 Configuration changeable");
|
||||
else
|
||||
PrintAndLog(" 0x08 Configuration NOT changeable;");
|
||||
PrintAndLog(" 0x08 Configuration NOT changeable");
|
||||
|
||||
if ( resp.d.asBytes[3] & (1 << 2 ) )
|
||||
PrintAndLog(" 0x04 PICC Master Key not required for create / delete;");
|
||||
PrintAndLog(" 0x04 PICC Master Key not required for create / delete");
|
||||
else
|
||||
PrintAndLog(" 0x04 PICC Master Key required for create / delete;");
|
||||
PrintAndLog(" 0x04 PICC Master Key required for create / delete");
|
||||
|
||||
if ( resp.d.asBytes[3] & (1 << 1 ) )
|
||||
PrintAndLog(" 0x02 Free directory list access without PICC Master Key;");
|
||||
PrintAndLog(" 0x02 Free directory list access without PICC Master Key");
|
||||
else
|
||||
PrintAndLog(" 0x02 Directory list access with PICC Master Key;");
|
||||
PrintAndLog(" 0x02 Directory list access with PICC Master Key");
|
||||
|
||||
if ( resp.d.asBytes[3] & (1 << 0 ) )
|
||||
PrintAndLog(" 0x01 Allow changing the Master Key;");
|
||||
PrintAndLog(" 0x01 Allow changing the Master Key");
|
||||
else
|
||||
PrintAndLog(" 0x01 Master Key is not changeable anymore;");
|
||||
PrintAndLog(" 0x01 Master Key is not changeable anymore");
|
||||
|
||||
// init len
|
||||
UsbCommand c2 = {CMD_MIFARE_DESFIRE, { 0x01, 0x02 }};
|
||||
UsbCommand c2 = {CMD_MIFARE_DESFIRE, { 0x03, 0x02 }};
|
||||
c2.d.asBytes[0] = GET_KEY_VERSION;
|
||||
c2.d.asBytes[1] = 0x00;
|
||||
SendCommand(&c2);
|
||||
|
|
@ -210,12 +210,12 @@ int CmdHF14ADesInfo(const char *Cmd){
|
|||
}
|
||||
|
||||
PrintAndLog("");
|
||||
PrintAndLog(" Max number of keys : %d", resp.d.asBytes[2]);
|
||||
PrintAndLog(" Max number of keys : %d", resp.d.asBytes[4]);
|
||||
PrintAndLog(" Master key Version : %d (0x%02x)", resp.d.asBytes[3], resp.d.asBytes[3]);
|
||||
PrintAndLog("-------------------------------------------------------------");
|
||||
|
||||
|
||||
UsbCommand c3 = {CMD_MIFARE_DESFIRE, { 0x01, 0x01 }};
|
||||
UsbCommand c3 = {CMD_MIFARE_DESFIRE, { 0x03, 0x01 }};
|
||||
c3.d.asBytes[0] = GET_FREE_MEMORY;
|
||||
SendCommand(&c3);
|
||||
if ( !WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
|
||||
|
|
@ -229,11 +229,11 @@ int CmdHF14ADesInfo(const char *Cmd){
|
|||
PrintAndLog("-------------------------------------------------------------");
|
||||
|
||||
/*
|
||||
Card Master key (CMK) 0x00 on AID = 00 00 00 (card level) 0x1
|
||||
Application Master Key (AMK) 0x00 on AID != 00 00 00
|
||||
Application keys (APK) = 0x01-0x0D
|
||||
Application free = 0x0E
|
||||
Application never = 0x0F
|
||||
Card Master key (CMK) 0x00 AID = 00 00 00 (card level)
|
||||
Application Master Key (AMK) 0x00 AID != 00 00 00
|
||||
Application keys (APK) 0x01-0x0D
|
||||
Application free 0x0E
|
||||
Application never 0x0F
|
||||
|
||||
ACCESS RIGHTS:
|
||||
keys 0,1,2,3 C
|
||||
|
|
@ -298,8 +298,13 @@ char * GetProtocolStr(uint8_t id){
|
|||
|
||||
int CmdHF14ADesEnumApplications(const char *Cmd){
|
||||
|
||||
UsbCommand c = {CMD_MIFARE_DESFIRE, { 0x01, 0x01 }};
|
||||
c.d.asBytes[0] = GET_APPLICATION_IDS;
|
||||
uint32_t options = 0x00;
|
||||
|
||||
options |= INIT;
|
||||
options |= DISCONNECT;
|
||||
|
||||
UsbCommand c = {CMD_MIFARE_DESFIRE, {options , 0x01 }};
|
||||
c.d.asBytes[0] = GET_APPLICATION_IDS; //0x6a
|
||||
SendCommand(&c);
|
||||
UsbCommand resp;
|
||||
|
||||
|
|
@ -316,26 +321,56 @@ int CmdHF14ADesEnumApplications(const char *Cmd){
|
|||
PrintAndLog("---Desfire Enum Applications --------------------------------");
|
||||
PrintAndLog("-------------------------------------------------------------");
|
||||
|
||||
//UsbCommand respFiles;
|
||||
UsbCommand respAid;
|
||||
UsbCommand respFiles;
|
||||
|
||||
uint8_t num = 0;
|
||||
int max = resp.arg[1] -3 -2;
|
||||
|
||||
for(int i=3; i<=max; i+=3){
|
||||
PrintAndLog(" Aid %d : %s ",num ,sprint_hex(resp.d.asBytes+i,3));
|
||||
PrintAndLog(" Aid %d : %02X %02X %02X ",num ,resp.d.asBytes[i],resp.d.asBytes[i+1],resp.d.asBytes[i+2]);
|
||||
num++;
|
||||
|
||||
// UsbCommand cFiles = {CMD_MIFARE_DESFIRE, { 0x01, 0x04 }};
|
||||
// cFiles.d.asBytes[0] = GET_FILE_IDS;
|
||||
// cFiles.d.asBytes[1] = resp.d.asBytes+i;
|
||||
// cFiles.d.asBytes[2] = resp.d.asBytes+i+1;
|
||||
// cFiles.d.asBytes[3] = resp.d.asBytes+i+2;
|
||||
// SendCommand(&cFiles);
|
||||
options = INIT;
|
||||
|
||||
// if ( !WaitForResponseTimeout(CMD_ACK,&respFiles,1500) ) {
|
||||
// PrintAndLog(" No files found");
|
||||
// break;
|
||||
// }
|
||||
UsbCommand cAid = {CMD_MIFARE_DESFIRE, { options, 0x04 }};
|
||||
cAid.d.asBytes[0] = SELECT_APPLICATION; // 0x5a
|
||||
cAid.d.asBytes[1] = resp.d.asBytes[i];
|
||||
cAid.d.asBytes[2] = resp.d.asBytes[i+1];
|
||||
cAid.d.asBytes[3] = resp.d.asBytes[i+2];
|
||||
SendCommand(&cAid);
|
||||
|
||||
if (!WaitForResponseTimeout(CMD_ACK,&respAid,1500) ) {
|
||||
PrintAndLog(" Timed-out");
|
||||
continue;
|
||||
}
|
||||
uint8_t isOK = respAid.arg[0] & 0xff;
|
||||
if ( !isOK ){
|
||||
PrintAndLog(" Can't select AID: %s",sprint_hex(resp.d.asBytes+i,3));
|
||||
continue;
|
||||
}
|
||||
|
||||
options = DISCONNECT;
|
||||
UsbCommand cFiles = {CMD_MIFARE_DESFIRE, { options, 0x01 }};
|
||||
cFiles.d.asBytes[0] = GET_FILE_IDS; // 0x6f
|
||||
SendCommand(&cFiles);
|
||||
|
||||
if ( !WaitForResponseTimeout(CMD_ACK,&respFiles,1500) ) {
|
||||
PrintAndLog(" Timed-out");
|
||||
continue;
|
||||
} else {
|
||||
|
||||
uint8_t isOK = respFiles.arg[0] & 0xff;
|
||||
if ( !isOK ){
|
||||
PrintAndLog(" No files found");
|
||||
continue;
|
||||
}
|
||||
|
||||
int respfileLen = resp.arg[1]-3-2;
|
||||
for (int j=0; j< respfileLen; ++j){
|
||||
PrintAndLog(" Fileid %d :", resp.d.asBytes[j+3]);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
PrintAndLog("-------------------------------------------------------------");
|
||||
|
|
|
|||
|
|
@ -19,6 +19,14 @@ char * GetCardSizeStr( uint8_t fsize );
|
|||
char * GetVendorStr( uint8_t id);
|
||||
char * GetProtocolStr(uint8_t id);
|
||||
|
||||
// Command options for Desfire behavior.
|
||||
enum {
|
||||
NONE = 0x00,
|
||||
INIT = 0x01,
|
||||
DISCONNECT = 0x02,
|
||||
FOO = 0x04,
|
||||
BAR = 0x08,
|
||||
} CmdOptions ;
|
||||
|
||||
|
||||
#define CREATE_APPLICATION 0xca
|
||||
|
|
|
|||
|
|
@ -4,11 +4,11 @@
|
|||
|
||||
/**
|
||||
* @brief
|
||||
*Definition 11. Let the function hash0 : F 82 × F 82 × (F 62 ) 8 ? (F 82 ) 8 be defined as
|
||||
*Definition 11. Let the function hash0 : F 82 × F 82 × (F 62 ) 8 → (F 82 ) 8 be defined as
|
||||
* hash0(x, y, z [0] . . . z [7] ) = k [0] . . . k [7] where
|
||||
* z'[i] = (z[i] mod (63-i)) + i i = 0...3
|
||||
* z'[i+4] = (z[i+4] mod (64-i)) + i i = 0...3
|
||||
* ? = check(z');
|
||||
* ẑ = check(z');
|
||||
* @param c
|
||||
* @param k this is where the diversified key is put (should be 8 bytes)
|
||||
* @return
|
||||
|
|
|
|||
0
client/obj/loclass/.dummy
Normal file
0
client/obj/loclass/.dummy
Normal file
Loading…
Add table
Reference in a new issue