]> cvs.zerfleddert.de Git - proxmark3-svn/commitdiff
ADD: started with a NEDAP demod, read, clone and sim functionality.
authoriceman1001 <iceman@iuse.se>
Mon, 2 May 2016 11:42:06 +0000 (13:42 +0200)
committericeman1001 <iceman@iuse.se>
Mon, 2 May 2016 11:42:06 +0000 (13:42 +0200)
The encrypted part is not solveabled today.

client/Makefile
client/cmdlf.c
client/cmdlf.h
client/cmdlfnedap.c [new file with mode: 0644]
client/cmdlfnedap.h [new file with mode: 0644]
common/lfdemod.c
common/lfdemod.h

index 4f90463fe74cdd07d2e34088112593a857dfab47..f79d76988e8dd6745ef6b176619c2095502e0042 100644 (file)
@@ -119,6 +119,7 @@ CMDSRCS =   nonce2key/crapto1.c \
                        cmdlfpresco.c \
                        cmdlfpyramid.c \
                        cmdlfguard.c \
+                       cmdlfnedap.c \
                        pm3_binlib.c \
                        scripting.c \
                        cmdscript.c \
index 23c8a1ce77dd9889cb157f384fc99ef8f9d547e6..09bd5a1ab8d786da64a093b3eb5672bb1d7cdfab 100644 (file)
@@ -1192,6 +1192,7 @@ static command_t CommandTable[] =
        {"hid",         CmdLFHID,           1, "{ HID RFIDs... }"},
        {"hitag",       CmdLFHitag,         1, "{ HITAG RFIDs... }"},
        {"io",                  CmdLFIO,                        1, "{ IOPROX RFIDs... }"},
+       {"nedap",               CmdLFNedap,                     1, "{ NEDAP RFIDs... }"},
        {"pcf7931",     CmdLFPCF7931,       1, "{ PCF7931 RFIDs... }"},
        {"presco",      CmdLFPresco,        1, "{ Presco RFIDs... }"},
        {"pyramid",             CmdLFPyramid,       1, "{ Farpointe/Pyramid RFIDs... }"},       
index 1bb9416214e32dc0e1019f1cd87a02c6c160d98b..d04f96793a9c4485173b73efa5b44163f5162108 100644 (file)
@@ -36,6 +36,7 @@
 #include "cmdlfpyramid.h"// for pyramid menu
 #include "cmdlfviking.h" // for viking menu
 #include "cmdlfguard.h"  // for GuardAll menu
+#include "cmdlfnedap.h"  // for NEDAP menu
 
 int CmdLF(const char *Cmd);
 
