client: fix mix of spaces & tabs

This commit is contained in:
Philippe Teuwen 2019-03-09 23:35:06 +01:00
commit 0d9223a547
197 changed files with 49383 additions and 49383 deletions

View file

@ -89,7 +89,7 @@ endif
print-%: ; @echo $* = $($*) print-%: ; @echo $* = $($*)
style: style:
find . \( -name "*.[ch]" -or -name "*.cpp" \) -exec perl -pi -e 's/[ \t\r]+$$//' {} \; find . \( -name "*.[ch]" -or -name "*.cpp" -or -name "*.lua" \) -exec perl -pi -e 's/[ \t\r]+$$//' {} \;
# Dummy target to test for GNU make availability # Dummy target to test for GNU make availability
_test: _test:

View file

@ -11,7 +11,7 @@
#ifndef CMDANALYSE_H__ #ifndef CMDANALYSE_H__
#define CMDANALYSE_H__ #define CMDANALYSE_H__
#include <stdlib.h> //size_t #include <stdlib.h> // size_t
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#include "cmdmain.h" #include "cmdmain.h"
@ -23,7 +23,7 @@
#include "tea.h" #include "tea.h"
#include "legic_prng.h" #include "legic_prng.h"
#include "loclass/elite_crack.h" #include "loclass/elite_crack.h"
#include "mifare/mfkey.h" //nonce2key #include "mifare/mfkey.h" // nonce2key
#include "util_posix.h" // msclock #include "util_posix.h" // msclock

View file

@ -22,7 +22,7 @@
#include <limits.h> // for CmdNorm INT_MIN && INT_MAX #include <limits.h> // for CmdNorm INT_MIN && INT_MAX
#include "util.h" #include "util.h"
#include "cmdmain.h" #include "cmdmain.h"
#include "proxmark3.h" // sendcommand #include "proxmark3.h"// sendcommand
#include "ui.h" // for show graph controls #include "ui.h" // for show graph controls
#include "graph.h" // for graph data #include "graph.h" // for graph data
#include "comms.h" #include "comms.h"

View file

