CHG: this timing should be quite good. needs to be verified.

[proxmark3-svn] / client / cmdanalyse.c

diff --git a/client/cmdanalyse.c b/client/cmdanalyse.c
index 6a8e5bc07edd916309df3132c1acf335c7382336..e7a638eed8bd724a31422f21957c779db60039d9 100644 (file)
--- a/client/cmdanalyse.c
+++ b/client/cmdanalyse.c
@@ -176,7 +176,16 @@ int CmdAnalyseCRC(const char *Cmd) {
        PrintAndLog("LEGIC: CRC8 : %X (0xC6 expected)", legic8);
        PrintAndLog("MAXIM: CRC8 : %X (0xA1 expected)", CRC8Maxim(dataStr, sizeof(dataStr)));
        PrintAndLog("DNP  : CRC16: %X (0x82EA expected)", CRC16_DNP(dataStr, sizeof(dataStr))); 
-       PrintAndLog("CCITT: CRC16: %X (0xE5CC expected)", CRC16_CCITT(dataStr, sizeof(dataStr)));       
+       PrintAndLog("CCITT: CRC16: %X (0xE5CC expected)", CRC16_CCITT(dataStr, sizeof(dataStr)));
+
+       PrintAndLog("ICLASS org: CRC16: %X (0x expected)",iclass_crc16( (char*)dataStr, sizeof(dataStr)));
+       PrintAndLog("ICLASS ice: CRC16: %X (0x expected)",CRC16_ICLASS(dataStr, sizeof(dataStr)));
+
+
+
+       uint8_t dataStr1234[] = { 0x1,0x2,0x3,0x4};
+       PrintAndLog("ISO15693 org:  : CRC16: %X (0xF0B8 expected)", Iso15693Crc(dataStr1234, sizeof(dataStr1234)));
+       PrintAndLog("ISO15693 ice:  : CRC16: %X (0xF0B8 expected)", CRC16_Iso15693(dataStr1234, sizeof(dataStr1234)));
 
        free(data);
        return 0;
@@ -188,6 +197,7 @@ int CmdAnalyseCHKSUM(const char *Cmd){
        uint32_t mask = 0xFF;
        bool errors = false;
        int len = 0;
+       memset(data, 0x0, sizeof(data));
        
        while(param_getchar(Cmd, cmdp) != 0x00) {
                switch(param_getchar(Cmd, cmdp)) {
@@ -239,6 +249,40 @@ int CmdAnalyseDates(const char *Cmd){
        PrintAndLog("To be implemented. Feel free to contribute!");
        return 0;
 }
+int CmdAnalyseTEASelfTest(const char *Cmd){
+       
+       uint8_t v[8], v_le[8];
+       memset(v, 0x00, sizeof(v));
+       memset(v_le, 0x00, sizeof(v_le));
+       uint8_t* v_ptr = v_le;
+
+       uint8_t cmdlen = strlen(Cmd);
+       cmdlen = ( sizeof(v)<<2 < cmdlen ) ? sizeof(v)<<2 : cmdlen;
+       
+       if ( param_gethex(Cmd, 0, v, cmdlen) > 0 ){
+               PrintAndLog("can't read hex chars, uneven? :: %u", cmdlen);
+               return 1;
+       }
+       
+       SwapEndian64ex(v , 8, 4, v_ptr);
+       
+       // ENCRYPTION KEY:      
+       uint8_t key[16] = {0x55,0xFE,0xF6,0x30,0x62,0xBF,0x0B,0xC1,0xC9,0xB3,0x7C,0x34,0x97,0x3E,0x29,0xFB };
+       uint8_t keyle[16];
+       uint8_t* key_ptr = keyle;
+       SwapEndian64ex(key , sizeof(key), 4, key_ptr);
+       
+       PrintAndLog("TEST LE enc| %s", sprint_hex(v_ptr, 8));
+       
+       tea_decrypt(v_ptr, key_ptr);    
+       PrintAndLog("TEST LE dec | %s", sprint_hex_ascii(v_ptr, 8));
+       
+       tea_encrypt(v_ptr, key_ptr);    
+       tea_encrypt(v_ptr, key_ptr);
+       PrintAndLog("TEST enc2 | %s", sprint_hex_ascii(v_ptr, 8));
+
+       return 0;
+}
 
 static command_t CommandTable[] = {
        {"help",        CmdHelp,            1, "This help"},
@@ -246,6 +290,7 @@ static command_t CommandTable[] = {
        {"crc",         CmdAnalyseCRC,          1, "Stub method for CRC evaluations"},
        {"chksum",      CmdAnalyseCHKSUM,       1, "Checksum with adding, masking and one's complement"},
        {"dates",       CmdAnalyseDates,        1, "Look for datestamps in a given array of bytes"},
+       {"tea",         CmdAnalyseTEASelfTest,  1, "Crypto TEA test"},
        {NULL, NULL, 0, NULL}
 };