]> cvs.zerfleddert.de Git - proxmark3-svn/commitdiff
ADD: Started to add a Presco LF clone functionality. Can calc Wiegand from printed...
authoriceman1001 <iceman@iuse.se>
Sat, 13 Feb 2016 19:53:06 +0000 (20:53 +0100)
committericeman1001 <iceman@iuse.se>
Sat, 13 Feb 2016 19:53:06 +0000 (20:53 +0100)
client/Makefile
client/cmdlf.c
client/cmdlfpresco.c [new file with mode: 0644]
client/cmdlfpresco.h [new file with mode: 0644]
client/cmdlft55xx.h

index e2533de333daeb33f428adf650d2bb61f7b9c8cc..5e15e6fb8feed64d2c8be04a8b67799e147756fd 100644 (file)
@@ -143,7 +143,8 @@ CMDSRCS =   nonce2key/crapto1.c\
                        tea.c\
                        prng.c\
                        radixsort.c\
                        tea.c\
                        prng.c\
                        radixsort.c\
-                       bucketsort.c
+                       bucketsort.c\
+                       cmdlfpresco.c
 
 ZLIBSRCS = deflate.c adler32.c trees.c zutil.c inflate.c inffast.c inftrees.c
 ZLIB_FLAGS = -DZ_SOLO -DZ_PREFIX -DNO_GZIP -DZLIB_PM3_TUNED 
 
 ZLIBSRCS = deflate.c adler32.c trees.c zutil.c inflate.c inffast.c inftrees.c
 ZLIB_FLAGS = -DZ_SOLO -DZ_PREFIX -DNO_GZIP -DZLIB_PM3_TUNED 
index 20c13958e3b62dde2c780e4bbac04fc5068ecd8c..924e0fea5d3682b4982f5e03f20d6b22b5f3af3f 100644 (file)
@@ -31,6 +31,7 @@
 #include "cmdlfio.h"
 #include "lfdemod.h"
 #include "cmdlfviking.h"
 #include "cmdlfio.h"
 #include "lfdemod.h"
 #include "cmdlfviking.h"