@ -182,9 +182,9 @@ int applyIso14443a(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize) {
case MIFARE_MAGICWUPC1: snprintf(exp,size,"MAGIC WUPC1"); break; case MIFARE_MAGICWUPC1: snprintf(exp,size,"MAGIC WUPC1"); break;
case MIFARE_MAGICWUPC2: snprintf(exp,size,"MAGIC WUPC2"); break; case MIFARE_MAGICWUPC2: snprintf(exp,size,"MAGIC WUPC2"); break;
case MIFARE_MAGICWIPEC: snprintf(exp,size,"MAGIC WIPEC"); break; case MIFARE_MAGICWIPEC: snprintf(exp,size,"MAGIC WIPEC"); break;
case MIFARE_ULC_AUTH_1 : snprintf(exp,size,"AUTH "); break; case MIFARE_ULC_AUTH_1: snprintf(exp,size,"AUTH "); break;
case MIFARE_ULC_AUTH_2 : snprintf(exp,size,"AUTH_ANSW"); break; case MIFARE_ULC_AUTH_2: snprintf(exp,size,"AUTH_ANSW"); break;
case MIFARE_ULEV1_AUTH : case MIFARE_ULEV1_AUTH:
if ( cmdsize == 7 ) if ( cmdsize == 7 )
snprintf(exp,size,"PWD-AUTH KEY: 0x%02x%02x%02x%02x", cmd[1], cmd[2], cmd[3], cmd[4] ); snprintf(exp,size,"PWD-AUTH KEY: 0x%02x%02x%02x%02x", cmd[1], cmd[2], cmd[3], cmd[4] );
else else
@ -220,9 +220,9 @@ int applyIso14443a(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize) {
snprintf(exp,size,"?"); snprintf(exp,size,"?");
break; break;
} }
case MIFARE_ULEV1_READSIG : snprintf(exp,size,"READ_SIG"); break; case MIFARE_ULEV1_READSIG: snprintf(exp,size,"READ_SIG"); break;
case MIFARE_ULEV1_CHECKTEAR : snprintf(exp,size,"CHK_TEARING(%d)",cmd[1]); break; case MIFARE_ULEV1_CHECKTEAR: snprintf(exp,size,"CHK_TEARING(%d)",cmd[1]); break;
case MIFARE_ULEV1_VCSL : snprintf(exp,size,"VCSL"); break; case MIFARE_ULEV1_VCSL: snprintf(exp,size,"VCSL"); break;
default: return 0; default: return 0;
} }
return 1; return 1;
@ -245,8 +245,8 @@ void annotateIclass(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize) {
} }
case ICLASS_CMD_SELECT: snprintf(exp,size,"SELECT"); break; case ICLASS_CMD_SELECT: snprintf(exp,size,"SELECT"); break;
case ICLASS_CMD_PAGESEL: snprintf(exp,size,"PAGESEL(%d)", cmd[1]); break; case ICLASS_CMD_PAGESEL: snprintf(exp,size,"PAGESEL(%d)", cmd[1]); break;
case ICLASS_CMD_READCHECK_KC:snprintf(exp,size,"READCHECK[Kc](%d)", cmd[1]); break; case ICLASS_CMD_READCHECK_KC: snprintf(exp,size,"READCHECK[Kc](%d)", cmd[1]); break;
case ICLASS_CMD_READCHECK_KD:snprintf(exp,size,"READCHECK[Kd](%d)", cmd[1]); break; case ICLASS_CMD_READCHECK_KD: snprintf(exp,size,"READCHECK[Kd](%d)", cmd[1]); break;
case ICLASS_CMD_CHECK: snprintf(exp,size,"CHECK"); break; case ICLASS_CMD_CHECK: snprintf(exp,size,"CHECK"); break;
case ICLASS_CMD_DETECT: snprintf(exp,size,"DETECT"); break; case ICLASS_CMD_DETECT: snprintf(exp,size,"DETECT"); break;
case ICLASS_CMD_HALT: snprintf(exp,size,"HALT"); break; case ICLASS_CMD_HALT: snprintf(exp,size,"HALT"); break;
@ -261,20 +261,20 @@ void annotateIclass(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize) {
void annotateIso15693(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize) { void annotateIso15693(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize) {
switch(cmd[1]){ switch(cmd[1]){
case ISO15693_INVENTORY :snprintf(exp, size, "INVENTORY");return; case ISO15693_INVENTORY: snprintf(exp, size, "INVENTORY");return;
case ISO15693_STAYQUIET :snprintf(exp, size, "STAY_QUIET");return; case ISO15693_STAYQUIET: snprintf(exp, size, "STAY_QUIET");return;
case ISO15693_READBLOCK :snprintf(exp, size, "READBLOCK");return; case ISO15693_READBLOCK: snprintf(exp, size, "READBLOCK");return;
case ISO15693_WRITEBLOCK :snprintf(exp, size, "WRITEBLOCK");return; case ISO15693_WRITEBLOCK: snprintf(exp, size, "WRITEBLOCK");return;
case ISO15693_LOCKBLOCK :snprintf(exp, size, "LOCKBLOCK");return; case ISO15693_LOCKBLOCK: snprintf(exp, size, "LOCKBLOCK");return;
case ISO15693_READ_MULTI_BLOCK :snprintf(exp, size, "READ_MULTI_BLOCK");return; case ISO15693_READ_MULTI_BLOCK: snprintf(exp, size, "READ_MULTI_BLOCK");return;
case ISO15693_SELECT :snprintf(exp, size, "SELECT");return; case ISO15693_SELECT: snprintf(exp, size, "SELECT");return;
case ISO15693_RESET_TO_READY :snprintf(exp, size, "RESET_TO_READY");return; case ISO15693_RESET_TO_READY: snprintf(exp, size, "RESET_TO_READY");return;
case ISO15693_WRITE_AFI :snprintf(exp, size, "WRITE_AFI");return; case ISO15693_WRITE_AFI: snprintf(exp, size, "WRITE_AFI");return;
case ISO15693_LOCK_AFI :snprintf(exp, size, "LOCK_AFI");return; case ISO15693_LOCK_AFI: snprintf(exp, size, "LOCK_AFI");return;
case ISO15693_WRITE_DSFID :snprintf(exp, size, "WRITE_DSFID");return; case ISO15693_WRITE_DSFID: snprintf(exp, size, "WRITE_DSFID");return;
case ISO15693_LOCK_DSFID :snprintf(exp, size, "LOCK_DSFID");return; case ISO15693_LOCK_DSFID: snprintf(exp, size, "LOCK_DSFID");return;
case ISO15693_GET_SYSTEM_INFO :snprintf(exp, size, "GET_SYSTEM_INFO");return; case ISO15693_GET_SYSTEM_INFO: snprintf(exp, size, "GET_SYSTEM_INFO");return;
case ISO15693_READ_MULTI_SECSTATUS :snprintf(exp, size, "READ_MULTI_SECSTATUS");return; case ISO15693_READ_MULTI_SECSTATUS: snprintf(exp, size, "READ_MULTI_SECSTATUS");return;
default: break; default: break;
} }
@ -287,18 +287,18 @@ void annotateIso15693(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize) {
void annotateTopaz(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize){ void annotateTopaz(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize){
switch(cmd[0]) { switch(cmd[0]) {
case TOPAZ_REQA :snprintf(exp, size, "REQA");break; case TOPAZ_REQA: snprintf(exp, size, "REQA");break;
case TOPAZ_WUPA :snprintf(exp, size, "WUPA");break; case TOPAZ_WUPA: snprintf(exp, size, "WUPA");break;
case TOPAZ_RID :snprintf(exp, size, "RID");break; case TOPAZ_RID: snprintf(exp, size, "RID");break;
case TOPAZ_RALL :snprintf(exp, size, "RALL");break; case TOPAZ_RALL: snprintf(exp, size, "RALL");break;
case TOPAZ_READ :snprintf(exp, size, "READ");break; case TOPAZ_READ: snprintf(exp, size, "READ");break;
case TOPAZ_WRITE_E :snprintf(exp, size, "WRITE-E");break; case TOPAZ_WRITE_E: snprintf(exp, size, "WRITE-E");break;
case TOPAZ_WRITE_NE :snprintf(exp, size, "WRITE-NE");break; case TOPAZ_WRITE_NE: snprintf(exp, size, "WRITE-NE");break;
case TOPAZ_RSEG :snprintf(exp, size, "RSEG");break; case TOPAZ_RSEG: snprintf(exp, size, "RSEG");break;
case TOPAZ_READ8 :snprintf(exp, size, "READ8");break; case TOPAZ_READ8: snprintf(exp, size, "READ8");break;
case TOPAZ_WRITE_E8 :snprintf(exp, size, "WRITE-E8");break; case TOPAZ_WRITE_E8: snprintf(exp, size, "WRITE-E8");break;
case TOPAZ_WRITE_NE8 :snprintf(exp, size, "WRITE-NE8");break; case TOPAZ_WRITE_NE8: snprintf(exp, size, "WRITE-NE8");break;
default :snprintf(exp,size,"?"); break; default: snprintf(exp,size,"?"); break;
} }
} }
@ -341,24 +341,24 @@ void annotateIso7816(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize){
break; break;
} }
switch ( cmd[pos] ){ switch ( cmd[pos] ){
case ISO7816_READ_BINARY :snprintf(exp, size, "READ BIN");break; case ISO7816_READ_BINARY: snprintf(exp, size, "READ BIN");break;
case ISO7816_WRITE_BINARY :snprintf(exp, size, "WRITE BIN");break; case ISO7816_WRITE_BINARY: snprintf(exp, size, "WRITE BIN");break;
case ISO7816_UPDATE_BINARY :snprintf(exp, size, "UPDATE BIN");break; case ISO7816_UPDATE_BINARY: snprintf(exp, size, "UPDATE BIN");break;
case ISO7816_ERASE_BINARY :snprintf(exp, size, "ERASE BIN");break; case ISO7816_ERASE_BINARY: snprintf(exp, size, "ERASE BIN");break;
case ISO7816_READ_RECORDS :snprintf(exp, size, "READ RECORDS");break; case ISO7816_READ_RECORDS: snprintf(exp, size, "READ RECORDS");break;
case ISO7816_WRITE_RECORDS :snprintf(exp, size, "WRITE RECORDS");break; case ISO7816_WRITE_RECORDS: snprintf(exp, size, "WRITE RECORDS");break;
case ISO7816_APPEND_RECORD :snprintf(exp, size, "APPEND RECORD");break; case ISO7816_APPEND_RECORD: snprintf(exp, size, "APPEND RECORD");break;
case ISO7816_UPDATE_RECORD :snprintf(exp, size, "UPDATE RECORD");break; case ISO7816_UPDATE_RECORD: snprintf(exp, size, "UPDATE RECORD");break;
case ISO7816_GET_DATA :snprintf(exp, size, "GET DATA");break; case ISO7816_GET_DATA: snprintf(exp, size, "GET DATA");break;
case ISO7816_PUT_DATA :snprintf(exp, size, "PUT DATA");break; case ISO7816_PUT_DATA: snprintf(exp, size, "PUT DATA");break;
case ISO7816_SELECT_FILE :snprintf(exp, size, "SELECT FILE");break; case ISO7816_SELECT_FILE: snprintf(exp, size, "SELECT FILE");break;
case ISO7816_VERIFY :snprintf(exp, size, "VERIFY");break; case ISO7816_VERIFY: snprintf(exp, size, "VERIFY");break;
case ISO7816_INTERNAL_AUTHENTICATION :snprintf(exp, size, "INTERNAL AUTH");break; case ISO7816_INTERNAL_AUTHENTICATION: snprintf(exp, size, "INTERNAL AUTH");break;
case ISO7816_EXTERNAL_AUTHENTICATION :snprintf(exp, size, "EXTERNAL AUTH");break; case ISO7816_EXTERNAL_AUTHENTICATION: snprintf(exp, size, "EXTERNAL AUTH");break;
case ISO7816_GET_CHALLENGE :snprintf(exp, size, "GET CHALLENGE");break; case ISO7816_GET_CHALLENGE: snprintf(exp, size, "GET CHALLENGE");break;
case ISO7816_MANAGE_CHANNEL :snprintf(exp, size, "MANAGE CHANNEL");break; case ISO7816_MANAGE_CHANNEL: snprintf(exp, size, "MANAGE CHANNEL");break;
case ISO7816_GET_RESPONSE :snprintf(exp, size, "GET RESPONSE");break; case ISO7816_GET_RESPONSE: snprintf(exp, size, "GET RESPONSE");break;
default :snprintf(exp,size,"?"); break; default: snprintf(exp,size,"?"); break;
} }
} }
} }
@ -371,9 +371,9 @@ void annotateMfDesfire(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize){
// S-block 11xxx010 // S-block 11xxx010
if ( (cmd[0] & 0xC0) && (cmdsize == 3) ) { if ( (cmd[0] & 0xC0) && (cmdsize == 3) ) {
switch ( (cmd[0] & 0x30) ) { switch ( (cmd[0] & 0x30) ) {
case 0x30 : snprintf(exp, size, "S-block DESELECT"); break; case 0x30: snprintf(exp, size, "S-block DESELECT"); break;
case 0x00 : snprintf(exp, size, "S-block WTX"); break; case 0x00: snprintf(exp, size, "S-block WTX"); break;
default : snprintf(exp, size, "S-block"); break; default: snprintf(exp, size, "S-block"); break;
} }
} }
// R-block (ack) 101xx01x // R-block (ack) 101xx01x
@ -392,43 +392,43 @@ void annotateMfDesfire(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize){
if ( (cmd[0] & 0x04) == 0x04) // nad byte following if ( (cmd[0] & 0x04) == 0x04) // nad byte following
pos = pos + 1; pos = pos + 1;
switch ( cmd[pos] ){ switch ( cmd[pos] ){
case MFDES_CREATE_APPLICATION :snprintf(exp, size, "CREATE APPLICATION");break; case MFDES_CREATE_APPLICATION: snprintf(exp, size, "CREATE APPLICATION");break;
case MFDES_DELETE_APPLICATION :snprintf(exp, size, "DELETE APPLICATION");break; case MFDES_DELETE_APPLICATION: snprintf(exp, size, "DELETE APPLICATION");break;
case MFDES_GET_APPLICATION_IDS :snprintf(exp, size, "GET APPLICATION IDS");break; case MFDES_GET_APPLICATION_IDS: snprintf(exp, size, "GET APPLICATION IDS");break;
case MFDES_SELECT_APPLICATION :snprintf(exp, size, "SELECT APPLICATION");break; case MFDES_SELECT_APPLICATION: snprintf(exp, size, "SELECT APPLICATION");break;
case MFDES_FORMAT_PICC :snprintf(exp, size, "FORMAT PICC");break; case MFDES_FORMAT_PICC: snprintf(exp, size, "FORMAT PICC");break;
case MFDES_GET_VERSION :snprintf(exp, size, "GET VERSION");break; case MFDES_GET_VERSION: snprintf(exp, size, "GET VERSION");break;
case MFDES_READ_DATA :snprintf(exp, size, "READ DATA");break; case MFDES_READ_DATA: snprintf(exp, size, "READ DATA");break;
case MFDES_WRITE_DATA :snprintf(exp, size, "WRITE DATA");break; case MFDES_WRITE_DATA: snprintf(exp, size, "WRITE DATA");break;
case MFDES_GET_VALUE :snprintf(exp, size, "GET VALUE");break; case MFDES_GET_VALUE: snprintf(exp, size, "GET VALUE");break;
case MFDES_CREDIT :snprintf(exp, size, "CREDIT");break; case MFDES_CREDIT: snprintf(exp, size, "CREDIT");break;
case MFDES_DEBIT :snprintf(exp, size, "DEBIT");break; case MFDES_DEBIT: snprintf(exp, size, "DEBIT");break;
case MFDES_LIMITED_CREDIT :snprintf(exp, size, "LIMITED CREDIT");break; case MFDES_LIMITED_CREDIT: snprintf(exp, size, "LIMITED CREDIT");break;
case MFDES_WRITE_RECORD :snprintf(exp, size, "WRITE RECORD");break; case MFDES_WRITE_RECORD: snprintf(exp, size, "WRITE RECORD");break;
case MFDES_READ_RECORDS :snprintf(exp, size, "READ RECORDS");break; case MFDES_READ_RECORDS: snprintf(exp, size, "READ RECORDS");break;
case MFDES_CLEAR_RECORD_FILE :snprintf(exp, size, "CLEAR RECORD FILE");break; case MFDES_CLEAR_RECORD_FILE: snprintf(exp, size, "CLEAR RECORD FILE");break;
case MFDES_COMMIT_TRANSACTION :snprintf(exp, size, "COMMIT TRANSACTION");break; case MFDES_COMMIT_TRANSACTION: snprintf(exp, size, "COMMIT TRANSACTION");break;
case MFDES_ABORT_TRANSACTION :snprintf(exp, size, "ABORT TRANSACTION");break; case MFDES_ABORT_TRANSACTION: snprintf(exp, size, "ABORT TRANSACTION");break;
case MFDES_GET_FREE_MEMORY :snprintf(exp, size, "GET FREE MEMORY");break; case MFDES_GET_FREE_MEMORY: snprintf(exp, size, "GET FREE MEMORY");break;
case MFDES_GET_FILE_IDS :snprintf(exp, size, "GET FILE IDS");break; case MFDES_GET_FILE_IDS: snprintf(exp, size, "GET FILE IDS");break;
case MFDES_GET_ISOFILE_IDS :snprintf(exp, size, "GET ISOFILE IDS");break; case MFDES_GET_ISOFILE_IDS: snprintf(exp, size, "GET ISOFILE IDS");break;
case MFDES_GET_FILE_SETTINGS :snprintf(exp, size, "GET FILE SETTINGS");break; case MFDES_GET_FILE_SETTINGS: snprintf(exp, size, "GET FILE SETTINGS");break;
case MFDES_CHANGE_FILE_SETTINGS :snprintf(exp, size, "CHANGE FILE SETTINGS");break; case MFDES_CHANGE_FILE_SETTINGS: snprintf(exp, size, "CHANGE FILE SETTINGS");break;
case MFDES_CREATE_STD_DATA_FILE :snprintf(exp, size, "CREATE STD DATA FILE");break; case MFDES_CREATE_STD_DATA_FILE: snprintf(exp, size, "CREATE STD DATA FILE");break;
case MFDES_CREATE_BACKUP_DATA_FILE :snprintf(exp, size, "CREATE BACKUP DATA FILE");break; case MFDES_CREATE_BACKUP_DATA_FILE: snprintf(exp, size, "CREATE BACKUP DATA FILE");break;
case MFDES_CREATE_VALUE_FILE :snprintf(exp, size, "CREATE VALUE FILE");break; case MFDES_CREATE_VALUE_FILE: snprintf(exp, size, "CREATE VALUE FILE");break;
case MFDES_CREATE_LINEAR_RECORD_FILE :snprintf(exp, size, "CREATE LINEAR RECORD FILE");break; case MFDES_CREATE_LINEAR_RECORD_FILE: snprintf(exp, size, "CREATE LINEAR RECORD FILE");break;
case MFDES_CREATE_CYCLIC_RECORD_FILE :snprintf(exp, size, "CREATE CYCLIC RECORD FILE");break; case MFDES_CREATE_CYCLIC_RECORD_FILE: snprintf(exp, size, "CREATE CYCLIC RECORD FILE");break;
case MFDES_DELETE_FILE :snprintf(exp, size, "DELETE FILE");break; case MFDES_DELETE_FILE: snprintf(exp, size, "DELETE FILE");break;
case MFDES_AUTHENTICATE :snprintf(exp, size, "AUTH NATIVE (keyNo %d)", cmd[pos+1]);break; // AUTHENTICATE_NATIVE case MFDES_AUTHENTICATE: snprintf(exp, size, "AUTH NATIVE (keyNo %d)", cmd[pos+1]);break; // AUTHENTICATE_NATIVE
case MFDES_AUTHENTICATE_ISO :snprintf(exp, size, "AUTH ISO (keyNo %d)", cmd[pos+1]);break; // AUTHENTICATE_STANDARD case MFDES_AUTHENTICATE_ISO: snprintf(exp, size, "AUTH ISO (keyNo %d)", cmd[pos+1]);break; // AUTHENTICATE_STANDARD
case MFDES_AUTHENTICATE_AES :snprintf(exp, size, "AUTH AES (keyNo %d)", cmd[pos+1]);break; case MFDES_AUTHENTICATE_AES: snprintf(exp, size, "AUTH AES (keyNo %d)", cmd[pos+1]);break;
case MFDES_CHANGE_KEY_SETTINGS :snprintf(exp, size, "CHANGE KEY SETTINGS");break; case MFDES_CHANGE_KEY_SETTINGS: snprintf(exp, size, "CHANGE KEY SETTINGS");break;
case MFDES_GET_KEY_SETTINGS :snprintf(exp, size, "GET KEY SETTINGS");break; case MFDES_GET_KEY_SETTINGS: snprintf(exp, size, "GET KEY SETTINGS");break;
case MFDES_CHANGE_KEY :snprintf(exp, size, "CHANGE KEY");break; case MFDES_CHANGE_KEY: snprintf(exp, size, "CHANGE KEY");break;
case MFDES_GET_KEY_VERSION :snprintf(exp, size, "GET KEY VERSION");break; case MFDES_GET_KEY_VERSION: snprintf(exp, size, "GET KEY VERSION");break;
case MFDES_AUTHENTICATION_FRAME :snprintf(exp, size, "AUTH FRAME / NEXT FRAME");break; case MFDES_AUTHENTICATION_FRAME: snprintf(exp, size, "AUTH FRAME / NEXT FRAME");break;
default :break; default: break;
} }
}else{ }else{
// anything else // anything else
@ -464,19 +464,19 @@ void annotateIso14443b(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize) {
snprintf(exp, size,"REQB"); snprintf(exp, size,"REQB");
break; break;
} }
case ISO14443B_ATTRIB : snprintf(exp,size,"ATTRIB");break; case ISO14443B_ATTRIB: snprintf(exp,size,"ATTRIB");break;
case ISO14443B_HALT : snprintf(exp,size,"HALT");break; case ISO14443B_HALT: snprintf(exp,size,"HALT");break;
case ISO14443B_INITIATE : snprintf(exp,size,"INITIATE");break; case ISO14443B_INITIATE: snprintf(exp,size,"INITIATE");break;
case ISO14443B_SELECT : snprintf(exp,size,"SELECT(%d)",cmd[1]);break; case ISO14443B_SELECT: snprintf(exp,size,"SELECT(%d)",cmd[1]);break;
case ISO14443B_GET_UID : snprintf(exp,size,"GET UID");break; case ISO14443B_GET_UID: snprintf(exp,size,"GET UID");break;
case ISO14443B_READ_BLK : snprintf(exp,size,"READ_BLK(%d)", cmd[1]);break; case ISO14443B_READ_BLK: snprintf(exp,size,"READ_BLK(%d)", cmd[1]);break;
case ISO14443B_WRITE_BLK : snprintf(exp,size,"WRITE_BLK(%d)",cmd[1]);break; case ISO14443B_WRITE_BLK: snprintf(exp,size,"WRITE_BLK(%d)",cmd[1]);break;
case ISO14443B_RESET : snprintf(exp,size,"RESET");break; case ISO14443B_RESET: snprintf(exp,size,"RESET");break;
case ISO14443B_COMPLETION : snprintf(exp,size,"COMPLETION");break; case ISO14443B_COMPLETION: snprintf(exp,size,"COMPLETION");break;
case ISO14443B_AUTHENTICATE : snprintf(exp,size,"AUTHENTICATE");break; case ISO14443B_AUTHENTICATE: snprintf(exp,size,"AUTHENTICATE");break;
case ISO14443B_PING : snprintf(exp,size,"PING");break; case ISO14443B_PING: snprintf(exp,size,"PING");break;
case ISO14443B_PONG : snprintf(exp,size,"PONG");break; case ISO14443B_PONG: snprintf(exp,size,"PONG");break;
default : snprintf(exp,size ,"?");break; default: snprintf(exp,size ,"?");break;
} }
} }

