Merge pull request #86 from egon2/fix-85

[proxmark3-svn] / client / cmdlfnoralsy.c

diff --git a/client/cmdlfnoralsy.c b/client/cmdlfnoralsy.c
index 54869f1596ff0bd918c488ff4ffbc3a2157c1405..32c92d867777b80c20add7857b5e2f409f47c01c 100644 (file)
--- a/client/cmdlfnoralsy.c
+++ b/client/cmdlfnoralsy.c
@@ -4,19 +4,19 @@
 // at your option, any later version. See the LICENSE.txt file for the text of
 // the license.
 //-----------------------------------------------------------------------------
 // at your option, any later version. See the LICENSE.txt file for the text of
 // the license.
 //-----------------------------------------------------------------------------

-// Low frequency Presco tag commands
+// Low frequency Noralsy tag commands

 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------

-

 #include "cmdlfnoralsy.h"
 
 static int CmdHelp(const char *Cmd);
 
 int usage_lf_noralsy_clone(void){
        PrintAndLog("clone a Noralsy tag to a T55x7 tag.");
 #include "cmdlfnoralsy.h"
 
 static int CmdHelp(const char *Cmd);
 
 int usage_lf_noralsy_clone(void){
        PrintAndLog("clone a Noralsy tag to a T55x7 tag.");

-       PrintAndLog("Usage: lf noralsy clone [h] <card ID> <Q5>");
+       PrintAndLog("Usage: lf noralsy clone [h] <card id> <year> <Q5>");

        PrintAndLog("Options:");
        PrintAndLog("      h          : This help");
        PrintAndLog("Options:");
        PrintAndLog("      h          : This help");

-       PrintAndLog("      <card ID>  : Noralsy card ID");
+       PrintAndLog("      <card id>  : Noralsy card ID");
+       PrintAndLog("      <year>     : Tag allocation year");

        PrintAndLog("      <Q5>       : specify write to Q5 (t5555 instead of t55x7)");
        PrintAndLog("");
        PrintAndLog("Sample: lf noralsy clone 112233");
        PrintAndLog("      <Q5>       : specify write to Q5 (t5555 instead of t55x7)");
        PrintAndLog("");
        PrintAndLog("Sample: lf noralsy clone 112233");


@@ -27,10 +27,11 @@ int usage_lf_noralsy_sim(void) {
        PrintAndLog("Enables simulation of Noralsy card with specified card number.");
        PrintAndLog("Simulation runs until the button is pressed or another USB command is issued.");
        PrintAndLog("");
        PrintAndLog("Enables simulation of Noralsy card with specified card number.");
        PrintAndLog("Simulation runs until the button is pressed or another USB command is issued.");
        PrintAndLog("");

-       PrintAndLog("Usage:  lf noralsy sim [h] <card ID>");
+       PrintAndLog("Usage:  lf noralsy sim [h] <card id> <year>");

        PrintAndLog("Options:");
        PrintAndLog("      h          : This help");
        PrintAndLog("Options:");
        PrintAndLog("      h          : This help");

-       PrintAndLog("      <card ID>  : Noralsy card ID");
+       PrintAndLog("      <card id>  : Noralsy card ID");
+       PrintAndLog("      <year>     : Tag allocation year");

        PrintAndLog("");
        PrintAndLog("Sample: lf noralsy sim 112233");
        return 0;
        PrintAndLog("");
        PrintAndLog("Sample: lf noralsy sim 112233");
        return 0;


@@ -42,19 +43,23 @@ static uint8_t noralsy_chksum( uint8_t* bits, uint8_t len) {
         sum ^= bytebits_to_byte(bits+i, 4);
     return sum & 0x0F ;
 }
         sum ^= bytebits_to_byte(bits+i, 4);
     return sum & 0x0F ;
 }

-int getnoralsyBits(uint32_t id, uint8_t *bits) {       
+int getnoralsyBits(uint32_t id, uint16_t year, uint8_t *bits) {        

        //preamp
        num_to_bytebits(0xBB0214FF, 32, bits);  // --> Have seen 0xBB0214FF / 0xBB0314FF  UNKNOWN
 
        //convert ID into BCD-format
        id = DEC2BCD(id);
        //preamp
        num_to_bytebits(0xBB0214FF, 32, bits);  // --> Have seen 0xBB0214FF / 0xBB0314FF  UNKNOWN
 
        //convert ID into BCD-format
        id = DEC2BCD(id);

-
+       year = DEC2BCD(year);
+       year &= 0xFF;
+       

        uint16_t sub1 = (id & 0xFFF0000) >> 16;
        uint8_t sub2 = (id & 0x000FF00) >> 8;
        uint8_t sub3 = (id & 0x00000FF);
        
        num_to_bytebits(sub1, 12, bits+32);
        uint16_t sub1 = (id & 0xFFF0000) >> 16;
        uint8_t sub2 = (id & 0x000FF00) >> 8;
        uint8_t sub3 = (id & 0x00000FF);
        
        num_to_bytebits(sub1, 12, bits+32);

-       num_to_bytebits(0x980, 12, bits+44);   // --> UNKNOWN part
+       num_to_bytebits(year, 8, bits+44);
+       num_to_bytebits(0, 4, bits+52);   // --> UNKNOWN. Flag?
+       

        num_to_bytebits(sub2, 8, bits+56);
        num_to_bytebits(sub3, 8, bits+64);
 
        num_to_bytebits(sub2, 8, bits+56);
        num_to_bytebits(sub3, 8, bits+64);
 


@@ -66,6 +71,18 @@ int getnoralsyBits(uint32_t id, uint8_t *bits) {
        return 1;
 }
 
        return 1;
 }
 

+/*
+*
+* 2520116 | BB0314FF2529900116360000 | 10111011 00000011 00010100 11111111 00100101 00101001 10010000 00000001 00010110 00110110 00000000 00000000
+*                      aaaaaaaaiii***iiiicc----                                       iiiiiiii iiiiYYYY YYYY**** iiiiiiii iiiiiiii cccccccc
+*
+* a = fixed value BB0314FF 
+* i = printed id, BCD-format
+* Y = year
+* c = checksum
+* 
+**/
+

 //see ASKDemod for what args are accepted
 int CmdNoralsyDemod(const char *Cmd) {
 
 //see ASKDemod for what args are accepted
 int CmdNoralsyDemod(const char *Cmd) {
 


@@ -91,6 +108,7 @@ int CmdNoralsyDemod(const char *Cmd) {
                return 0;
        }
        setDemodBuf(DemodBuffer, 96, ans);
                return 0;
        }
        setDemodBuf(DemodBuffer, 96, ans);

+       setGrid_Clock(32);

        
        //got a good demod
        uint32_t raw1 = bytebits_to_byte(DemodBuffer, 32);
        
        //got a good demod
        uint32_t raw1 = bytebits_to_byte(DemodBuffer, 32);


@@ -101,6 +119,10 @@ int CmdNoralsyDemod(const char *Cmd) {
        cardid |= (raw2 & 0xFF) << 8;
        cardid |= ((raw3 & 0xFF000000) >> 24);
        cardid = BCD2DEC(cardid);
        cardid |= (raw2 & 0xFF) << 8;
        cardid |= ((raw3 & 0xFF000000) >> 24);
        cardid = BCD2DEC(cardid);

+
+       uint16_t year = (raw2 & 0x000ff000) >> 12;
+       year = BCD2DEC(year);
+       year += ( year > 60 ) ? 1900: 2000;

        
        // calc checksums
        uint8_t calc1 = noralsy_chksum(DemodBuffer+32, 40);
        
        // calc checksums
        uint8_t calc1 = noralsy_chksum(DemodBuffer+32, 40);


@@ -109,24 +131,30 @@ int CmdNoralsyDemod(const char *Cmd) {
        chk1 = bytebits_to_byte(DemodBuffer+72, 4);
        chk2 = bytebits_to_byte(DemodBuffer+76, 4);
        // test checksums
        chk1 = bytebits_to_byte(DemodBuffer+72, 4);
        chk2 = bytebits_to_byte(DemodBuffer+76, 4);
        // test checksums

-       if ( chk1 != calc1 ) printf("checksum 1 failed %x - %x\n", chk1, calc1);
-       if ( chk2 != calc2 ) printf("checksum 2 failed %x - %x\n", chk2, calc2);        
+       if ( chk1 != calc1 ) { 
+               printf("checksum 1 failed %x - %x\n", chk1, calc1);
+               return 0;
+       }
+       if ( chk2 != calc2 ) {
+               printf("checksum 2 failed %x - %x\n", chk2, calc2);     
+               return 0;
+       }

        
        

-       PrintAndLog("Noralsy Tag Found: Card ID %u,  Raw: %08X%08X%08X", cardid,  raw1 ,raw2, raw3);
+       PrintAndLog("Noralsy Tag Found: Card ID %u, Year: %u Raw: %08X%08X%08X", cardid, year, raw1 ,raw2, raw3);

        return 1;
 }
 
 int CmdNoralsyRead(const char *Cmd) {
        CmdLFRead("s");
        return 1;
 }
 
 int CmdNoralsyRead(const char *Cmd) {
        CmdLFRead("s");

-       getSamples("20000",TRUE);
+       getSamples("8000",TRUE);

        return CmdNoralsyDemod(Cmd);
 }
 
 int CmdNoralsyClone(const char *Cmd) {
        return CmdNoralsyDemod(Cmd);
 }
 
 int CmdNoralsyClone(const char *Cmd) {

-
+       
+       uint16_t year = 0;

        uint32_t id = 0;
        uint32_t id = 0;

-       uint32_t blocks[4] = {T55x7_MODULATION_MANCHESTER | T55x7_BITRATE_RF_32 | T55x7_ST_TERMINATOR |3<<T55x7_MAXBLOCK_SHIFT, 0, 0};
-
+       uint32_t blocks[4] = {T55x7_MODULATION_MANCHESTER | T55x7_BITRATE_RF_32 | T55x7_ST_TERMINATOR | 3 << T55x7_MAXBLOCK_SHIFT, 0, 0};

        uint8_t bits[96];
        uint8_t *bs = bits;
        memset(bs, 0, sizeof(bits));
        uint8_t bits[96];
        uint8_t *bs = bits;
        memset(bs, 0, sizeof(bits));


@@ -135,14 +163,15 @@ int CmdNoralsyClone(const char *Cmd) {
        if (strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') return usage_lf_noralsy_clone();
 
        id = param_get32ex(Cmd, 0, 0, 10);
        if (strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') return usage_lf_noralsy_clone();
 
        id = param_get32ex(Cmd, 0, 0, 10);

+       year = param_get32ex(Cmd, 1, 2000, 10);

        
        //Q5
        
        //Q5

-       if (param_getchar(Cmd, 1) == 'Q' || param_getchar(Cmd, 1) == 'q') {
+       if (param_getchar(Cmd, 2) == 'Q' || param_getchar(Cmd, 2) == 'q') {

                //t5555 (Q5) BITRATE = (RF-2)/2 (iceman)
                //t5555 (Q5) BITRATE = (RF-2)/2 (iceman)

-               blocks[0] = T5555_MODULATION_MANCHESTER | 32<<T5555_BITRATE_SHIFT | T5555_ST_TERMINATOR | 3<<T5555_MAXBLOCK_SHIFT;
+               blocks[0] = T5555_MODULATION_MANCHESTER | ((32-2)>>1) << T5555_BITRATE_SHIFT | T5555_ST_TERMINATOR | 3 << T5555_MAXBLOCK_SHIFT;

        }
        
        }
        

-        if ( !getnoralsyBits(id, bs)) {
+        if ( !getnoralsyBits(id, year, bs)) {

                PrintAndLog("Error with tag bitstream generation.");
                return 1;
        }       
                PrintAndLog("Error with tag bitstream generation.");
                return 1;
        }       


@@ -168,7 +197,7 @@ int CmdNoralsyClone(const char *Cmd) {
                c.arg[1] = i;
                clearCommandBuffer();
                SendCommand(&c);
                c.arg[1] = i;
                clearCommandBuffer();
                SendCommand(&c);

-               if (!WaitForResponseTimeout(CMD_ACK, &resp, 1000)){
+               if (!WaitForResponseTimeout(CMD_ACK, &resp, T55XX_WRITE_TIMEOUT)){

                        PrintAndLog("Error occurred, device did not respond during write operation.");
                        return -1;
                }
                        PrintAndLog("Error occurred, device did not respond during write operation.");
                        return -1;
                }


@@ -181,12 +210,15 @@ int CmdNoralsySim(const char *Cmd) {
        uint8_t bits[96];
        uint8_t *bs = bits;
        memset(bs, 0, sizeof(bits));
        uint8_t bits[96];
        uint8_t *bs = bits;
        memset(bs, 0, sizeof(bits));

-       
+
+       uint16_t year = 0;

        uint32_t id = 0;
        uint32_t id = 0;

+

        char cmdp = param_getchar(Cmd, 0);
        if (strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') return usage_lf_noralsy_sim();
 
        id = param_get32ex(Cmd, 0, 0, 10);
        char cmdp = param_getchar(Cmd, 0);
        if (strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') return usage_lf_noralsy_sim();
 
        id = param_get32ex(Cmd, 0, 0, 10);

+       year = param_get32ex(Cmd, 1, 2000, 10);

 
        uint8_t clk = 32, encoding = 1, separator = 1, invert = 0;
        uint16_t arg1, arg2;
 
        uint8_t clk = 32, encoding = 1, separator = 1, invert = 0;
        uint16_t arg1, arg2;


@@ -194,7 +226,7 @@ int CmdNoralsySim(const char *Cmd) {
        arg1 = clk << 8 | encoding;
        arg2 = invert << 8 | separator;
        
        arg1 = clk << 8 | encoding;
        arg2 = invert << 8 | separator;
        

-        if ( !getnoralsyBits(id, bs)) {
+        if ( !getnoralsyBits(id, year, bs)) {

                PrintAndLog("Error with tag bitstream generation.");
                return 1;
        }       
                PrintAndLog("Error with tag bitstream generation.");
                return 1;
        }