Merge branch 'master' of https://github.com/iceman1001/proxmark3

Conflicts:
	armsrc/crypto1.c

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 65346a5cc0c34cec46fa77a887ce1f10462757ed..3b6882d0d0dbe919c5b90a7983a2141b64505ab1 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,7 @@ This project uses the changelog in accordance with [keepchangelog](http://keepac
   - `hf mf c*` updated the calling structure and refactored of the chinese magic commands (iceman, marshmellow)
   - Started to add Peter Fillmore's  EMV fork into Iceman fork. ref: https://github.com/peterfillmore/proxmark3  (peter fillmore,  iceman)
   - Added Travis-CI automatic build integration with GitHub fork. (iceman)
+  - Updated the Reveng 1.30 sourcecode to 1.31 from Reveng projecthomepage (iceman)
 
 ### Added
 - `lf awid bruteforce <facilitycode>` - Simple bruteforce attack against a AWID reader.

diff --git a/armsrc/iso14443a.c b/armsrc/iso14443a.c
index c7fc06ec3f05be13cbec332fb79d0aafdd0757eb..c4298fcb4ae7612c45aa5eb50b11a8b8c609b01c 100644 (file)
--- a/armsrc/iso14443a.c
+++ b/armsrc/iso14443a.c
@@ -750,7 +750,7 @@ static void CodeIso14443aAsTagPar(const uint8_t *cmd, uint16_t len, uint8_t *par
 
 static void CodeIso14443aAsTag(const uint8_t *cmd, uint16_t len)
 {
-       uint8_t par[MAX_PARITY_SIZE];
+       uint8_t par[MAX_PARITY_SIZE] = {0};
        
        GetParity(cmd, len, par);
        CodeIso14443aAsTagPar(cmd, len, par);
@@ -1428,24 +1428,26 @@ void SimulateIso14443aTag(int tagType, int flags, byte_t* data)
 // of bits specified in the delay parameter.
 void PrepareDelayedTransfer(uint16_t delay)
 {
+       delay &= 0x07;
+       if (!delay) return;
+
        uint8_t bitmask = 0;
        uint8_t bits_to_shift = 0;
        uint8_t bits_shifted = 0;
+       uint16_t i = 0;
+
+       for (i = 0; i < delay; ++i)
+               bitmask |= (0x01 << i);
 
-       delay &= 0x07;
-       if (delay) {
-               for (uint16_t i = 0; i < delay; i++) {
-                       bitmask |= (1 << i);
-               }
                ToSend[++ToSendMax] = 0x00;
-               for (uint16_t i = 0; i < ToSendMax; i++) {
+
+       for (i = 0; i < ToSendMax; ++i) {
                        bits_to_shift = ToSend[i] & bitmask;
                        ToSend[i] = ToSend[i] >> delay;
                        ToSend[i] = ToSend[i] | (bits_shifted << (8 - delay));
                        bits_shifted = bits_to_shift;
                }
        }
-}
 
 
 //-------------------------------------------------------------------------------------
@@ -1463,18 +1465,27 @@ static void TransmitFor14443a(const uint8_t *cmd, uint16_t len, uint32_t *timing
        uint32_t ThisTransferTime = 0;
 
        if (timing) {
-               if(*timing == 0) {                                                                              // Measure time
+
+               if (*timing != 0)
+                       // Delay transfer (fine tuning - up to 7 MF clock ticks)
+                       PrepareDelayedTransfer(*timing & 0x00000007);   
+               else
+                       // Measure time
                        *timing = (GetCountSspClk() + 8) & 0xfffffff8;
-               } else {
-                       PrepareDelayedTransfer(*timing & 0x00000007);           // Delay transfer (fine tuning - up to 7 MF clock ticks)
-               }
-               if(MF_DBGLEVEL >= 4 && GetCountSspClk() >= (*timing & 0xfffffff8)) Dbprintf("TransmitFor14443a: Missed timing");
+
                
-               while(GetCountSspClk() < (*timing & 0xfffffff8));               // Delay transfer (multiple of 8 MF clock ticks)
+               if (MF_DBGLEVEL >= 4 && GetCountSspClk() >= (*timing & 0xfffffff8)) 
+                       Dbprintf("TransmitFor14443a: Missed timing");
+               
+               // Delay transfer (multiple of 8 MF clock ticks)
+               while (GetCountSspClk() < (*timing & 0xfffffff8));      
+
                LastTimeProxToAirStart = *timing;
        } else {
                ThisTransferTime = ((MAX(NextTransferTime, GetCountSspClk()) & 0xfffffff8) + 8);
+
                while(GetCountSspClk() < ThisTransferTime);
+
                LastTimeProxToAirStart = ThisTransferTime;
        }
        
@@ -2197,33 +2208,62 @@ int32_t dist_nt(uint32_t nt1, uint32_t nt2) {
 
        if (nt1 == nt2) return 0;
 
+       uint16_t i;
        uint32_t nttmp1 = nt1;
        uint32_t nttmp2 = nt2;
        
-       for (uint16_t i = 1; i < 0xFFFF; i += 8) {
-               nttmp1 = prng_successor(nttmp1, 1);     if (nttmp1 == nt2) return i;
-               nttmp2 = prng_successor(nttmp2, 1);     if (nttmp2 == nt1) return -i;
-               
-               nttmp1 = prng_successor(nttmp1, 2);     if (nttmp1 == nt2) return i+1;
-               nttmp2 = prng_successor(nttmp2, 2);     if (nttmp2 == nt1) return -i-1;
-               
-               nttmp1 = prng_successor(nttmp1, 3);     if (nttmp1 == nt2) return i+2;
-               nttmp2 = prng_successor(nttmp2, 3);     if (nttmp2 == nt1) return -i-2;
-               
-               nttmp1 = prng_successor(nttmp1, 4);     if (nttmp1 == nt2) return i+3;
-               nttmp2 = prng_successor(nttmp2, 4);     if (nttmp2 == nt1) return -i-3;
+       for (i = 1; i < 0xFFFF; i += 8) {
+               nttmp1 = prng_successor_one(nttmp1); if (nttmp1 == nt2) return i;
+               nttmp2 = prng_successor_one(nttmp2); if (nttmp2 == nt1) return -i;
 
-               nttmp1 = prng_successor(nttmp1, 5);     if (nttmp1 == nt2) return i+4;
-               nttmp2 = prng_successor(nttmp2, 5);     if (nttmp2 == nt1) return -i-4;
-               
-               nttmp1 = prng_successor(nttmp1, 6);     if (nttmp1 == nt2) return i+5;
-               nttmp2 = prng_successor(nttmp2, 6);     if (nttmp2 == nt1) return -i-5;
-               
-               nttmp1 = prng_successor(nttmp1, 7);     if (nttmp1 == nt2) return i+6;
-               nttmp2 = prng_successor(nttmp2, 7);     if (nttmp2 == nt1) return -i-6;
-               
-               nttmp1 = prng_successor(nttmp1, 8);     if (nttmp1 == nt2) return i+7;
-               nttmp2 = prng_successor(nttmp2, 8);     if (nttmp2 == nt1) return -i-7;
+               nttmp1 = prng_successor_one(nttmp1); if (nttmp1 == nt2) return i+1;
+               nttmp2 = prng_successor_one(nttmp2); if (nttmp2 == nt1) return -i+1;
+
+               nttmp1 = prng_successor_one(nttmp1); if (nttmp1 == nt2) return i+2;
+               nttmp2 = prng_successor_one(nttmp2); if (nttmp2 == nt1) return -i+2;
+
+               nttmp1 = prng_successor_one(nttmp1); if (nttmp1 == nt2) return i+3;
+               nttmp2 = prng_successor_one(nttmp2); if (nttmp2 == nt1) return -i+3;
+
+               nttmp1 = prng_successor_one(nttmp1); if (nttmp1 == nt2) return i+4;
+               nttmp2 = prng_successor_one(nttmp2); if (nttmp2 == nt1) return -i+4;
+
+               nttmp1 = prng_successor_one(nttmp1); if (nttmp1 == nt2) return i+5;
+               nttmp2 = prng_successor_one(nttmp2); if (nttmp2 == nt1) return -i+5;
+
+               nttmp1 = prng_successor_one(nttmp1); if (nttmp1 == nt2) return i+6;
+               nttmp2 = prng_successor_one(nttmp2); if (nttmp2 == nt1) return -i+6;
+
+               nttmp1 = prng_successor_one(nttmp1); if (nttmp1 == nt2) return i+7;
+               nttmp2 = prng_successor_one(nttmp2); if (nttmp2 == nt1) return -i+7;
+
+               nttmp1 = prng_successor_one(nttmp1); if (nttmp1 == nt2) return i+8;
+               nttmp2 = prng_successor_one(nttmp2); if (nttmp2 == nt1) return -i+8;
+/*
+               if ( prng_successor(nttmp1, i) == nt2) return i;
+               if ( prng_successor(nttmp2, i) == nt1) return -i;
+
+               if ( prng_successor(nttmp1, i+2) == nt2) return i+2;
+               if ( prng_successor(nttmp2, i+2) == nt1) return -(i+2);
+
+               if ( prng_successor(nttmp1, i+3) == nt2) return i+3;
+               if ( prng_successor(nttmp2, i+3) == nt1) return -(i+3);
+
+               if ( prng_successor(nttmp1, i+4) == nt2) return i+4;
+               if ( prng_successor(nttmp2, i+4) == nt1) return -(i+4);
+
+               if ( prng_successor(nttmp1, i+5) == nt2) return i+5;
+               if ( prng_successor(nttmp2, i+5) == nt1) return -(i+5);
+
+               if ( prng_successor(nttmp1, i+6) == nt2) return i+6;
+               if ( prng_successor(nttmp2, i+6) == nt1) return -(i+6);
+
+               if ( prng_successor(nttmp1, i+7) == nt2) return i+7;
+               if ( prng_successor(nttmp2, i+7) == nt1) return -(i+7);
+
+               if ( prng_successor(nttmp1, i+8) == nt2) return i+8;
+               if ( prng_successor(nttmp2, i+8) == nt1) return -(i+8);
+*/
        }
        
        return(-99999); // either nt1 or nt2 are invalid nonces
@@ -2349,7 +2389,7 @@ void ReaderMifare(bool first_try, uint8_t block )
                // if we missed the sync time already, advance to the next nonce repeat
                while(GetCountSspClk() > sync_time) {
                        ++elapsed_prng_sequences;
-                       sync_time = (sync_time & 0xfffffff8) + sync_cycles;
+                       sync_time += sync_cycles;
                }
                // Transmit MIFARE_CLASSIC_AUTH at synctime. Should result in returning the same tag nonce (== nt_attacked) 
                ReaderTransmit(mf_auth, sizeof(mf_auth), &sync_time);                   

diff --git a/armsrc/mifarecmd.c b/armsrc/mifarecmd.c
index 4c1fe1b64eba66d2a99bf05d7fa8dbfee1116a9c..ad8655db4eddffd6c6174b02b7bb07ba7e4087a0 100644 (file)
--- a/armsrc/mifarecmd.c
+++ b/armsrc/mifarecmd.c
@@ -771,7 +771,7 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat
        uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE] = {0x00};\r
 \r
        uint32_t auth1_time, auth2_time;\r
-       static uint16_t delta_time;\r
+       static uint16_t delta_time = 0;\r
 \r
        LED_A_ON();\r
        LED_C_OFF();\r
@@ -822,12 +822,8 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat
                                rtr--;\r
                                continue;\r
                        };\r
+                       auth2_time = (delta_time) ? auth1_time + delta_time : 0;\r
 \r
-                       if (delta_time) {\r
-                               auth2_time = auth1_time + delta_time;\r
-                       } else {\r
-                               auth2_time = 0;\r
-                       }\r
                        if(mifare_classic_authex(pcs, cuid, blockNo, keyType, ui64Key, AUTH_NESTED, &nt2, &auth2_time)) {\r
                                if (MF_DBGLEVEL >= 1)   Dbprintf("Nested: Auth2 error");\r
                                rtr--;\r
@@ -836,7 +832,7 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat
 \r
                        nttmp = prng_successor(nt1, 100);                               //NXP Mifare is typical around 840,but for some unlicensed/compatible mifare card this can be 160\r
                        for (i = 101; i < 1200; i++) {\r
-                               nttmp = prng_successor(nttmp, 1);\r
+                               nttmp = prng_successor_one(nttmp);\r
                                if (nttmp == nt2) break;\r
                        }\r
 \r
@@ -896,6 +892,7 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat
 \r
                        // nested authentication\r
                        auth2_time = auth1_time + delta_time;\r
+\r
                        len = mifare_sendcmd_short(pcs, AUTH_NESTED, 0x60 + (targetKeyType & 0x01), targetBlockNo, receivedAnswer, par, &auth2_time);\r
                        if (len != 4) {\r
                                if (MF_DBGLEVEL >= 1)   Dbprintf("Nested: Auth2 error len=%d", len);\r
@@ -906,14 +903,18 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat
                        if (MF_DBGLEVEL >= 3) Dbprintf("Nonce#%d: Testing nt1=%08x nt2enc=%08x nt2par=%02x", i+1, nt1, nt2, par[0]);\r
                        \r
                        // Parity validity check\r
-                       for (j = 0; j < 4; j++) {\r
-                               par_array[j] = (oddparity8(receivedAnswer[j]) != ((par[0] >> (7-j)) & 0x01));\r
-                       }\r
+//                     for (j = 0; j < 4; j++) {\r
+//                             par_array[j] = (oddparity8(receivedAnswer[j]) != ((par[0] >> (7-j)) & 0x01));\r
+//                     }\r
+                       par_array[0] = (oddparity8(receivedAnswer[0]) != ((par[0] >> (7-0)) & 0x01));\r
+                       par_array[1] = (oddparity8(receivedAnswer[1]) != ((par[0] >> (7-1)) & 0x01));\r
+                       par_array[2] = (oddparity8(receivedAnswer[2]) != ((par[0] >> (7-2)) & 0x01));\r
+                       par_array[3] = (oddparity8(receivedAnswer[3]) != ((par[0] >> (7-3)) & 0x01));\r
                        \r
                        ncount = 0;\r
                        nttest = prng_successor(nt1, dmin - 1);\r
                        for (j = dmin; j < dmax + 1; j++) {\r
-                               nttest = prng_successor(nttest, 1);\r
+                               nttest = prng_successor_one(nttest);\r
                                ks1 = nt2 ^ nttest;\r
 \r
                                if (valid_nonce(nttest, nt2, ks1, par_array)){\r
@@ -942,8 +943,8 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat
        //  ----------------------------- crypto1 destroy\r
        crypto1_destroy(pcs);\r
        \r
-       byte_t buf[4 + 4 * 4];\r
-       memcpy(buf, &cuid, 4);\r
+       byte_t buf[4 + 4 * 4] = {0};\r
+       num_to_bytes(cuid, 4, buf);\r
        memcpy(buf+4, &target_nt[0], 4);\r
        memcpy(buf+8, &target_ks[0], 4);\r
        memcpy(buf+12, &target_nt[1], 4);\r
@@ -986,9 +987,9 @@ void MifareChkKeys(uint16_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
        int OLD_MF_DBGLEVEL = MF_DBGLEVEL;      \r
        MF_DBGLEVEL = MF_DBG_NONE;\r
        \r
+       LEDsoff();\r
        LED_A_ON();\r
-       LED_B_OFF();\r
-       LED_C_OFF();\r
+       \r
        iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
 \r
        if (clearTrace) \r

diff --git a/client/util.c b/client/util.c
index ab1582223a5bfff47f802ada8676c7c2e2923c2a..586d930b263d68bebb653d889a75aea281969fba 100644 (file)
--- a/client/util.c
+++ b/client/util.c
@@ -104,14 +104,18 @@ void print_hex(const uint8_t * data, const size_t len) {
        printf("\n");
 }
 void print_hex_break(const uint8_t *data, const size_t len, uint8_t breaks) {
-       size_t i;
-       for ( i = 0; i < len; ++i) {
+
+       int rownum = 0;
+       printf("[%02d] | ", rownum);
+       for (int i = 0; i < len; ++i) {
 
                printf("%02X ", data[i]);
                
                // check if a line break is needed
-               if ( breaks > 0 && !(i+1 % breaks) )
-                       printf("(%d %d)\n", i+1 , breaks);
+               if ( breaks > 0 && !((i+1) % breaks) && (i+1 < len) ) {
+                       ++rownum;
+                       printf("\n[%02d] | ", rownum);
+               }
        }
        printf("\n");
 }

diff --git a/tools/mfkey/Makefile b/tools/mfkey/Makefile
index 79b42a435c266eb47ac65348d2956d69140daa08..e1bb4d07d9ace2b0a0f26c67511783f6aeb6b434 100755 (executable)
--- a/tools/mfkey/Makefile
+++ b/tools/mfkey/Makefile
@@ -1,6 +1,6 @@
 CC = gcc
 LD = gcc
-CFLAGS = -Wall -Winline -O4
+CFLAGS =  -std=c99 -Wall -Winline -O3
 LDFLAGS =
 
 OBJS = crapto1.o crypto1.o

diff --git a/tools/nonce2key/Makefile b/tools/nonce2key/Makefile
index a46169f416c5b36a1c3ac939024e27875d88691e..b84c9bbbe02fc11472df5852a7461ddc74302afc 100644 (file)
--- a/tools/nonce2key/Makefile
+++ b/tools/nonce2key/Makefile
@@ -1,6 +1,6 @@
 CC = gcc
 LD = gcc
-CFLAGS = -Wall -O4 -c
+CFLAGS = -Wall -O3 -c
 LDFLAGS =
 
 OBJS = crypto1.o crapto1.o