View file

@ -57,14 +57,14 @@ uint32_t UL_TYPES_ARRAY[MAX_UL_TYPES] = {
NTAG_203, NTAG_210, NTAG_212, NTAG_213, NTAG_215, NTAG_216, NTAG_203, NTAG_210, NTAG_212, NTAG_213, NTAG_215, NTAG_216,
MY_D, MY_D_NFC, MY_D_MOVE, MY_D_MOVE_NFC, MY_D_MOVE_LEAN, FUDAN_UL, MY_D, MY_D_NFC, MY_D_MOVE, MY_D_MOVE_NFC, MY_D_MOVE_LEAN, FUDAN_UL,
UL_EV1, NTAG_213_F, NTAG_216_F, UL_NANO_40 UL_EV1, NTAG_213_F, NTAG_216_F, UL_NANO_40
}; };
uint8_t UL_MEMORY_ARRAY[MAX_UL_TYPES] = { uint8_t UL_MEMORY_ARRAY[MAX_UL_TYPES] = {
MAX_UL_BLOCKS, MAX_UL_BLOCKS, MAX_ULC_BLOCKS, MAX_ULEV1a_BLOCKS, MAX_ULEV1b_BLOCKS, MAX_NTAG_203, MAX_UL_BLOCKS, MAX_UL_BLOCKS, MAX_ULC_BLOCKS, MAX_ULEV1a_BLOCKS, MAX_ULEV1b_BLOCKS, MAX_NTAG_203,
MAX_NTAG_203, MAX_NTAG_210, MAX_NTAG_212, MAX_NTAG_213, MAX_NTAG_215, MAX_NTAG_216, MAX_NTAG_203, MAX_NTAG_210, MAX_NTAG_212, MAX_NTAG_213, MAX_NTAG_215, MAX_NTAG_216,
MAX_UL_BLOCKS, MAX_MY_D_NFC, MAX_MY_D_MOVE, MAX_MY_D_MOVE, MAX_MY_D_MOVE_LEAN, MAX_UL_BLOCKS, MAX_UL_BLOCKS, MAX_MY_D_NFC, MAX_MY_D_MOVE, MAX_MY_D_MOVE, MAX_MY_D_MOVE_LEAN, MAX_UL_BLOCKS,
MAX_ULEV1a_BLOCKS, MAX_NTAG_213, MAX_NTAG_216, MAX_UL_NANO_40 MAX_ULEV1a_BLOCKS, MAX_NTAG_213, MAX_NTAG_216, MAX_UL_NANO_40
}; };
//------------------------------------ //------------------------------------
// Pwd & Pack generation Stuff // Pwd & Pack generation Stuff