+#include "cmdlfpresco.h"
 static int CmdHelp(const char *Cmd);
 
 int usage_lf_cmdread(void) {
 static int CmdHelp(const char *Cmd);
 
 int usage_lf_cmdread(void) {
@@ -1212,13 +1213,13 @@ static command_t CommandTable[] =
        {"em4x",        CmdLFEM4X,          1, "{ EM4X RFIDs... }"},
        {"hid",         CmdLFHID,           1, "{ HID RFIDs... }"},
        {"hitag",       CmdLFHitag,         1, "{ HITAG RFIDs... }"},
        {"em4x",        CmdLFEM4X,          1, "{ EM4X RFIDs... }"},
        {"hid",         CmdLFHID,           1, "{ HID RFIDs... }"},
        {"hitag",       CmdLFHitag,         1, "{ HITAG RFIDs... }"},
-       {"io",            CmdLFIO,                1, "{ IOPROX RFIDs... }"},
+       {"io",                  CmdLFIO,                        1, "{ IOPROX RFIDs... }"},
        {"pcf7931",     CmdLFPCF7931,       1, "{ PCF7931 RFIDs... }"},
        {"pcf7931",     CmdLFPCF7931,       1, "{ PCF7931 RFIDs... }"},
+       {"presco",      CmdLFPresco,        1, "{ Presco RFIDs... }"},
        {"ti",          CmdLFTI,            1, "{ TI RFIDs... }"},
        {"t55xx",       CmdLFT55XX,         1, "{ T55X7 RFIDs... }"},
        {"viking",      CmdLFViking,        1, "{ Viking RFIDs... }"},
        {"config",      CmdLFSetConfig,     0, "Set config for LF sampling, bit/sample, decimation, frequency"},
        {"ti",          CmdLFTI,            1, "{ TI RFIDs... }"},
        {"t55xx",       CmdLFT55XX,         1, "{ T55X7 RFIDs... }"},
        {"viking",      CmdLFViking,        1, "{ Viking RFIDs... }"},
        {"config",      CmdLFSetConfig,     0, "Set config for LF sampling, bit/sample, decimation, frequency"},
-
        {"cmdread",     CmdLFCommandRead,   0, "<off period> <'0' period> <'1' period> <command> ['h' 134] \n\t\t-- Modulate LF reader field to send command before read (all periods in microseconds)"},
        {"flexdemod",   CmdFlexdemod,       1, "Demodulate samples for FlexPass"},
        {"indalademod", CmdIndalaDemod,     1, "['224'] -- Demodulate samples for Indala 64 bit UID (option '224' for 224 bit)"},
        {"cmdread",     CmdLFCommandRead,   0, "<off period> <'0' period> <'1' period> <command> ['h' 134] \n\t\t-- Modulate LF reader field to send command before read (all periods in microseconds)"},
        {"flexdemod",   CmdFlexdemod,       1, "Demodulate samples for FlexPass"},
        {"indalademod", CmdIndalaDemod,     1, "['224'] -- Demodulate samples for Indala 64 bit UID (option '224' for 224 bit)"},
diff --git a/client/cmdlfpresco.c b/client/cmdlfpresco.c
new file mode 100644 (file)
index 0000000..4986071
--- /dev/null
@@ -0,0 +1,197 @@
+//-----------------------------------------------------------------------------
+//
+// This code is licensed to you under the terms of the GNU GPL, version 2 or,
+// at your option, any later version. See the LICENSE.txt file for the text of
+// the license.
+//-----------------------------------------------------------------------------
+// Low frequency Presco tag commands
+//-----------------------------------------------------------------------------
+#include <string.h>
+#include <inttypes.h>
+#include "cmdlfpresco.h"
+static int CmdHelp(const char *Cmd);
+
+int usage_lf_presco_clone(void){
+       PrintAndLog("clone a Presco tag to a T55x7 tag.");
+       PrintAndLog("Usage: lf presco clone <Card ID - 9 digits> <Q5>");
+       PrintAndLog("Options :");
+       PrintAndLog("  <Card Number>  : 9 digit presco card number");
+       //PrintAndLog("  <Q5>           : specify write to Q5 (t5555 instead of t55x7)");
+       PrintAndLog("");
+       PrintAndLog("Sample  : lf presco clone 123456789");
+       return 0;
+}
+
+int usage_lf_presco_sim(void) {
+       PrintAndLog("Enables simulation of presco card with specified card number.");
+       PrintAndLog("Simulation runs until the button is pressed or another USB command is issued.");
+       PrintAndLog("Per presco format, the card number is 9 digit number and can contain *# chars. Larger values are truncated.");
+       PrintAndLog("");
+       PrintAndLog("Usage:  lf presco sim <Card-Number>");
+       PrintAndLog("Options :");
+       PrintAndLog("  <Card Number>   : 9 digit presco card number");
+       PrintAndLog("");
+       PrintAndLog("Sample  : lf presco sim 123456789");
+       return 0;
+}
+
+// calc checksum
+int GetWiegandFromPresco(const char *id, uint32_t *sitecode, uint32_t *usercode) {
+       
+       uint8_t val = 0;
+       for (int index =0; index < strlen(id); ++index) {
+               
+               // Get value from number string.
+               if ( id[index] == '*' ) val = 10;
+               if ( id[index] == '#')  val = 11;               
+               if ( id[index] >= 0x30 && id[index] <= 0x39 )
+                       val = id[index] - 0x30;
+               
+               *sitecode += val;
+               
+               // last digit is only added, not multipled.
+               if ( index < strlen(id)-1 ) 
+                       *sitecode *= 12;
+       }
+       *usercode = *sitecode % 65536;
+       *sitecode /= 16777216;
+       return 0;
+}
+
+int GetPrescoBits(uint32_t sitecode, uint32_t usercode, uint8_t        *prescoBits) {
+       uint8_t pre[66];
+       memset(pre, 0, sizeof(pre));
+       prescoBits[7]=1;
+       num_to_bytebits(26, 8, pre);
+
+       uint8_t wiegand[24];
+       num_to_bytebits(sitecode, 8, wiegand);
+       num_to_bytebits(usercode, 16, wiegand+8);
+
+       wiegand_add_parity(pre+8, wiegand, 24);
+       size_t bitLen = addParity(pre, prescoBits+8, 66, 4, 1);
+
+       if (bitLen != 88) return 0;
+       return 1;
+}
+
+//see ASKDemod for what args are accepted
+int CmdPrescoRead(const char *Cmd) {
+       PrintAndLog("Number: 123456789 --> Sitecode 30 | usercode 8665");
+//     GetWiegandFromPresco("123456789");
+
+       // read lf silently
+       //CmdLFRead("s");
+       // get samples silently
+       //getSamples("30000",false);
+       // demod and output viking ID   
+       //return CmdVikingDemod(Cmd);
+       return 0;
+}
+
+int CmdPrescoClone(const char *Cmd) {
+
+       char cmdp = param_getchar(Cmd, 0);
+       if (strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') return usage_lf_presco_clone();
+
+       uint32_t sitecode=0, usercode=0;
+       uint8_t bits[96];
+       uint8_t *bs = bits;
+       memset(bs,0,sizeof(bits));
+       uint32_t blocks[5] = {T55x7_MODULATION_MANCHESTER | T55x7_BITRATE_RF_32 | 4<<T55x7_MAXBLOCK_SHIFT | T55x7_ST_TERMINATOR, 0, 0, 0, 5};
+       
+       if (param_getchar(Cmd, 3) == 'Q' || param_getchar(Cmd, 3) == 'q')
+               blocks[0] = T5555_MODULATION_MANCHESTER | 32<<T5555_BITRATE_SHIFT | 4<<T5555_MAXBLOCK_SHIFT | T5555_ST_TERMINATOR;
+
+       // get wiegand from printed number.
+       GetWiegandFromPresco(Cmd, &sitecode, &usercode);
+       
+       if ((sitecode & 0xFF) != sitecode) {
+               sitecode &= 0xFF;
+               PrintAndLog("Facility-Code Truncated to 8-bits (Presco): %u", sitecode);
+       }
+
+       if ((usercode & 0xFFFF) != usercode) {
+               usercode &= 0xFFFF;
+               PrintAndLog("Card Number Truncated to 16-bits (Presco): %u", usercode);
+       }
+       
+       if ( !GetPrescoBits(sitecode, usercode, bs)) {
+               PrintAndLog("Error with tag bitstream generation.");
+               return 1;
+       }       
+
+       blocks[1] = bytebits_to_byte(bs,32);
+       blocks[2] = bytebits_to_byte(bs+32,32);
+       blocks[3] = bytebits_to_byte(bs+64,32);
+       blocks[4] = bytebits_to_byte(bs+96,32);
+
+       PrintAndLog("Preparing to clone Presco to T55x7 with SiteCode: %u, UserCode: %u", sitecode, usercode);
+       PrintAndLog("Blk | Data ");
+       PrintAndLog("----+------------");
+       PrintAndLog(" 00 | 0x%08x", blocks[0]);
+       PrintAndLog(" 01 | 0x%08x", blocks[1]);
+       PrintAndLog(" 02 | 0x%08x", blocks[2]);
+       PrintAndLog(" 03 | 0x%08x", blocks[3]); 
+       PrintAndLog(" 04 | 0x%08x", blocks[4]); 
+       
+       // UsbCommand resp;
+       // UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0,0,0}};
+
+       // for (uint8_t i=0; i<5; i++) {
+               // c.arg[0] = blocks[i];
+               // c.arg[1] = i;
+               // clearCommandBuffer();
+               // SendCommand(&c);
+               // if (!WaitForResponseTimeout(CMD_ACK, &resp, 1000)){
+                       // PrintAndLog("Error occurred, device did not respond during write operation.");
+                       // return -1;
+               // }
+       // }
+    return 0;
+}
+
+int CmdPrescoSim(const char *Cmd) {
+       // uint32_t id = 0;
+       // uint64_t rawID = 0;
+       // uint8_t clk = 32, encoding = 1, separator = 0, invert = 0;
+
+       // char cmdp = param_getchar(Cmd, 0);
+       // if (strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') return usage_lf_presco_sim();
+
+       // id = param_get32ex(Cmd, 0, 0, 16);
+       // if (id == 0) return usage_lf_presco_sim();
+
+       //rawID = getVikingBits(id);
+
+       // uint16_t arg1, arg2;
+       // size_t size = 64;
+       // arg1 = clk << 8 | encoding;
+       // arg2 = invert << 8 | separator;
+
+       // PrintAndLog("Simulating - ID: %08X, Raw: %08X%08X",id,(uint32_t)(rawID >> 32),(uint32_t) (rawID & 0xFFFFFFFF));
+       
+       // UsbCommand c = {CMD_ASK_SIM_TAG, {arg1, arg2, size}};
+       // num_to_bytebits(rawID, size, c.d.asBytes);
+       // clearCommandBuffer();
+       // SendCommand(&c);
+       return 0;
+}
+
+static command_t CommandTable[] = {
+    {"help",   CmdHelp,                1, "This help"},
+       {"read",        CmdPrescoRead,  0, "Attempt to read and Extract tag data"},
+       {"clone",       CmdPrescoClone, 0, "<8 digit ID number> clone presco tag"},
+//     {"sim",         CmdPrescoSim,   0, "<8 digit ID number> simulate presco tag"},
+    {NULL, NULL, 0, NULL}
+};
+
+int CmdLFPresco(const char *Cmd) {
+    CmdsParse(CommandTable, Cmd);
+    return 0;
+}
+
+int CmdHelp(const char *Cmd) {
+    CmdsHelp(CommandTable);
+    return 0;
+}
diff --git a/client/cmdlfpresco.h b/client/cmdlfpresco.h
new file mode 100644 (file)
index 0000000..f9cfbd9
--- /dev/null
@@ -0,0 +1,30 @@
+//-----------------------------------------------------------------------------
+//
+// This code is licensed to you under the terms of the GNU GPL, version 2 or,
+// at your option, any later version. See the LICENSE.txt file for the text of
+// the license.
+//-----------------------------------------------------------------------------
+// Low frequency T55xx commands
+//-----------------------------------------------------------------------------
+#ifndef CMDLFPRESCO_H__
+#define CMDLFPRESCO_H__
+#include "proxmark3.h"
+#include "ui.h"
+#include "util.h"
+#include "graph.h"
+#include "cmdparser.h"
+#include "cmddata.h"
+#include "cmdmain.h"
+#include "cmdlf.h"
+#include "protocols.h"  // for T55xx config register definitions
+#include "lfdemod.h"    // parityTest
+int CmdLFPresco(const char *Cmd);
+int CmdPrescoClone(const char *Cmd);
+//int CmdPrescoSim(const char *Cmd);
+
+int usage_lf_presco_clone(void);
+int usage_lf_presco_sim(void);
+
+int GetWiegandFromPresco(const char *id, uint32_t *sitecode, uint32_t *usercode);
+#endif
+
index 9df0cb550d8277fe7a3b775fcaae8eef8e8eefee..5f362cc1e99f0d0b9db2c5124f7cced972b8f0f2 100644 (file)
@@ -30,6 +30,7 @@
 #define T55X7_VIKING_CONFIG_BLOCK              0x00088040      // compat mode, data rate 32, Manchester, 2 data blocks\r
 #define T55X7_NORALYS_CONFIG_BLOCK             0x00088C6A      // compat mode,   (NORALYS - KCP3000)\r
 #define T55X7_IOPROX_CONFIG_BLOCK              0x00147040  // maxblock 2\r
 #define T55X7_VIKING_CONFIG_BLOCK              0x00088040      // compat mode, data rate 32, Manchester, 2 data blocks\r
 #define T55X7_NORALYS_CONFIG_BLOCK             0x00088C6A      // compat mode,   (NORALYS - KCP3000)\r
 #define T55X7_IOPROX_CONFIG_BLOCK              0x00147040  // maxblock 2\r
+#define T55X7_PRESCO_CONFIG_BLOCK              0x00088088  // data rate 32, Manchester, 5 data blocks, STT\r
 #define T55X7_bin 0b0010\r
 \r
 #define T5555_DEFAULT_CONFIG_BLOCK             0x6001F004  // data rate 64 , ask, manchester, 2 data blocks?\r
 #define T55X7_bin 0b0010\r
 \r
 #define T5555_DEFAULT_CONFIG_BLOCK             0x6001F004  // data rate 64 , ask, manchester, 2 data blocks?\r
Impressum, Datenschutz