diff --git a/client/cmdlfnedap.c b/client/cmdlfnedap.c
new file mode 100644 (file)
index 0000000..bae9d85
--- /dev/null
@@ -0,0 +1,244 @@
+//-----------------------------------------------------------------------------
+//
+// 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 NEDAP tag commands
+//-----------------------------------------------------------------------------
+#include <string.h>
+#include <inttypes.h>
+#include "cmdlfnedap.h"
+static int CmdHelp(const char *Cmd);
+
+int usage_lf_nedap_clone(void){
+       PrintAndLog("clone a NEDAP tag to a T55x7 tag.");
+       PrintAndLog("");
+       PrintAndLog("Usage: lf nedap clone <Card-Number>");
+       PrintAndLog("Options :");
+       PrintAndLog("  <Card Number>   : 24-bit value card number");
+//     PrintAndLog("  Q5              : optional - clone to Q5 (T5555) instead of T55x7 chip");
+       PrintAndLog("");
+       PrintAndLog("Sample  : lf nedap clone 112233");
+       return 0;
+}
+
+int usage_lf_nedap_sim(void) {
+       PrintAndLog("Enables simulation of NEDAP card with specified card number.");
+       PrintAndLog("Simulation runs until the button is pressed or another USB command is issued.");
+       PrintAndLog("");
+       PrintAndLog("Usage:  lf nedap sim <Card-Number>");
+       PrintAndLog("Options :");
+       PrintAndLog("  <Card Number>   : 24-bit value card number");
+       PrintAndLog("");
+       PrintAndLog("Sample  : lf nedap sim 112233");
+       return 0;
+}
+
+int GetNedapBits(uint32_t cn, uint8_t *nedapBits) {
+
+       uint8_t pre[128];
+       memset(pre, 0x00, sizeof(pre));
+
+       // preamble  1111 1111 10 = 0XF8
+       num_to_bytebits(0xF8, 10, pre);
+
+       // fixed tagtype code?  0010 1101 = 0x2D
+       num_to_bytebits(0x2D, 8, pre+10);
+       
+       // 46 encrypted bits - UNKNOWN ALGO
+       //    -- 16 bits checksum. Should be 4x4 checksum,  based on UID and 2 constant values.
+       //    -- 30 bits undocumented?  
+       num_to_bytebits(cn, 46, pre+18);
+
+       //----from this part, the UID in clear text, with a 1bit ZERO as separator between bytes.
+       pre[64] = 0;
+
+       // cardnumber
+       num_to_bytebits(cn, 24, pre+64);
+
+       pre[73] = 0;
+       pre[82] = 0;
+       pre[91] = 0;
+       pre[100] = 0;
+       pre[109] = 0;
+       pre[118] = 0;
+       
+       // add paritybits       (bitsource, dest, sourcelen, paritylen, parityType (odd, even,)
+       addParity(pre+64, pre+64, 128, 8, 1);
+//1111111110001011010000010110100011001001000010110101001101011001000110011010010000000000100001110001001000000001000101011100111
+       return 1;
+}
+
+//NEDAP demod - ASK/Biphase,  RF/64 with preamble of 1111111110  (always a 128 bit data stream)
+//print NEDAP Prox ID, encoding, encrypted ID, 
+int CmdFSKdemodNedap(const char *Cmd) {
+       //raw ask demod no start bit finding just get binary from wave
+       uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0};
+       size_t size = getFromGraphBuf(BitStream);
+       if (size==0) return 0;
+
+       //get binary from fsk wave
+       int idx = NedapDemod(BitStream, &size);
+       if (idx < 0){
+               if (g_debugMode){
+                       if (idx == -5)
+                               PrintAndLog("DEBUG: Error - not enough samples");
+                       else if (idx == -1)
+                               PrintAndLog("DEBUG: Error - only noise found");
+                       else if (idx == -2)
+                               PrintAndLog("DEBUG: Error - problem during ASK/Biphase demod");
+                       else if (idx == -3)
+                               PrintAndLog("DEBUG: Error - Size not correct: %d", size);
+                       else if (idx == -4)
+                               PrintAndLog("DEBUG: Error - NEDAP preamble not found");
+                       else
+                               PrintAndLog("DEBUG: Error - idx: %d",idx);
+               }
+               return 0;
+       }
+
+/* Index map
+0        10        20          30            40          50        64
+|        |         |           |             |           |         |
+ preamble    enc tag type         encrypted uid                    d    33    d    90    p    04    d    71    d    40    d    45    d    E7    P
+1111111110 00101101000001011 0100011001001000010110101001101011001 0 00110011 0 10010000 0 00000100 0 01110001 0 01000000 0 01000101 0 11100111 1
+                                                                       uid2       uid1       uid0         I          I          R           R    
+        Tag ID is 049033 
+        I = Identical on all tags
+        R = Random ?
+        UID2, UID1, UID0 == card number
+*/
+
+       //get raw ID before removing parities
+       uint32_t rawLo = bytebits_to_byte(BitStream+idx+96,32);
+       uint32_t rawHi = bytebits_to_byte(BitStream+idx+64,32);
+       uint32_t rawHi2 = bytebits_to_byte(BitStream+idx+32,32);
+       uint32_t rawHi3 = bytebits_to_byte(BitStream+idx,32);
+       setDemodBuf(BitStream,128,idx);
+
+       // ok valid card found!
+       uint32_t cardnum = bytebits_to_byte(BitStream+81, 16);
+       PrintAndLog("NEDAP ID Found - Card: %d - Raw: %08x%08x%08x%08x", cardnum, rawHi3, rawHi2, rawHi, rawLo);
+       
+       if (g_debugMode){
+               PrintAndLog("DEBUG: idx: %d, Len: %d, Printing Demod Buffer:", idx, 128);
+               printDemodBuff();
+       }
+       return 1;
+}
+
+
+int CmdLFNedapRead(const char *Cmd) {
+       CmdLFRead("s");
+       getSamples("30000",false);
+       return CmdFSKdemodNedap("");
+}
+/*
+int CmdLFNedapClone(const char *Cmd) {
+
+       char cmdp = param_getchar(Cmd, 0);
+       if (strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') return usage_lf_nedap_clone();
+
+       uint32_t cardnumber=0, cn = 0;
+       uint32_t blocks[5];
+       uint8_t i;
+       uint8_t bs[128];
+       memset(bs, 0x00, sizeof(bs));
+
+       if (sscanf(Cmd, "%u", &cn ) != 1) return usage_lf_nedap_clone();
+
+       cardnumber = (cn & 0x00FFFFFF);
+       
+       if ( !GetNedapBits(cardnumber, bs)) {
+               PrintAndLog("Error with tag bitstream generation.");
+               return 1;
+       }       
+
+       ((ASK/biphase   data rawdemod ab 0 64 1 0
+       //NEDAP - compat mode, ASK/Biphase, data rate 64, 4 data blocks
+       blocks[0] = T55x7_MODULATION_BIPHASE | T55x7_BITRATE_RF_64 | 4<<T55x7_MAXBLOCK_SHIFT;
+
+       if (param_getchar(Cmd, 3) == 'Q' || param_getchar(Cmd, 3) == 'q')
+               blocks[0] = T5555_MODULATION_BIPHASE | T5555_INVERT_OUTPUT | 64<<T5555_BITRATE_SHIFT | 4<<T5555_MAXBLOCK_SHIFT;
+
+       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 NEDAP to T55x7 with card number: %u", cardnumber);
+       PrintAndLog("Blk | Data ");
+       PrintAndLog("----+------------");
+       for ( i = 0; i<5; ++i )
+               PrintAndLog(" %02d | %08" PRIx32, i, blocks[i]);
+
+       UsbCommand resp;
+       UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0,0,0}};
+
+       for ( 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 CmdLFNedapSim(const char *Cmd) {
+
+       char cmdp = param_getchar(Cmd, 0);
+       if (strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') return usage_lf_nedap_sim();
+
+       uint32_t cardnumber = 0, cn = 0;
+       
+       uint8_t bs[128];
+       size_t size = sizeof(bs);
+       memset(bs, 0x00, size);
+       
+       // NEDAP,  Bihase = 2, clock 64, inverted, 
+       uint8_t encoding = 2, separator = 0, clk=64, invert=1;
+       uint16_t arg1, arg2;
+       arg1 = clk << 8 | encoding;
+       arg2 = invert << 8 | separator;
+
+       if (sscanf(Cmd, "%u", &cn ) != 2) return usage_lf_nedap_sim();
+       cardnumber = (cn & 0x00FFFFFF);
+       
+       if ( !GetNedapBits(cardnumber, bs)) {
+               PrintAndLog("Error with tag bitstream generation.");
+               return 1;
+       }       
+
+       PrintAndLog("Simulating Nedap - CardNumber: %u", cardnumber );
+       
+       UsbCommand c = {CMD_ASK_SIM_TAG, {arg1, arg2, size}};
+       memcpy(c.d.asBytes, bs, size);
+       clearCommandBuffer();
+       SendCommand(&c);
+       return 0;
+}
+
+static command_t CommandTable[] = {
+    {"help",   CmdHelp,                1, "This help"},
+       {"read",        CmdLFNedapRead,  0, "Attempt to read and extract tag data"},
+//     {"clone",       CmdLFNedapClone, 0, "<Card Number>  clone nedap tag"},
+       {"sim",         CmdLFNedapSim,   0, "<Card Number>  simulate nedap tag"},
+    {NULL, NULL, 0, NULL}
+};
+
+int CmdLFNedap(const char *Cmd) {
+       clearCommandBuffer();
+    CmdsParse(CommandTable, Cmd);
+    return 0;
+}
+
+int CmdHelp(const char *Cmd) {
+    CmdsHelp(CommandTable);
+    return 0;
+}
diff --git a/client/cmdlfnedap.h b/client/cmdlfnedap.h
new file mode 100644 (file)
index 0000000..bead837
--- /dev/null
@@ -0,0 +1,33 @@
+//-----------------------------------------------------------------------------
+//
+// 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 CMDLFNEDAP_H__
+#define CMDLFNEDAP_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
+#include "crc.h"
+
+int CmdLFNedap(const char *Cmd);
+int CmdFSKdemodNedap(const char *Cmd);
+int CmdLFNedapRead(const char *Cmd);
+//int CmdLFNedapClone(const char *Cmd);
+int CmdLFNedapSim(const char *Cmd);
+
+int usage_lf_nedap_read(void);
+//int usage_lf_nedap_clone(void);
+int usage_lf_nedap_sim(void);
+#endif
+
index f27ffff35c119f158cad162d89ed60bf6762952f..3bc246a3e20b5831f01764ac51ee94ee100c2330 100644 (file)
@@ -764,6 +764,18 @@ int PyramiddemodFSK(uint8_t *dest, size_t *size)
        return (int)startIdx;
 }
 
+// find presco preamble 0x10D in already demoded data
+int NedapDemod(uint8_t *dest, size_t *size) {
+       //make sure buffer has data
+       if (*size < 128) return -3;
+       size_t startIdx = 0;
+       uint8_t preamble[] = {1,1,1,1,1,1,1,1,1,0};
+       uint8_t errChk = preambleSearch(dest, preamble, sizeof(preamble), size, &startIdx);
+       if (errChk == 0) return -4; //preamble not found
+       //return start position
+       return (int) startIdx;
+}
+
 // by marshmellow
 // to detect a wave that has heavily clipped (clean) samples
 uint8_t DetectCleanAskWave(uint8_t dest[], size_t size, uint8_t high, uint8_t low)
index 56c758ae7b2879fc48b3fa1f85646929c1941e39..9895434c98167755c0d03925399b7cce1a44f8d7 100644 (file)
@@ -55,4 +55,5 @@ int ParadoxdemodFSK(uint8_t *dest, size_t *size, uint32_t *hi2, uint32_t *hi, ui
 int PyramiddemodFSK(uint8_t *dest, size_t *size);
 int VikingDemod_AM(uint8_t *dest, size_t *size);
 int PrescoDemod(uint8_t *dest, size_t *size);
+int NedapDemod(uint8_t *dest, size_t *size);
 #endif
Impressum, Datenschutz