View file

@ -46,8 +46,8 @@
#include "cmdlfguard.h" // for gproxii menu #include "cmdlfguard.h" // for gproxii menu
#include "cmdlffdx.h" // for fdx-b menu #include "cmdlffdx.h" // for fdx-b menu
#include "cmdlfparadox.h" // for paradox menu #include "cmdlfparadox.h" // for paradox menu
#include "cmdlfnexwatch.h" //for nexwatch menu #include "cmdlfnexwatch.h" // for nexwatch menu
#include "cmdlfsecurakey.h" //for securakey menu #include "cmdlfsecurakey.h" // for securakey menu
#include "cmdlfpac.h" // for pac menu #include "cmdlfpac.h" // for pac menu
#include "cmdlfkeri.h" // for keri menu #include "cmdlfkeri.h" // for keri menu

View file

@ -187,7 +187,7 @@ static command_t CommandTable[] = {
{"help", CmdHelp, 1, "This help"}, {"help", CmdHelp, 1, "This help"},
{"demod", CmdParadoxDemod, 1, "Demodulate a Paradox FSK tag from the GraphBuffer"}, {"demod", CmdParadoxDemod, 1, "Demodulate a Paradox FSK tag from the GraphBuffer"},
{"read", CmdParadoxRead, 0, "Attempt to read and Extract tag data from the antenna"}, {"read", CmdParadoxRead, 0, "Attempt to read and Extract tag data from the antenna"},
// {"clone", CmdParadoxClone,0, "clone paradox tag"}, // {"clone", CmdParadoxClone, 0, "clone paradox tag"},
{"sim", CmdParadoxSim, 0, "simulate paradox tag"}, {"sim", CmdParadoxSim, 0, "simulate paradox tag"},
{NULL, NULL, 0, NULL} {NULL, NULL, 0, NULL}
}; };

View file

@ -395,7 +395,7 @@ int CmdT55xxReadBlock(const char *Cmd) {
} }
if (errors) return usage_t55xx_read(); if (errors) return usage_t55xx_read();
if (block > 7 && block != REGULAR_READ_MODE_BLOCK ) { if (block > 7 && block != REGULAR_READ_MODE_BLOCK) {
PrintAndLogEx(NORMAL, "Block must be between 0 and 7"); PrintAndLogEx(NORMAL, "Block must be between 0 and 7");
return 0; return 0;
} }
@ -2018,12 +2018,12 @@ int CmdT55xxSetDeviceConfig(const char *Cmd){
static command_t CommandTable[] = { static command_t CommandTable[] = {
{"help", CmdHelp, 1, "This help"}, {"help", CmdHelp, 1, "This help"},
{"bruteforce", CmdT55xxBruteForce,0, "<start password> <end password> [i <*.dic>] Simple bruteforce attack to find password"}, {"bruteforce", CmdT55xxBruteForce, 0, "<start password> <end password> [i <*.dic>] Simple bruteforce attack to find password"},
{"config", CmdT55xxSetConfig, 1, "Set/Get T55XX configuration (modulation, inverted, offset, rate)"}, {"config", CmdT55xxSetConfig, 1, "Set/Get T55XX configuration (modulation, inverted, offset, rate)"},
{"chk", CmdT55xxChkPwds, 1, "Check passwords"}, {"chk", CmdT55xxChkPwds, 1, "Check passwords"},
{"detect", CmdT55xxDetect, 1, "[1] Try detecting the tag modulation from reading the configuration block."}, {"detect", CmdT55xxDetect, 1, "[1] Try detecting the tag modulation from reading the configuration block."},
{"deviceconfig", CmdT55xxSetDeviceConfig, 1, "Set/Get T55XX device configuration (startgap, writegap, write0, write1, readgap"}, {"deviceconfig",CmdT55xxSetDeviceConfig, 1, "Set/Get T55XX device configuration (startgap, writegap, write0, write1, readgap"},
{"p1detect", CmdT55xxDetectPage1,1, "[1] Try detecting if this is a t55xx tag by reading page 1"}, {"p1detect", CmdT55xxDetectPage1, 1, "[1] Try detecting if this is a t55xx tag by reading page 1"},
{"dump", CmdT55xxDump, 0, "[password] [o] Dump T55xx card block 0-7. Optional [password], [override]"}, {"dump", CmdT55xxDump, 0, "[password] [o] Dump T55xx card block 0-7. Optional [password], [override]"},
{"info", CmdT55xxInfo, 1, "[1] Show T55x7 configuration data (page 0/ blk 0)"}, {"info", CmdT55xxInfo, 1, "[1] Show T55x7 configuration data (page 0/ blk 0)"},
{"read", CmdT55xxReadBlock, 0, "b <block> p [password] [o] [1] -- Read T55xx block data. Optional [p password], [override], [page1]"}, {"read", CmdT55xxReadBlock, 0, "b <block> p [password] [o] [1] -- Read T55xx block data. Optional [p password], [override], [page1]"},
@ -2033,7 +2033,7 @@ static command_t CommandTable[] = {
{"trace", CmdT55xxReadTrace, 1, "[1] Show T55x7 traceability data (page 1/ blk 0-1)"}, {"trace", CmdT55xxReadTrace, 1, "[1] Show T55x7 traceability data (page 1/ blk 0-1)"},
{"wakeup", CmdT55xxWakeUp, 0, "Send AOR wakeup command"}, {"wakeup", CmdT55xxWakeUp, 0, "Send AOR wakeup command"},
{"wipe", CmdT55xxWipe, 0, "[q] Wipe a T55xx tag and set defaults (will destroy any data on tag)"}, {"wipe", CmdT55xxWipe, 0, "[q] Wipe a T55xx tag and set defaults (will destroy any data on tag)"},
{"write", CmdT55xxWriteBlock,0, "b <block> d <data> p [password] [1] -- Write T55xx block data. Optional [p password], [page1]"}, {"write", CmdT55xxWriteBlock, 0, "b <block> d <data> p [password] [1] -- Write T55xx block data. Optional [p password], [page1]"},
{NULL, NULL, 0, NULL} {NULL, NULL, 0, NULL}
}; };

View file

@ -40,7 +40,7 @@
// FDXB requires data inversion and BiPhase 57 is simply BiPhase 50 inverted, so we can either do it using the modulation scheme or the inversion flag // FDXB requires data inversion and BiPhase 57 is simply BiPhase 50 inverted, so we can either do it using the modulation scheme or the inversion flag
// we've done both below to prove that it works either way, and the modulation value for BiPhase 50 in the Atmel data sheet of binary "10001" (17) is a typo, // we've done both below to prove that it works either way, and the modulation value for BiPhase 50 in the Atmel data sheet of binary "10001" (17) is a typo,
// and it should actually be "10000" (16) // and it should actually be "10000" (16)
// #define T55X7_FDXB_CONFIG_BLOCK 903F8080 // emulate fdx-b - xtended mode, BiPhase ('57), data rate 32, 4 data blocks // #define T55X7_FDXB_CONFIG_BLOCK 0x903F8080 // emulate fdx-b - xtended mode, BiPhase ('57), data rate 32, 4 data blocks
#define T55X7_FDXB_CONFIG_BLOCK 0x903F0082 // emulate fdx-b - xtended mode, BiPhase ('50), invert data, data rate 32, 4 data blocks #define T55X7_FDXB_CONFIG_BLOCK 0x903F0082 // emulate fdx-b - xtended mode, BiPhase ('50), invert data, data rate 32, 4 data blocks
#define T55X7_HID_26_CONFIG_BLOCK 0x00107060 // hid 26 bit - compat mode, FSK2a, data rate 50, 3 data blocks #define T55X7_HID_26_CONFIG_BLOCK 0x00107060 // hid 26 bit - compat mode, FSK2a, data rate 50, 3 data blocks
#define T55X7_PYRAMID_CONFIG_BLOCK 0x00107080 // Pyramid 26 bit - compat mode, FSK2a, data rate 50, 4 data blocks #define T55X7_PYRAMID_CONFIG_BLOCK 0x00107080 // Pyramid 26 bit - compat mode, FSK2a, data rate 50, 4 data blocks

View file

@ -1121,7 +1121,7 @@ static command_t CommandTable[] = {
{"reader", CmdSmartReader, 1, "Act like an IS07816 reader"}, {"reader", CmdSmartReader, 1, "Act like an IS07816 reader"},
{"raw", CmdSmartRaw, 1, "Send raw hex data to tag"}, {"raw", CmdSmartRaw, 1, "Send raw hex data to tag"},
{"upgrade", CmdSmartUpgrade, 1, "Upgrade firmware"}, {"upgrade", CmdSmartUpgrade, 1, "Upgrade firmware"},
{"setclock", CmdSmartSetClock, 1, "Set clock speed"}, {"setclock",CmdSmartSetClock, 1, "Set clock speed"},
{"brute", CmdSmartBruteforceSFI, 1, "Bruteforce SFI"}, {"brute", CmdSmartBruteforceSFI, 1, "Bruteforce SFI"},
{NULL, NULL, 0, NULL} {NULL, NULL, 0, NULL}
}; };