'lf hitag writer': add Hitag2 password auth

* (PRs 233, 303, 304 by @ViRb3 on https://github.com/RfidResearchGroup/proxmark3)
* replace byte_t by uint8_t
* note that Hitag1 commands are not yet available
* whitespace fixes
* #define Hitag2 commands
* whitespace
* add EOF wait time
* add powerup wait time

diff --git a/armsrc/apps.h b/armsrc/apps.h
index ae5e3977beadfe2563f0503ffea039541a22b9ca..8aef19fb6f7edd0504d0ee528fd483cd71749061 100644 (file)
--- a/armsrc/apps.h
+++ b/armsrc/apps.h
@@ -16,7 +16,6 @@
 #include <stddef.h>
 #include "common.h"
 #include "usb_cmd.h"
 #include <stddef.h>
 #include "common.h"
 #include "usb_cmd.h"

-#include "hitag2.h"

 #include "hitagS.h"
 #include "mifare.h"
 #include "../common/crc32.h"
 #include "hitagS.h"
 #include "mifare.h"
 #include "../common/crc32.h"

diff --git a/armsrc/hitag2.c b/armsrc/hitag2.c
index 270958ce14be3d86d7c5f9475d7c76699f97ce56..7cdabefaaa4dada3502c516c083c9b391c491af0 100644 (file)
--- a/armsrc/hitag2.c
+++ b/armsrc/hitag2.c
@@ -19,12 +19,14 @@
 #include "hitag2.h"
 
 #include "proxmark3.h"
 #include "hitag2.h"
 
 #include "proxmark3.h"

+#include "cmd.h"

 #include "apps.h"
 #include "util.h"
 #include "hitag.h"
 #include "string.h"
 #include "BigBuf.h"
 #include "fpgaloader.h"
 #include "apps.h"
 #include "util.h"
 #include "hitag.h"
 #include "string.h"
 #include "BigBuf.h"
 #include "fpgaloader.h"

+#include "protocols.h"

 
 static bool bQuiet;
 
 
 static bool bQuiet;
 


@@ -44,9 +46,9 @@ struct hitag2_tag {
                TAG_STATE_WRITING    = 0x04,       // In write command, awaiting sector contents to be written
        } state;
        unsigned int active_sector;
                TAG_STATE_WRITING    = 0x04,       // In write command, awaiting sector contents to be written
        } state;
        unsigned int active_sector;

-       byte_t crypto_active;
+       uint8_t crypto_active;

        uint64_t cs;
        uint64_t cs;

-       byte_t sectors[12][4];
+       uint8_t sectors[12][4];

 };
 
 static struct hitag2_tag tag = {
 };
 
 static struct hitag2_tag tag = {


@@ -77,14 +79,14 @@ static enum {
 // ToDo: define a meaningful maximum size for auth_table. The bigger this is, the lower will be the available memory for traces.
 // Historically it used to be FREE_BUFFER_SIZE, which was 2744.
 #define AUTH_TABLE_LENGTH 2744
 // ToDo: define a meaningful maximum size for auth_table. The bigger this is, the lower will be the available memory for traces.
 // Historically it used to be FREE_BUFFER_SIZE, which was 2744.
 #define AUTH_TABLE_LENGTH 2744

-static byte_t* auth_table;
+static uint8_t *auth_table;

 static size_t auth_table_pos = 0;
 static size_t auth_table_len = AUTH_TABLE_LENGTH;
 
 static size_t auth_table_pos = 0;
 static size_t auth_table_len = AUTH_TABLE_LENGTH;
 

-static byte_t password[4];
-static byte_t NrAr[8];
-static byte_t key[8];
-static byte_t writedata[4];
+static uint8_t password[4];
+static uint8_t NrAr[8];
+static uint8_t key[8];
+static uint8_t writedata[4];

 static uint64_t cipher_state;
 
 /* Following is a modified version of cryptolib.com/ciphers/hitag2/ */
 static uint64_t cipher_state;
 
 /* Following is a modified version of cryptolib.com/ciphers/hitag2/ */


@@ -93,57 +95,39 @@ static uint64_t cipher_state;
 // No warranties or guarantees of any kind.
 // This code is released into the public domain by its author.
 
 // No warranties or guarantees of any kind.
 // This code is released into the public domain by its author.
 

-// Basic macros:
-
-#define u8              uint8_t
-#define u32             uint32_t
-#define u64             uint64_t
-#define rev8(x)         ((((x)>>7)&1)+((((x)>>6)&1)<<1)+((((x)>>5)&1)<<2)+((((x)>>4)&1)<<3)+((((x)>>3)&1)<<4)+((((x)>>2)&1)<<5)+((((x)>>1)&1)<<6)+(((x)&1)<<7))
-#define rev16(x)        (rev8 (x)+(rev8 (x>> 8)<< 8))
-#define rev32(x)        (rev16(x)+(rev16(x>>16)<<16))
-#define rev64(x)        (rev32(x)+(rev32(x>>32)<<32))
-#define bit(x,n)        (((x)>>(n))&1)
-#define bit32(x,n)      ((((x)[(n)>>5])>>((n)))&1)
-#define inv32(x,i,n)    ((x)[(i)>>5]^=((u32)(n))<<((i)&31))
-#define rotl64(x, n)    ((((u64)(x))<<((n)&63))+(((u64)(x))>>((0-(n))&63)))
-

 // Single bit Hitag2 functions:
 
 // Single bit Hitag2 functions:
 

-#define i4(x,a,b,c,d)   ((u32)((((x)>>(a))&1)+(((x)>>(b))&1)*2+(((x)>>(c))&1)*4+(((x)>>(d))&1)*8))
+#define i4(x,a,b,c,d)    ((uint32_t)((((x)>>(a))&1)+(((x)>>(b))&1)*2+(((x)>>(c))&1)*4+(((x)>>(d))&1)*8))

 
 

-static const u32 ht2_f4a = 0x2C79;      // 0010 1100 0111 1001
-static const u32 ht2_f4b = 0x6671;      // 0110 0110 0111 0001
-static const u32 ht2_f5c = 0x7907287B;  // 0111 1001 0000 0111 0010 1000 0111 1011
+static const uint32_t ht2_f4a = 0x2C79;      // 0010 1100 0111 1001
+static const uint32_t ht2_f4b = 0x6671;      // 0110 0110 0111 0001
+static const uint32_t ht2_f5c = 0x7907287B;  // 0111 1001 0000 0111 0010 1000 0111 1011

 
 

-static u32 _f20 (const u64 x)
-{
-       u32                 i5;
+static uint32_t _f20(const uint64_t x) {
+       uint32_t i5;

 
 

-       i5 = ((ht2_f4a >> i4 (x, 1, 2, 4, 5)) & 1)* 1
-               + ((ht2_f4b >> i4 (x, 7,11,13,14)) & 1)* 2
-               + ((ht2_f4b >> i4 (x,16,20,22,25)) & 1)* 4
-               + ((ht2_f4b >> i4 (x,27,28,30,32)) & 1)* 8
-               + ((ht2_f4a >> i4 (x,33,42,43,45)) & 1)*16;
+       i5 = ((ht2_f4a >> i4(x, 1, 2, 4, 5)) & 1) * 1
+               + ((ht2_f4b >> i4(x, 7,11,13,14)) & 1) * 2
+               + ((ht2_f4b >> i4(x,16,20,22,25)) & 1) * 4
+               + ((ht2_f4b >> i4(x,27,28,30,32)) & 1) * 8
+               + ((ht2_f4a >> i4(x,33,42,43,45)) & 1) * 16;

 
        return (ht2_f5c >> i5) & 1;
 }
 
 
        return (ht2_f5c >> i5) & 1;
 }
 

-static u64 _hitag2_init (const u64 key, const u32 serial, const u32 IV)
-{
-       u32                 i;
-       u64                 x = ((key & 0xFFFF) << 32) + serial;
+static uint64_t _hitag2_init(const uint64_t key, const uint32_t serial, const uint32_t IV) {
+       uint32_t i;
+       uint64_t x = ((key & 0xFFFF) << 32) + serial;

 
 

-       for (i = 0; i < 32; i++)
-       {
+       for (i = 0; i < 32; i++) {

                x >>= 1;
                x >>= 1;

-               x += (u64) (_f20 (x) ^ (((IV >> i) ^ (key >> (i+16))) & 1)) << 47;
+               x += (uint64_t)(_f20(x) ^ (((IV >> i) ^ (key >> (i+16))) & 1)) << 47;

        }
        return x;
 }
 
        }
        return x;
 }
 

-static u64 _hitag2_round (u64 *state)
-{
-       u64                 x = *state;
+static uint64_t _hitag2_round(uint64_t *state) {
+       uint64_t x = *state;

 
        x = (x >>  1) +
                ((((x >>  0) ^ (x >>  2) ^ (x >>  3) ^ (x >>  6)
 
        x = (x >>  1) +
                ((((x >>  0) ^ (x >>  2) ^ (x >>  3) ^ (x >>  6)


@@ -152,40 +136,36 @@ static u64 _hitag2_round (u64 *state)
                   ^ (x >> 42) ^ (x >> 43) ^ (x >> 46) ^ (x >> 47)) & 1) << 47);
 
        *state = x;
                   ^ (x >> 42) ^ (x >> 43) ^ (x >> 46) ^ (x >> 47)) & 1) << 47);
 
        *state = x;

-       return _f20 (x);
+       return _f20(x);

 }
 
 }
 

-static u32 _hitag2_byte (u64 * x)
-{
-       u32                 i, c;
-
-       for (i = 0, c = 0; i < 8; i++) c += (u32) _hitag2_round (x) << (i^7);
+static uint32_t _hitag2_byte(uint64_t *x) {
+       uint32_t i, c;
+       for (i = 0, c = 0; i < 8; i++) {
+               c += (uint32_t) _hitag2_round(x) << (i^7);
+       }

        return c;
 }
 
        return c;
 }
 

-static int hitag2_reset(void)
-{
+static int hitag2_reset(void) {

        tag.state = TAG_STATE_RESET;
        tag.crypto_active = 0;
        return 0;
 }
 
        tag.state = TAG_STATE_RESET;
        tag.crypto_active = 0;
        return 0;
 }
 

-static int hitag2_init(void)
-{
-//  memcpy(&tag, &resetdata, sizeof(tag));
+static int hitag2_init(void) {

        hitag2_reset();
        return 0;
 }
 
        hitag2_reset();
        return 0;
 }
 

-static void hitag2_cipher_reset(struct hitag2_tag *tag, const byte_t *iv)
-{
-       uint64_t key =  ((uint64_t)tag->sectors[2][2]) |
+static void hitag2_cipher_reset(struct hitag2_tag *tag, const uint8_t *iv) {
+       uint64_t key = ((uint64_t)tag->sectors[2][2]) |

                ((uint64_t)tag->sectors[2][3] << 8) |
                ((uint64_t)tag->sectors[1][0] << 16) |
                ((uint64_t)tag->sectors[1][1] << 24) |
                ((uint64_t)tag->sectors[1][2] << 32) |
                ((uint64_t)tag->sectors[1][3] << 40);
                ((uint64_t)tag->sectors[2][3] << 8) |
                ((uint64_t)tag->sectors[1][0] << 16) |
                ((uint64_t)tag->sectors[1][1] << 24) |
                ((uint64_t)tag->sectors[1][2] << 32) |
                ((uint64_t)tag->sectors[1][3] << 40);

-       uint32_t uid =  ((uint32_t)tag->sectors[0][0]) |
+       uint32_t uid = ((uint32_t)tag->sectors[0][0]) |

                ((uint32_t)tag->sectors[0][1] << 8) |
                ((uint32_t)tag->sectors[0][2] << 16) |
                ((uint32_t)tag->sectors[0][3] << 24);
                ((uint32_t)tag->sectors[0][1] << 8) |
                ((uint32_t)tag->sectors[0][2] << 16) |
                ((uint32_t)tag->sectors[0][3] << 24);


@@ -193,12 +173,11 @@ static void hitag2_cipher_reset(struct hitag2_tag *tag, const byte_t *iv)
                (((uint32_t)(iv[1])) << 8) |
                (((uint32_t)(iv[2])) << 16) |
                (((uint32_t)(iv[3])) << 24);
                (((uint32_t)(iv[1])) << 8) |
                (((uint32_t)(iv[2])) << 16) |
                (((uint32_t)(iv[3])) << 24);

-       tag->cs = _hitag2_init(rev64(key), rev32(uid), rev32(iv_));
+       tag->cs = _hitag2_init(REV64(key), REV32(uid), REV32(iv_));

 }
 
 }
 

-static int hitag2_cipher_authenticate(uint64_t* cs, const byte_t *authenticator_is)
-{
-       byte_t authenticator_should[4];
+static int hitag2_cipher_authenticate(uint64_t *cs, const uint8_t *authenticator_is) {
+       uint8_t authenticator_should[4];

        authenticator_should[0] = ~_hitag2_byte(cs);
        authenticator_should[1] = ~_hitag2_byte(cs);
        authenticator_should[2] = ~_hitag2_byte(cs);
        authenticator_should[0] = ~_hitag2_byte(cs);
        authenticator_should[1] = ~_hitag2_byte(cs);
        authenticator_should[2] = ~_hitag2_byte(cs);


@@ -206,11 +185,10 @@ static int hitag2_cipher_authenticate(uint64_t* cs, const byte_t *authenticator_
        return (memcmp(authenticator_should, authenticator_is, 4) == 0);
 }
 
        return (memcmp(authenticator_should, authenticator_is, 4) == 0);
 }
 

-static int hitag2_cipher_transcrypt(uint64_t* cs, byte_t *data, unsigned int bytes, unsigned int bits)
-{
+static int hitag2_cipher_transcrypt(uint64_t *cs, uint8_t *data, unsigned int bytes, unsigned int bits) {

        int i;
        int i;

-       for(i=0; i<bytes; i++) data[i] ^= _hitag2_byte(cs);
-       for(i=0; i<bits; i++) data[bytes] ^= _hitag2_round(cs) << (7-i);
+       for (i = 0; i < bytes; i++) data[i] ^= _hitag2_byte(cs);
+       for (i = 0; i < bits; i++) data[bytes] ^= _hitag2_round(cs) << (7-i);

        return 0;
 }
 
        return 0;
 }
 


@@ -220,83 +198,77 @@ static int hitag2_cipher_transcrypt(uint64_t* cs, byte_t *data, unsigned int byt
 // T0 = TIMER_CLOCK1 / 125000 = 192
 #define T0 192
 
 // T0 = TIMER_CLOCK1 / 125000 = 192
 #define T0 192
 

-#define SHORT_COIL()    LOW(GPIO_SSC_DOUT)
-#define OPEN_COIL()     HIGH(GPIO_SSC_DOUT)
-
-#define HITAG_FRAME_LEN 20
-#define HITAG_T_STOP  36 /* T_EOF should be > 36 */
-#define HITAG_T_LOW     8  /* T_LOW should be 4..10 */
-#define HITAG_T_0_MIN 15 /* T[0] should be 18..22 */
-#define HITAG_T_1_MIN 25 /* T[1] should be 26..30 */
-//#define HITAG_T_EOF   40 /* T_EOF should be > 36 */
-#define HITAG_T_EOF   80     /* T_EOF should be > 36 */
-#define HITAG_T_WAIT_1 200 /* T_wresp should be 199..206 */
-#define HITAG_T_WAIT_2 90 /* T_wresp should be 199..206 */
+#define HITAG_FRAME_LEN   20
+#define HITAG_T_STOP      36 /* T_EOF should be > 36 */
+#define HITAG_T_LOW        8 /* T_LOW should be 4..10 */
+#define HITAG_T_0_MIN     15 /* T[0] should be 18..22 */
+#define HITAG_T_1_MIN     25 /* T[1] should be 26..30 */
+//#define HITAG_T_EOF     40 /* T_EOF should be > 36 */
+#define HITAG_T_EOF       80 /* T_EOF should be > 36 */
+#define HITAG_T_WAIT_1   200 /* T_wresp should be 199..206 */
+#define HITAG_T_WAIT_2    90 /* T_wresp should be 199..206 */

 #define HITAG_T_WAIT_MAX 300 /* bit more than HITAG_T_WAIT_1 + HITAG_T_WAIT_2 */
 #define HITAG_T_WAIT_MAX 300 /* bit more than HITAG_T_WAIT_1 + HITAG_T_WAIT_2 */

-#define HITAG_T_PROG 614
+#define HITAG_T_PROG     614

 
 

-#define HITAG_T_TAG_ONE_HALF_PERIOD         10
-#define HITAG_T_TAG_TWO_HALF_PERIOD         25
-#define HITAG_T_TAG_THREE_HALF_PERIOD       41
+#define HITAG_T_TAG_ONE_HALF_PERIOD     10
+#define HITAG_T_TAG_TWO_HALF_PERIOD     25
+#define HITAG_T_TAG_THREE_HALF_PERIOD   41

 #define HITAG_T_TAG_FOUR_HALF_PERIOD    57
 
 #define HITAG_T_TAG_FOUR_HALF_PERIOD    57
 

-#define HITAG_T_TAG_HALF_PERIOD                 16
-#define HITAG_T_TAG_FULL_PERIOD                 32
+#define HITAG_T_TAG_HALF_PERIOD         16
+#define HITAG_T_TAG_FULL_PERIOD         32

 
 

-#define HITAG_T_TAG_CAPTURE_ONE_HALF        13
-#define HITAG_T_TAG_CAPTURE_TWO_HALF        25
+#define HITAG_T_TAG_CAPTURE_ONE_HALF    13
+#define HITAG_T_TAG_CAPTURE_TWO_HALF    25

 #define HITAG_T_TAG_CAPTURE_THREE_HALF  41
 #define HITAG_T_TAG_CAPTURE_FOUR_HALF   57
 
 #define HITAG_T_TAG_CAPTURE_THREE_HALF  41
 #define HITAG_T_TAG_CAPTURE_FOUR_HALF   57
 

-

 static void hitag_send_bit(int bit) {
        LED_A_ON();
        // Reset clock for the next bit
        AT91C_BASE_TC0->TC_CCR = AT91C_TC_SWTRG;
 
        // Fixed modulation, earlier proxmark version used inverted signal
 static void hitag_send_bit(int bit) {
        LED_A_ON();
        // Reset clock for the next bit
        AT91C_BASE_TC0->TC_CCR = AT91C_TC_SWTRG;
 
        // Fixed modulation, earlier proxmark version used inverted signal

-       if(bit == 0) {
+       if (bit == 0) {

                // Manchester: Unloaded, then loaded |__--|
                LOW(GPIO_SSC_DOUT);
                // Manchester: Unloaded, then loaded |__--|
                LOW(GPIO_SSC_DOUT);

-               while(AT91C_BASE_TC0->TC_CV < T0*HITAG_T_TAG_HALF_PERIOD);
+               while (AT91C_BASE_TC0->TC_CV < T0*HITAG_T_TAG_HALF_PERIOD);

                HIGH(GPIO_SSC_DOUT);
                HIGH(GPIO_SSC_DOUT);

-               while(AT91C_BASE_TC0->TC_CV < T0*HITAG_T_TAG_FULL_PERIOD);
+               while (AT91C_BASE_TC0->TC_CV < T0*HITAG_T_TAG_FULL_PERIOD);

        } else {
                // Manchester: Loaded, then unloaded |--__|
                HIGH(GPIO_SSC_DOUT);
        } else {
                // Manchester: Loaded, then unloaded |--__|
                HIGH(GPIO_SSC_DOUT);

-               while(AT91C_BASE_TC0->TC_CV < T0*HITAG_T_TAG_HALF_PERIOD);
+               while (AT91C_BASE_TC0->TC_CV < T0*HITAG_T_TAG_HALF_PERIOD);

                LOW(GPIO_SSC_DOUT);
                LOW(GPIO_SSC_DOUT);

-               while(AT91C_BASE_TC0->TC_CV < T0*HITAG_T_TAG_FULL_PERIOD);
+               while (AT91C_BASE_TC0->TC_CV < T0*HITAG_T_TAG_FULL_PERIOD);

        }
        LED_A_OFF();
 }
 
        }
        LED_A_OFF();
 }
 

-static void hitag_send_frame(const byte_t* frame, size_t frame_len)
+static void hitag_send_frame(const uint8_t *frame, size_t frame_len)

 {
        // Send start of frame
 {
        // Send start of frame

-       for(size_t i=0; i<5; i++) {
+       for(size_t i = 0; i < 5; i++) {

                hitag_send_bit(1);
        }
 
        // Send the content of the frame
                hitag_send_bit(1);
        }
 
        // Send the content of the frame

-       for(size_t i=0; i<frame_len; i++) {
-               hitag_send_bit((frame[i/8] >> (7-(i%8)))&1);
+       for (size_t i = 0; i < frame_len; i++) {
+               hitag_send_bit((frame[i/8] >> (7-(i%8))) & 0x01);

        }
 
        // Drop the modulation
        LOW(GPIO_SSC_DOUT);
 }
 
        }
 
        // Drop the modulation
        LOW(GPIO_SSC_DOUT);
 }
 

-
-static void hitag2_handle_reader_command(byte_t* rx, const size_t rxlen, byte_t* tx, size_t* txlen)
-{
-       byte_t rx_air[HITAG_FRAME_LEN];
+static void hitag2_handle_reader_command(uint8_t *rx, const size_t rxlen, uint8_t *tx, size_t *txlen) {
+       uint8_t rx_air[HITAG_FRAME_LEN];

 
        // Copy the (original) received frame how it is send over the air
 
        // Copy the (original) received frame how it is send over the air

-       memcpy(rx_air,rx,nbytes(rxlen));
+       memcpy(rx_air, rx, nbytes(rxlen));

 
 

-       if(tag.crypto_active) {
-               hitag2_cipher_transcrypt(&(tag.cs),rx,rxlen/8,rxlen%8);
+       if (tag.crypto_active) {
+               hitag2_cipher_transcrypt(&(tag.cs), rx, rxlen/8, rxlen%8);

        }
 
        // Reset the transmission frame length
        }
 
        // Reset the transmission frame length


@@ -305,112 +277,112 @@ static void hitag2_handle_reader_command(byte_t* rx, const size_t rxlen, byte_t*
        // Try to find out which command was send by selecting on length (in bits)
        switch (rxlen) {
                // Received 11000 from the reader, request for UID, send UID
        // Try to find out which command was send by selecting on length (in bits)
        switch (rxlen) {
                // Received 11000 from the reader, request for UID, send UID

-       case 05: {
-               // Always send over the air in the clear plaintext mode
-               if(rx_air[0] != 0xC0) {
-                       // Unknown frame ?
-                       return;
+               case 05: {
+                       // Always send over the air in the clear plaintext mode
+                       if (rx_air[0] != HITAG2_START_AUTH) {
+                               // Unknown frame ?
+                               return;
+                       }
+                       *txlen = 32;
+                       memcpy(tx, tag.sectors[0], 4);
+                       tag.crypto_active = 0;

                }
                }

-               *txlen = 32;
-               memcpy(tx,tag.sectors[0],4);
-               tag.crypto_active = 0;
-       }

                break;
 
                // Read/Write command: ..xx x..y  yy with yyy == ~xxx, xxx is sector number
                break;
 
                // Read/Write command: ..xx x..y  yy with yyy == ~xxx, xxx is sector number

-       case 10: {
-               unsigned int sector = (~( ((rx[0]<<2)&0x04) | ((rx[1]>>6)&0x03) ) & 0x07);
-               // Verify complement of sector index
-               if(sector != ((rx[0]>>3)&0x07)) {
-                       //DbpString("Transmission error (read/write)");
-                       return;
-               }
+               case 10: {
+                       unsigned int sector = (~( ((rx[0]<<2) & 0x04) | ((rx[1]>>6) & 0x03) ) & 0x07);
+                       // Verify complement of sector index
+                       if (sector != ((rx[0]>>3) & 0x07)) {
+                               //DbpString("Transmission error (read/write)");
+                               return;
+                       }

 
 

-               switch (rx[0] & 0xC6) {
-                       // Read command: 11xx x00y
-               case 0xC0:
-                       memcpy(tx,tag.sectors[sector],4);
-                       *txlen = 32;
-                       break;
+                       switch (rx[0] & 0xC6) {
+                               // Read command: 11xx x00y
+                               case HITAG2_READ_PAGE:
+                                       memcpy(tx, tag.sectors[sector], 4);
+                                       *txlen = 32;
+                                       break;

 
 

-                       // Inverted Read command: 01xx x10y
-               case 0x44:
-                       for (size_t i=0; i<4; i++) {
-                               tx[i] = tag.sectors[sector][i] ^ 0xff;
-                       }
-                       *txlen = 32;
-                       break;
+                               // Inverted Read command: 01xx x10y
+                               case HITAG2_READ_PAGE_INVERTED:
+                                       for (size_t i = 0; i < 4; i++) {
+                                               tx[i] = tag.sectors[sector][i] ^ 0xff;
+                                       }
+                                       *txlen = 32;
+                                       break;

 
 

-                       // Write command: 10xx x01y
-               case 0x82:
-                       // Prepare write, acknowledge by repeating command
-                       memcpy(tx,rx,nbytes(rxlen));
-                       *txlen = rxlen;
-                       tag.active_sector = sector;
-                       tag.state=TAG_STATE_WRITING;
-                       break;
+                               // Write command: 10xx x01y
+                               case HITAG2_WRITE_PAGE:
+                                       // Prepare write, acknowledge by repeating command
+                                       memcpy(tx, rx, nbytes(rxlen));
+                                       *txlen = rxlen;
+                                       tag.active_sector = sector;
+                                       tag.state = TAG_STATE_WRITING;
+                                       break;

 
 

-                       // Unknown command
-               default:
-                       Dbprintf("Unknown command: %02x %02x",rx[0],rx[1]);
-                       return;
-                       break;
+                               // Unknown command
+                               default:
+                                       Dbprintf("Unknown command: %02x %02x", rx[0], rx[1]);
+                                       return;
+                                       break;
+                       }

                }
                }

-       }

                break;
 
                // Writing data or Reader password
                break;
 
                // Writing data or Reader password

-       case 32: {
-               if(tag.state == TAG_STATE_WRITING) {
-                       // These are the sector contents to be written. We don't have to do anything else.
-                       memcpy(tag.sectors[tag.active_sector],rx,nbytes(rxlen));
-                       tag.state=TAG_STATE_RESET;
-                       return;
-               } else {
-                       // Received RWD password, respond with configuration and our password
-                       if(memcmp(rx,tag.sectors[1],4) != 0) {
-                               DbpString("Reader password is wrong");
+               case 32: {
+                       if (tag.state == TAG_STATE_WRITING) {
+                               // These are the sector contents to be written. We don't have to do anything else.
+                               memcpy(tag.sectors[tag.active_sector], rx, nbytes(rxlen));
+                               tag.state = TAG_STATE_RESET;

                                return;
                                return;

+                       } else {
+                               // Received RWD password, respond with configuration and our password
+                               if (memcmp(rx, tag.sectors[1], 4) != 0) {
+                                       DbpString("Reader password is wrong");
+                                       return;
+                               }
+                               *txlen = 32;
+                               memcpy(tx, tag.sectors[3], 4);

                        }
                        }

-                       *txlen = 32;
-                       memcpy(tx,tag.sectors[3],4);

                }
                }

-       }

                break;
 
                // Received RWD authentication challenge and respnse
                break;
 
                // Received RWD authentication challenge and respnse

-       case 64: {
-               // Store the authentication attempt
-               if (auth_table_len < (AUTH_TABLE_LENGTH-8)) {
-                       memcpy(auth_table+auth_table_len,rx,8);
-                       auth_table_len += 8;
-               }
+               case 64: {
+                       // Store the authentication attempt
+                       if (auth_table_len < (AUTH_TABLE_LENGTH-8)) {
+                               memcpy(auth_table+auth_table_len, rx, 8);
+                               auth_table_len += 8;
+                       }

 
 

-               // Reset the cipher state
-               hitag2_cipher_reset(&tag,rx);
-               // Check if the authentication was correct
-               if(!hitag2_cipher_authenticate(&(tag.cs),rx+4)) {
-                       // The reader failed to authenticate, do nothing
-                       Dbprintf("auth: %02x%02x%02x%02x%02x%02x%02x%02x Failed!",rx[0],rx[1],rx[2],rx[3],rx[4],rx[5],rx[6],rx[7]);
-                       return;
-               }
-               // Succesful, but commented out reporting back to the Host, this may delay to much.
-               // Dbprintf("auth: %02x%02x%02x%02x%02x%02x%02x%02x OK!",rx[0],rx[1],rx[2],rx[3],rx[4],rx[5],rx[6],rx[7]);
+                       // Reset the cipher state
+                       hitag2_cipher_reset(&tag, rx);
+                       // Check if the authentication was correct
+                       if (!hitag2_cipher_authenticate(&(tag.cs), rx+4)) {
+                               // The reader failed to authenticate, do nothing
+                               Dbprintf("auth: %02x%02x%02x%02x%02x%02x%02x%02x Failed!", rx[0], rx[1], rx[2], rx[3], rx[4], rx[5], rx[6], rx[7]);
+                               return;
+                       }
+                       // Succesful, but commented out reporting back to the Host, this may delay to much.
+                       // Dbprintf("auth: %02x%02x%02x%02x%02x%02x%02x%02x OK!",rx[0],rx[1],rx[2],rx[3],rx[4],rx[5],rx[6],rx[7]);

 
 

-               // Activate encryption algorithm for all further communication
-               tag.crypto_active = 1;
+                       // Activate encryption algorithm for all further communication
+                       tag.crypto_active = 1;

 
 

-               // Use the tag password as response
-               memcpy(tx,tag.sectors[3],4);
-               *txlen = 32;
-       }
+                       // Use the tag password as response
+                       memcpy(tx, tag.sectors[3], 4);
+                       *txlen = 32;
+               }

                break;
        }
 
                break;
        }
 

-//  LogTraceHitag(rx,rxlen,0,0,false);
-//  LogTraceHitag(tx,*txlen,0,0,true);
+       //  LogTraceHitag(rx, rxlen, 0, 0, false);
+       //  LogTraceHitag(tx, *txlen, 0, 0, true);

 
 

-       if(tag.crypto_active) {
+       if (tag.crypto_active) {

                hitag2_cipher_transcrypt(&(tag.cs), tx, *txlen/8, *txlen%8);
        }
 }
                hitag2_cipher_transcrypt(&(tag.cs), tx, *txlen/8, *txlen%8);
        }
 }


@@ -426,295 +398,310 @@ static void hitag_reader_send_bit(int bit) {
        // Enable modulation, which means, drop the field
        HIGH(GPIO_SSC_DOUT);
 
        // Enable modulation, which means, drop the field
        HIGH(GPIO_SSC_DOUT);
 

-       // Wait for 4-10 times the carrier period
-       while(AT91C_BASE_TC0->TC_CV < T0*6);
-       //  SpinDelayUs(8*8);
+       // t_low = 4...10 carrier periods
+       while (AT91C_BASE_TC0->TC_CV < T0*6);

 
        // Disable modulation, just activates the field again
        LOW(GPIO_SSC_DOUT);
 
 
        // Disable modulation, just activates the field again
        LOW(GPIO_SSC_DOUT);
 

-       if(bit == 0) {
-               // Zero bit: |_-|
-               while(AT91C_BASE_TC0->TC_CV < T0*22);
-               //      SpinDelayUs(16*8);
+       if (bit == 0) {
+               // Zero bit: |_-|, T[0] = 18...22 carrier periods
+               while (AT91C_BASE_TC0->TC_CV < T0*22);

        } else {
        } else {

-               // One bit: |_--|
-               while(AT91C_BASE_TC0->TC_CV < T0*28);
-               //      SpinDelayUs(22*8);
+               // One bit: |_--|, T[1] = 26...32 carrier periods
+               while (AT91C_BASE_TC0->TC_CV < T0*28);

        }
        LED_A_OFF();
 }
 
 
        }
        LED_A_OFF();
 }
 
 

-static void hitag_reader_send_frame(const byte_t* frame, size_t frame_len)
+static void hitag_reader_send_frame(const uint8_t *frame, size_t frame_len)

 {
        // Send the content of the frame
 {
        // Send the content of the frame

-       for(size_t i=0; i<frame_len; i++) {
-               hitag_reader_send_bit((frame[i/8] >> (7-(i%8)))&1);
+       for(size_t i = 0; i < frame_len; i++) {
+               hitag_reader_send_bit((frame[i/8] >> (7-(i%8))) & 0x01);

        }
        // Send EOF
        AT91C_BASE_TC0->TC_CCR = AT91C_TC_SWTRG;
        // Enable modulation, which means, drop the field
        HIGH(GPIO_SSC_DOUT);
        }
        // Send EOF
        AT91C_BASE_TC0->TC_CCR = AT91C_TC_SWTRG;
        // Enable modulation, which means, drop the field
        HIGH(GPIO_SSC_DOUT);

-       // Wait for 4-10 times the carrier period
-       while(AT91C_BASE_TC0->TC_CV < T0*6);
+       // t_low = 4...10 carrier periods
+       while (AT91C_BASE_TC0->TC_CV < T0*6);

        // Disable modulation, just activates the field again
        LOW(GPIO_SSC_DOUT);
        // Disable modulation, just activates the field again
        LOW(GPIO_SSC_DOUT);

+       // t_stop > 36 carrier periods
+       while (AT91C_BASE_TC0->TC_CV < T0*36);

 }
 
 size_t blocknr;
 
 }
 
 size_t blocknr;
 

-static bool hitag2_password(byte_t* rx, const size_t rxlen, byte_t* tx, size_t* txlen) {
+//-----------------------------------------------------------------------------
+// Hitag2 operations
+//-----------------------------------------------------------------------------
+
+static bool hitag2_write_page(uint8_t *rx, const size_t rxlen, uint8_t *tx, size_t *txlen) {
+       switch (writestate) {
+               case WRITE_STATE_START:
+                       tx[0] = HITAG2_WRITE_PAGE | (blocknr << 3) | ((blocknr^7) >> 2);
+                       tx[1] = ((blocknr^7) << 6);
+                       *txlen = 10;
+                       writestate = WRITE_STATE_PAGENUM_WRITTEN;
+                       break;
+               case WRITE_STATE_PAGENUM_WRITTEN:
+                       // Check if page number was received correctly
+                       if ((rxlen == 10)
+                                       && (rx[0] == (HITAG2_WRITE_PAGE | (blocknr << 3) | ((blocknr^7) >> 2)))
+                                       && (rx[1] == (((blocknr & 0x3) ^ 0x3) << 6))) {
+                               *txlen = 32;
+                               memset(tx, 0, HITAG_FRAME_LEN);
+                               memcpy(tx, writedata, 4);
+                               writestate = WRITE_STATE_PROG;
+                       } else {
+                               Dbprintf("hitag2_write_page: Page number was not received correctly: rxlen=%d rx=%02x%02x%02x%02x",
+                                               rxlen, rx[0], rx[1], rx[2], rx[3]);
+                               bSuccessful = false;
+                               return false;
+                       }
+                       break;
+               case WRITE_STATE_PROG:
+                       if (rxlen == 0) {
+                               bSuccessful = true;
+                       } else {
+                               bSuccessful = false;
+                               Dbprintf("hitag2_write_page: unexpected rx data (%d) after page write", rxlen);
+                       }
+                       return false;
+               default:
+                       DbpString("hitag2_write_page: Unknown state %d");
+                       bSuccessful = false;
+                       return false;
+       }
+
+       return true;
+}
+
+static bool hitag2_password(uint8_t *rx, const size_t rxlen, uint8_t *tx, size_t *txlen, bool write) {

        // Reset the transmission frame length
        *txlen = 0;
 
        // Reset the transmission frame length
        *txlen = 0;
 

-       // Try to find out which command was send by selecting on length (in bits)
-       switch (rxlen) {
-               // No answer, try to resurrect
-       case 0: {
-               // Stop if there is no answer (after sending password)
-               if (bPwd) {
-                       DbpString("Password failed!");
+       if (bPwd && !bAuthenticating && write) {
+               if (!hitag2_write_page(rx, rxlen, tx, txlen)) {

                        return false;
                }
                        return false;
                }

-               *txlen = 5;
-               memcpy(tx,"\xc0",nbytes(*txlen));
-       } break;
+       } else {
+               // Try to find out which command was send by selecting on length (in bits)
+               switch (rxlen) {
+                       // No answer, try to resurrect
+                       case 0: {
+                               // Stop if there is no answer (after sending password)
+                               if (bPwd) {
+                                       DbpString("Password failed!");
+                                       return false;
+                               }
+                               tx[0] = HITAG2_START_AUTH;
+                               *txlen = 5;
+                       }
+                       break;

 
 

-               // Received UID, tag password
-       case 32: {
-               if (!bPwd) {
-                       *txlen = 32;
-                       memcpy(tx,password,4);
-                       bPwd = true;
-                       memcpy(tag.sectors[blocknr],rx,4);
-                       blocknr++;
-               } else {
+                       // Received UID, tag password
+                       case 32: {
+                               if (!bPwd) {
+                                       bPwd = true;
+                                       bAuthenticating = true;
+                                       memcpy(tx, password, 4);
+                                       *txlen = 32;
+                               } else {
+                                       if (bAuthenticating) {
+                                               bAuthenticating = false;
+                                               if (write) {
+                                                       if (!hitag2_write_page(rx, rxlen, tx, txlen)) {
+                                                               return false;
+                                                       }
+                                                       break;
+                                               }
+                                       } else {
+                                               memcpy(tag.sectors[blocknr], rx, 4);
+                                               blocknr++;
+                                       }

 
 

-                       if(blocknr == 1){
-                               //store password in block1, the TAG answers with Block3, but we need the password in memory
-                               memcpy(tag.sectors[blocknr],tx,4);
-                       }else{
-                               memcpy(tag.sectors[blocknr],rx,4);
+                                       if (blocknr > 7) {
+                                               DbpString("Read successful!");
+                                               bSuccessful = true;
+                                               return false;
+                                       }
+                                       tx[0] = HITAG2_READ_PAGE | (blocknr << 3) | ((blocknr^7) >> 2);
+                                       tx[1] = ((blocknr^7) << 6);
+                                       *txlen = 10;
+                               }

                        }
                        }

+                       break;

 
 

-                       blocknr++;
-                       if (blocknr > 7) {
-                               DbpString("Read succesful!");
-                               bSuccessful = true;
+                       // Unexpected response
+                       default: {
+                               Dbprintf("Unknown frame length: %d", rxlen);

                                return false;
                        }
                                return false;
                        }

-                       *txlen = 10;
-                       tx[0] = 0xc0 | (blocknr << 3) | ((blocknr^7) >> 2);
-                       tx[1] = ((blocknr^7) << 6);
-               }
-       } break;
-
-               // Unexpected response
-       default: {
-               Dbprintf("Uknown frame length: %d",rxlen);
-               return false;
-       } break;
-       }
-       return true;
-}
-
-static bool hitag2_write_page(byte_t* rx, const size_t rxlen, byte_t* tx, size_t* txlen)
-{
-       switch (writestate) {
-       case WRITE_STATE_START:
-               *txlen = 10;
-               tx[0] = 0x82 | (blocknr << 3) | ((blocknr^7) >> 2);
-               tx[1] = ((blocknr^7) << 6);
-               writestate = WRITE_STATE_PAGENUM_WRITTEN;
-               break;
-       case WRITE_STATE_PAGENUM_WRITTEN:
-               // Check if page number was received correctly
-               if ((rxlen == 10) &&
-                       (rx[0] == (0x82 | (blocknr << 3) | ((blocknr^7) >> 2))) &&
-                       (rx[1] == (((blocknr & 0x3) ^ 0x3) << 6))) {
-                       *txlen = 32;
-                       memset(tx, 0, HITAG_FRAME_LEN);
-                       memcpy(tx, writedata, 4);
-                       writestate = WRITE_STATE_PROG;
-               } else {
-                       Dbprintf("hitag2_write_page: Page number was not received correctly: rxlen=%d rx=%02x%02x%02x%02x",
-                                rxlen, rx[0], rx[1], rx[2], rx[3]);
-                       bSuccessful = false;
-                       return false;
-               }
-               break;
-       case WRITE_STATE_PROG:
-               if (rxlen == 0) {
-                       bSuccessful = true;
-               } else {
-                       bSuccessful = false;
-                       Dbprintf("hitag2_write_page: unexpected rx data (%d) after page write", rxlen);
+                       break;

                }
                }

-               return false;
-       default:
-               DbpString("hitag2_write_page: Unknown state %d");
-               bSuccessful = false;
-               return false;

        }
 
        return true;
 }
 
        }
 
        return true;
 }
 

-static bool hitag2_crypto(byte_t* rx, const size_t rxlen, byte_t* tx, size_t* txlen, bool write) {
+static bool hitag2_crypto(uint8_t *rx, const size_t rxlen, uint8_t *tx, size_t *txlen, bool write) {

        // Reset the transmission frame length
        *txlen = 0;
 
        // Reset the transmission frame length
        *txlen = 0;
 

-       if(bCrypto) {
-               hitag2_cipher_transcrypt(&cipher_state,rx,rxlen/8,rxlen%8);
-
+       if (bCrypto) {
+               hitag2_cipher_transcrypt(&cipher_state, rx, rxlen/8, rxlen%8);

        }
 
        if (bCrypto && !bAuthenticating && write) {
                if (!hitag2_write_page(rx, rxlen, tx, txlen)) {
                        return false;
                }
        }
 
        if (bCrypto && !bAuthenticating && write) {
                if (!hitag2_write_page(rx, rxlen, tx, txlen)) {
                        return false;
                }

-       }
-       else
-       {
+       } else {

 
 

-       // Try to find out which command was send by selecting on length (in bits)
-       switch (rxlen) {
-               // No answer, try to resurrect
-       case 0:
-       {
-               // Stop if there is no answer while we are in crypto mode (after sending NrAr)
-               if (bCrypto) {
-                       // Failed during authentication
-                       if (bAuthenticating) {
-                               DbpString("Authentication failed!");
-                               return false;
-                       } else {
-                               // Failed reading a block, could be (read/write) locked, skip block and re-authenticate
-                               if (blocknr == 1) {
-                                       // Write the low part of the key in memory
-                                       memcpy(tag.sectors[1],key+2,4);
-                               } else if (blocknr == 2) {
-                                       // Write the high part of the key in memory
-                                       tag.sectors[2][0] = 0x00;
-                                       tag.sectors[2][1] = 0x00;
-                                       tag.sectors[2][2] = key[0];
-                                       tag.sectors[2][3] = key[1];
+               // Try to find out which command was send by selecting on length (in bits)
+               switch (rxlen) {
+                       // No answer, try to resurrect
+                       case 0: {
+                               // Stop if there is no answer while we are in crypto mode (after sending NrAr)
+                               if (bCrypto) {
+                                       // Failed during authentication
+                                       if (bAuthenticating) {
+                                               DbpString("Authentication failed!");
+                                               return false;
+                                       } else {
+                                               // Failed reading a block, could be (read/write) locked, skip block and re-authenticate
+                                               if (blocknr == 1) {
+                                                       // Write the low part of the key in memory
+                                                       memcpy(tag.sectors[1], key+2, 4);
+                                               } else if (blocknr == 2) {
+                                                       // Write the high part of the key in memory
+                                                       tag.sectors[2][0] = 0x00;
+                                                       tag.sectors[2][1] = 0x00;
+                                                       tag.sectors[2][2] = key[0];
+                                                       tag.sectors[2][3] = key[1];
+                                               } else {
+                                                       // Just put zero's in the memory (of the unreadable block)
+                                                       memset(tag.sectors[blocknr], 0x00, 4);
+                                               }
+                                               blocknr++;
+                                               bCrypto = false;
+                                       }

                                } else {
                                } else {

-                                       // Just put zero's in the memory (of the unreadable block)
-                                       memset(tag.sectors[blocknr],0x00,4);
+                                       tx[0] = HITAG2_START_AUTH;
+                                       *txlen = 5;

                                }
                                }

-                               blocknr++;
-                               bCrypto = false;
+                               break;

                        }
                        }

-               } else {
-                       *txlen = 5;
-                       memcpy(tx,"\xc0",nbytes(*txlen));
-               }
-       break;
-       }
-       // Received UID, crypto tag answer
-       case 32: {
-               if (!bCrypto) {
-                       uint64_t ui64key = key[0] | ((uint64_t)key[1]) << 8 | ((uint64_t)key[2]) << 16 | ((uint64_t)key[3]) << 24 | ((uint64_t)key[4]) << 32 | ((uint64_t)key[5]) << 40;
-                       uint32_t ui32uid = rx[0] | ((uint32_t)rx[1]) << 8 | ((uint32_t)rx[2]) << 16 | ((uint32_t)rx[3]) << 24;
-                       Dbprintf("hitag2_crypto: key=0x%x%x uid=0x%x", (uint32_t) ((rev64(ui64key)) >> 32), (uint32_t) ((rev64(ui64key)) & 0xffffffff), rev32(ui32uid));
-                       cipher_state = _hitag2_init(rev64(ui64key), rev32(ui32uid), 0);
-                       memset(tx,0x00,4);
-                       memset(tx+4,0xff,4);
-                       hitag2_cipher_transcrypt(&cipher_state, tx+4, 4, 0);
-                       *txlen = 64;
-                       bCrypto = true;
-                       bAuthenticating = true;
-               } else {
-                       // Check if we received answer tag (at)
-                       if (bAuthenticating) {
-                               bAuthenticating = false;
-                               if (write) {
-                                       if (!hitag2_write_page(rx, rxlen, tx, txlen)) {
+                       // Received UID, crypto tag answer
+                       case 32: {
+                               if (!bCrypto) {
+                                       uint64_t ui64key = key[0] | ((uint64_t)key[1]) << 8 | ((uint64_t)key[2]) << 16 | ((uint64_t)key[3]) << 24 | ((uint64_t)key[4]) << 32 | ((uint64_t)key[5]) << 40;
+                                       uint32_t ui32uid = rx[0] | ((uint32_t)rx[1]) << 8 | ((uint32_t)rx[2]) << 16 | ((uint32_t)rx[3]) << 24;
+                                       Dbprintf("hitag2_crypto: key=0x%x%x uid=0x%x", (uint32_t) ((REV64(ui64key)) >> 32), (uint32_t) ((REV64(ui64key)) & 0xffffffff), REV32(ui32uid));
+                                       cipher_state = _hitag2_init(REV64(ui64key), REV32(ui32uid), 0);
+                                       memset(tx, 0x00, 4);
+                                       memset(tx+4, 0xff, 4);
+                                       hitag2_cipher_transcrypt(&cipher_state, tx+4, 4, 0);
+                                       *txlen = 64;
+                                       bCrypto = true;
+                                       bAuthenticating = true;
+                               } else {
+                                       // Check if we received answer tag (at)
+                                       if (bAuthenticating) {
+                                               bAuthenticating = false;
+                                               if (write) {
+                                                       if (!hitag2_write_page(rx, rxlen, tx, txlen)) {
+                                                               return false;
+                                                       }
+                                                       break;
+                                               }
+                                       }
+                                       // stage 2+, got data block
+                                       else {
+                                               // Store the received block
+                                               memcpy(tag.sectors[blocknr], rx, 4);
+                                               blocknr++;
+                                       }
+                                       if (blocknr > 7) {
+                                               DbpString("Read successful!");
+                                               bSuccessful = true;

                                                return false;
                                                return false;

+                                       } else {
+                                               tx[0] = HITAG2_READ_PAGE | (blocknr << 3) | ((blocknr ^ 7) >> 2);
+                                               tx[1] = ((blocknr ^ 7) << 6);
+                                               *txlen = 10;

                                        }
                                        }

-                                       break;

                                }
                                }

-                       } else {
-                               // Store the received block
-                               memcpy(tag.sectors[blocknr],rx,4);
-                               blocknr++;

                        }
                        }

+                       break;

 
 

-                       if (blocknr > 7) {
-                               DbpString("Read succesful!");
-                               bSuccessful = true;
+                       // Unexpected response
+                       default: {
+                               Dbprintf("Unknown frame length: %d",rxlen);

                                return false;
                                return false;

-                       } else {
-                               *txlen = 10;
-                               tx[0] = 0xc0 | (blocknr << 3) | ((blocknr^7) >> 2);
-                               tx[1] = ((blocknr^7) << 6);

                        }
                        }

+                       break;

                }
                }

-       } break;
-
-               // Unexpected response
-       default: {
-               Dbprintf("Uknown frame length: %d",rxlen);
-               return false;
-       } break;
-       }

        }
 
        }
 

-       if(bCrypto) {
+       if (bCrypto) {

                // We have to return now to avoid double encryption
                if (!bAuthenticating) {
                // We have to return now to avoid double encryption
                if (!bAuthenticating) {

-                       hitag2_cipher_transcrypt(&cipher_state,tx,*txlen/8,*txlen%8);
+                       hitag2_cipher_transcrypt(&cipher_state, tx, *txlen/8, *txlen%8);

                }
        }
 
        return true;
 }
 
                }
        }
 
        return true;
 }
 

-
-static bool hitag2_authenticate(byte_t* rx, const size_t rxlen, byte_t* tx, size_t* txlen) {
+static bool hitag2_authenticate(uint8_t *rx, const size_t rxlen, uint8_t *tx, size_t *txlen) {

        // Reset the transmission frame length
        *txlen = 0;
 
        // Try to find out which command was send by selecting on length (in bits)
        switch (rxlen) {
                // No answer, try to resurrect
        // Reset the transmission frame length
        *txlen = 0;
 
        // Try to find out which command was send by selecting on length (in bits)
        switch (rxlen) {
                // No answer, try to resurrect

-       case 0: {
-               // Stop if there is no answer while we are in crypto mode (after sending NrAr)
-               if (bCrypto) {
-                       DbpString("Authentication failed!");
-                       return false;
+               case 0: {
+                       // Stop if there is no answer while we are in crypto mode (after sending NrAr)
+                       if (bCrypto) {
+                               DbpString("Authentication failed!");
+                               return false;
+                       }
+                       tx[0] = HITAG2_START_AUTH;
+                       *txlen = 5;

                }
                }

-               *txlen = 5;
-               memcpy(tx,"\xc0",nbytes(*txlen));
-       } break;
+               break;

 
                // Received UID, crypto tag answer
 
                // Received UID, crypto tag answer

-       case 32: {
-               if (!bCrypto) {
-                       *txlen = 64;
-                       memcpy(tx,NrAr,8);
-                       bCrypto = true;
-               } else {
-                       DbpString("Authentication succesful!");
-                       // We are done... for now
-                       return false;
+               case 32: {
+                       if (!bCrypto) {
+                               memcpy(tx, NrAr, 8);
+                               *txlen = 64;
+                               bCrypto = true;
+                       } else {
+                               DbpString("Authentication successful!");
+                               // We are done... for now
+                               return false;
+                       }

                }
                }

-       } break;
+               break;

 
                // Unexpected response
 
                // Unexpected response

-       default: {
-               Dbprintf("Uknown frame length: %d",rxlen);
-               return false;
-       } break;
+               default: {
+                       Dbprintf("Unknown frame length: %d",rxlen);
+                       return false;
+               }
+               break;

        }
 
        return true;
 }
 
        }
 
        return true;
 }
 

-
-static bool hitag2_test_auth_attempts(byte_t* rx, const size_t rxlen, byte_t* tx, size_t* txlen) {
+static bool hitag2_test_auth_attempts(uint8_t *rx, const size_t rxlen, uint8_t *tx, size_t *txlen) {

 
        // Reset the transmission frame length
        *txlen = 0;
 
        // Reset the transmission frame length
        *txlen = 0;


@@ -722,93 +709,99 @@ static bool hitag2_test_auth_attempts(byte_t* rx, const size_t rxlen, byte_t* tx
        // Try to find out which command was send by selecting on length (in bits)
        switch (rxlen) {
                // No answer, try to resurrect
        // Try to find out which command was send by selecting on length (in bits)
        switch (rxlen) {
                // No answer, try to resurrect

-       case 0: {
-               // Stop if there is no answer while we are in crypto mode (after sending NrAr)
-               if (bCrypto) {
-                       Dbprintf("auth: %02x%02x%02x%02x%02x%02x%02x%02x Failed, removed entry!",NrAr[0],NrAr[1],NrAr[2],NrAr[3],NrAr[4],NrAr[5],NrAr[6],NrAr[7]);
+               case 0: {
+                       // Stop if there is no answer while we are in crypto mode (after sending NrAr)
+                       if (bCrypto) {
+                               Dbprintf("auth: %02x%02x%02x%02x%02x%02x%02x%02x Failed, removed entry!", NrAr[0], NrAr[1], NrAr[2], NrAr[3], NrAr[4], NrAr[5], NrAr[6], NrAr[7]);

 
 

-                       // Removing failed entry from authentiations table
-                       memcpy(auth_table+auth_table_pos,auth_table+auth_table_pos+8,8);
-                       auth_table_len -= 8;
+                               // Removing failed entry from authentiations table
+                               memcpy(auth_table+auth_table_pos, auth_table+auth_table_pos+8, 8);
+                               auth_table_len -= 8;

 
 

-                       // Return if we reached the end of the authentications table
-                       bCrypto = false;
-                       if (auth_table_pos == auth_table_len) {
-                               return false;
-                       }
+                               // Return if we reached the end of the authentications table
+                               bCrypto = false;
+                               if (auth_table_pos == auth_table_len) {
+                                       return false;
+                               }

 
 

-                       // Copy the next authentication attempt in row (at the same position, b/c we removed last failed entry)
-                       memcpy(NrAr,auth_table+auth_table_pos,8);
+                               // Copy the next authentication attempt in row (at the same position, b/c we removed last failed entry)
+                               memcpy(NrAr, auth_table+auth_table_pos, 8);
+                       }
+                       tx[0] = HITAG2_START_AUTH;
+                       *txlen = 5;

                }
                }

-               *txlen = 5;
-               memcpy(tx,"\xc0",nbytes(*txlen));
-       }   break;
+               break;

 
                // Received UID, crypto tag answer, or read block response
 
                // Received UID, crypto tag answer, or read block response

-       case 32: {
-               if (!bCrypto) {
-                       *txlen = 64;
-                       memcpy(tx,NrAr,8);
-                       bCrypto = true;
-               } else {
-                       Dbprintf("auth: %02x%02x%02x%02x%02x%02x%02x%02x OK",NrAr[0],NrAr[1],NrAr[2],NrAr[3],NrAr[4],NrAr[5],NrAr[6],NrAr[7]);
-                       bCrypto = false;
-                       if ((auth_table_pos+8) == auth_table_len) {
-                               return false;
+               case 32: {
+                       if (!bCrypto) {
+                               *txlen = 64;
+                               memcpy(tx, NrAr, 8);
+                               bCrypto = true;
+                       } else {
+                               Dbprintf("auth: %02x%02x%02x%02x%02x%02x%02x%02x OK", NrAr[0], NrAr[1], NrAr[2], NrAr[3], NrAr[4], NrAr[5], NrAr[6], NrAr[7]);
+                               bCrypto = false;
+                               if ((auth_table_pos+8) == auth_table_len) {
+                                       return false;
+                               }
+                               auth_table_pos += 8;
+                               memcpy(NrAr, auth_table+auth_table_pos, 8);

                        }
                        }

-                       auth_table_pos += 8;
-                       memcpy(NrAr,auth_table+auth_table_pos,8);

                }
                }

-       } break;
+               break;

 
 

-       default: {
-               Dbprintf("Uknown frame length: %d",rxlen);
-               return false;
-       } break;
+               default: {
+                       Dbprintf("Unknown frame length: %d",rxlen);
+                       return false;
+               }
+               break;

        }
 
        return true;
 }
 
        }
 
        return true;
 }
 

-static bool hitag2_read_uid(byte_t* rx, const size_t rxlen, byte_t* tx, size_t* txlen) {
+static bool hitag2_read_uid(uint8_t *rx, const size_t rxlen, uint8_t *tx, size_t *txlen) {

        // Reset the transmission frame length
        *txlen = 0;
 
        // Try to find out which command was send by selecting on length (in bits)
        switch (rxlen) {
                // No answer, try to resurrect
        // Reset the transmission frame length
        *txlen = 0;
 
        // Try to find out which command was send by selecting on length (in bits)
        switch (rxlen) {
                // No answer, try to resurrect

-       case 0: {
-               // Just starting or if there is no answer
-               *txlen = 5;
-               memcpy(tx,"\xc0",nbytes(*txlen));
-       } break;
+               case 0: {
+                       // Just starting or if there is no answer
+                       tx[0] = HITAG2_START_AUTH;
+                       *txlen = 5;
+               }
+               break;

                // Received UID
                // Received UID

-       case 32: {
-               // Check if we received answer tag (at)
-               if (bAuthenticating) {
-                       bAuthenticating = false;
-               } else {
-                       // Store the received block
-                       memcpy(tag.sectors[blocknr],rx,4);
-                       blocknr++;
+               case 32: {
+                       // Check if we received answer tag (at)
+                       if (bAuthenticating) {
+                               bAuthenticating = false;
+                       } else {
+                               // Store the received block
+                               memcpy(tag.sectors[blocknr], rx, 4);
+                               blocknr++;
+                       }
+                       if (blocknr > 0) {
+                               //DbpString("Read successful!");
+                               bSuccessful = true;
+                               return false;
+                       }

                }
                }

-               if (blocknr > 0) {
-                       //DbpString("Read successful!");
-                       bSuccessful = true;
+               break;
+               // Unexpected response
+               default: {
+                       Dbprintf("Unknown frame length: %d",rxlen);

                        return false;
                }
                        return false;
                }

-       } break;
-               // Unexpected response
-       default: {
-               Dbprintf("Uknown frame length: %d",rxlen);
-               return false;
-       } break;
+               break;

        }
        return true;
 }
 
 void SnoopHitag(uint32_t type) {
        }
        return true;
 }
 
 void SnoopHitag(uint32_t type) {

-       int frame_count;
+       // int frame_count;

        int response;
        int overflow;
        bool rising_edge;
        int response;
        int overflow;
        bool rising_edge;


@@ -816,8 +809,8 @@ void SnoopHitag(uint32_t type) {
        int lastbit;
        bool bSkip;
        int tag_sof;
        int lastbit;
        bool bSkip;
        int tag_sof;

-       byte_t rx[HITAG_FRAME_LEN] = {0};
-       size_t rxlen=0;
+       uint8_t rx[HITAG_FRAME_LEN] = {0};
+       size_t rxlen = 0;

 
        FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
 
 
        FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
 


@@ -829,7 +822,7 @@ void SnoopHitag(uint32_t type) {
        auth_table_pos = 0;
 
        BigBuf_free();
        auth_table_pos = 0;
 
        BigBuf_free();

-       auth_table = (byte_t *)BigBuf_malloc(AUTH_TABLE_LENGTH);
+       auth_table = (uint8_t *)BigBuf_malloc(AUTH_TABLE_LENGTH);

        memset(auth_table, 0x00, AUTH_TABLE_LENGTH);
 
        DbpString("Starting Hitag2 snoop");
        memset(auth_table, 0x00, AUTH_TABLE_LENGTH);
 
        DbpString("Starting Hitag2 snoop");


@@ -840,7 +833,6 @@ void SnoopHitag(uint32_t type) {
        FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_EDGE_DETECT  | FPGA_LF_EDGE_DETECT_TOGGLE_MODE);
        FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 95); //125Khz
        SetAdcMuxFor(GPIO_MUXSEL_LOPKD);
        FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_EDGE_DETECT  | FPGA_LF_EDGE_DETECT_TOGGLE_MODE);
        FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 95); //125Khz
        SetAdcMuxFor(GPIO_MUXSEL_LOPKD);

-       RELAY_OFF();

 
        // Configure output pin that is connected to the FPGA (for modulating)
        AT91C_BASE_PIOA->PIO_OER = GPIO_SSC_DOUT;
 
        // Configure output pin that is connected to the FPGA (for modulating)
        AT91C_BASE_PIOA->PIO_OER = GPIO_SSC_DOUT;


@@ -858,14 +850,13 @@ void SnoopHitag(uint32_t type) {
 
        // TC1: Capture mode, default timer source = MCK/2 (TIMER_CLOCK1), TIOA is external trigger,
        // external trigger rising edge, load RA on rising edge of TIOA.
 
        // TC1: Capture mode, default timer source = MCK/2 (TIMER_CLOCK1), TIOA is external trigger,
        // external trigger rising edge, load RA on rising edge of TIOA.

-       uint32_t t1_channel_mode = AT91C_TC_CLKS_TIMER_DIV1_CLOCK | AT91C_TC_ETRGEDG_BOTH | AT91C_TC_ABETRG | AT91C_TC_LDRA_BOTH;
-       AT91C_BASE_TC1->TC_CMR = t1_channel_mode;
+       AT91C_BASE_TC1->TC_CMR = AT91C_TC_CLKS_TIMER_DIV1_CLOCK | AT91C_TC_ETRGEDG_BOTH | AT91C_TC_ABETRG | AT91C_TC_LDRA_BOTH;

 
        // Enable and reset counter
        AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
 
        // Reset the received frame, frame count and timing info
 
        // Enable and reset counter
        AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
 
        // Reset the received frame, frame count and timing info

-       frame_count = 0;
+       // frame_count = 0;

        response = 0;
        overflow = 0;
        reader_frame = false;
        response = 0;
        overflow = 0;
        reader_frame = false;


@@ -873,14 +864,14 @@ void SnoopHitag(uint32_t type) {
        bSkip = true;
        tag_sof = 4;
 
        bSkip = true;
        tag_sof = 4;
 

-       while(!BUTTON_PRESS()) {
+       while (!BUTTON_PRESS()) {

                // Watchdog hit
                WDT_HIT();
 
                // Receive frame, watch for at most T0*EOF periods
                while (AT91C_BASE_TC1->TC_CV < T0*HITAG_T_EOF) {
                        // Check if rising edge in modulation is detected
                // Watchdog hit
                WDT_HIT();
 
                // Receive frame, watch for at most T0*EOF periods
                while (AT91C_BASE_TC1->TC_CV < T0*HITAG_T_EOF) {
                        // Check if rising edge in modulation is detected

-                       if(AT91C_BASE_TC1->TC_SR & AT91C_TC_LDRAS) {
+                       if (AT91C_BASE_TC1->TC_SR & AT91C_TC_LDRAS) {

                                // Retrieve the new timing values
                                int ra = (AT91C_BASE_TC1->TC_RA/T0);
 
                                // Retrieve the new timing values
                                int ra = (AT91C_BASE_TC1->TC_RA/T0);
 


@@ -892,7 +883,7 @@ void SnoopHitag(uint32_t type) {
                                        // Switch from tag to reader capture
                                        LED_C_OFF();
                                        reader_frame = true;
                                        // Switch from tag to reader capture
                                        LED_C_OFF();
                                        reader_frame = true;

-                                       memset(rx,0x00,sizeof(rx));
+                                       memset(rx, 0x00, sizeof(rx));

                                        rxlen = 0;
                                }
 
                                        rxlen = 0;
                                }
 


@@ -909,17 +900,17 @@ void SnoopHitag(uint32_t type) {
                                if (reader_frame) {
                                        LED_B_ON();
                                        // Capture reader frame
                                if (reader_frame) {
                                        LED_B_ON();
                                        // Capture reader frame

-                                       if(ra >= HITAG_T_STOP) {
+                                       if (ra >= HITAG_T_STOP) {

                                                if (rxlen != 0) {
                                                        //DbpString("wierd0?");
                                                }
                                                // Capture the T0 periods that have passed since last communication or field drop (reset)
                                                response = (ra - HITAG_T_LOW);
                                                if (rxlen != 0) {
                                                        //DbpString("wierd0?");
                                                }
                                                // Capture the T0 periods that have passed since last communication or field drop (reset)
                                                response = (ra - HITAG_T_LOW);

-                                       } else if(ra >= HITAG_T_1_MIN ) {
+                                       } else if (ra >= HITAG_T_1_MIN) {

                                                // '1' bit
                                                rx[rxlen / 8] |= 1 << (7-(rxlen%8));
                                                rxlen++;
                                                // '1' bit
                                                rx[rxlen / 8] |= 1 << (7-(rxlen%8));
                                                rxlen++;

-                                       } else if(ra >= HITAG_T_0_MIN) {
+                                       } else if (ra >= HITAG_T_0_MIN) {

                                                // '0' bit
                                                rx[rxlen / 8] |= 0 << (7-(rxlen%8));
                                                rxlen++;
                                                // '0' bit
                                                rx[rxlen / 8] |= 0 << (7-(rxlen%8));
                                                rxlen++;


@@ -929,20 +920,20 @@ void SnoopHitag(uint32_t type) {
                                } else {
                                        LED_C_ON();
                                        // Capture tag frame (manchester decoding using only falling edges)
                                } else {
                                        LED_C_ON();
                                        // Capture tag frame (manchester decoding using only falling edges)

-                                       if(ra >= HITAG_T_EOF) {
+                                       if (ra >= HITAG_T_EOF) {

                                                if (rxlen != 0) {
                                                        //DbpString("wierd1?");
                                                }
                                                // Capture the T0 periods that have passed since last communication or field drop (reset)
                                                // We always recieve a 'one' first, which has the falling edge after a half period |-_|
                                                if (rxlen != 0) {
                                                        //DbpString("wierd1?");
                                                }
                                                // Capture the T0 periods that have passed since last communication or field drop (reset)
                                                // We always recieve a 'one' first, which has the falling edge after a half period |-_|

-                                               response = ra-HITAG_T_TAG_HALF_PERIOD;
-                                       } else if(ra >= HITAG_T_TAG_CAPTURE_FOUR_HALF) {
+                                               response = ra - HITAG_T_TAG_HALF_PERIOD;
+                                       } else if (ra >= HITAG_T_TAG_CAPTURE_FOUR_HALF) {

                                                // Manchester coding example |-_|_-|-_| (101)
                                                rx[rxlen / 8] |= 0 << (7-(rxlen%8));
                                                rxlen++;
                                                rx[rxlen / 8] |= 1 << (7-(rxlen%8));
                                                rxlen++;
                                                // Manchester coding example |-_|_-|-_| (101)
                                                rx[rxlen / 8] |= 0 << (7-(rxlen%8));
                                                rxlen++;
                                                rx[rxlen / 8] |= 1 << (7-(rxlen%8));
                                                rxlen++;

-                                       } else if(ra >= HITAG_T_TAG_CAPTURE_THREE_HALF) {
+                                       } else if (ra >= HITAG_T_TAG_CAPTURE_THREE_HALF) {

                                                // Manchester coding example |_-|...|_-|-_| (0...01)
                                                rx[rxlen / 8] |= 0 << (7-(rxlen%8));
                                                rxlen++;
                                                // Manchester coding example |_-|...|_-|-_| (0...01)
                                                rx[rxlen / 8] |= 0 << (7-(rxlen%8));
                                                rxlen++;


@@ -953,7 +944,7 @@ void SnoopHitag(uint32_t type) {
                                                }
                                                lastbit = !lastbit;
                                                bSkip = !bSkip;
                                                }
                                                lastbit = !lastbit;
                                                bSkip = !bSkip;

-                                       } else if(ra >= HITAG_T_TAG_CAPTURE_TWO_HALF) {
+                                       } else if (ra >= HITAG_T_TAG_CAPTURE_TWO_HALF) {

                                                // Manchester coding example |_-|_-| (00) or |-_|-_| (11)
                                                if (tag_sof) {
                                                        // Ignore bits that are transmitted during SOF
                                                // Manchester coding example |_-|_-| (00) or |-_|-_| (11)
                                                if (tag_sof) {
                                                        // Ignore bits that are transmitted during SOF


@@ -971,9 +962,9 @@ void SnoopHitag(uint32_t type) {
                }
 
                // Check if frame was captured
                }
 
                // Check if frame was captured

-               if(rxlen > 0) {
-                       frame_count++;
-                       if (!LogTraceHitag(rx,rxlen,response,0,reader_frame)) {
+               if (rxlen > 0) {
+                       // frame_count++;
+                       if (!LogTraceHitag(rx, rxlen, response, 0, reader_frame)) {

                                DbpString("Trace full");
                                break;
                        }
                                DbpString("Trace full");
                                break;
                        }


@@ -988,7 +979,7 @@ void SnoopHitag(uint32_t type) {
                        }
 
                        // Reset the received frame and response timing info
                        }
 
                        // Reset the received frame and response timing info

-                       memset(rx,0x00,sizeof(rx));
+                       memset(rx, 0x00, sizeof(rx));

                        response = 0;
                        reader_frame = false;
                        lastbit = 1;
                        response = 0;
                        reader_frame = false;
                        lastbit = 1;


@@ -1021,14 +1012,14 @@ void SnoopHitag(uint32_t type) {
 //  DbpString("All done");
 }
 
 //  DbpString("All done");
 }
 

-void SimulateHitagTag(bool tag_mem_supplied, byte_t* data) {
-       int frame_count;
+void SimulateHitagTag(bool tag_mem_supplied, uint8_t *data) {
+       // int frame_count;

        int response;
        int overflow;
        int response;
        int overflow;

-       byte_t rx[HITAG_FRAME_LEN];
-       size_t rxlen=0;
-       byte_t tx[HITAG_FRAME_LEN];
-       size_t txlen=0;
+       uint8_t rx[HITAG_FRAME_LEN];
+       size_t rxlen = 0;
+       uint8_t tx[HITAG_FRAME_LEN];
+       size_t txlen = 0;

        bool bQuitTraceFull = false;
        bQuiet = false;
 
        bool bQuitTraceFull = false;
        bQuiet = false;
 


@@ -1040,9 +1031,9 @@ void SimulateHitagTag(bool tag_mem_supplied, byte_t* data) {
 
        auth_table_len = 0;
        auth_table_pos = 0;
 
        auth_table_len = 0;
        auth_table_pos = 0;

-       byte_t* auth_table;
+       uint8_t *auth_table;

        BigBuf_free();
        BigBuf_free();

-       auth_table = (byte_t *)BigBuf_malloc(AUTH_TABLE_LENGTH);
+       auth_table = BigBuf_malloc(AUTH_TABLE_LENGTH);

        memset(auth_table, 0x00, AUTH_TABLE_LENGTH);
 
        DbpString("Starting Hitag2 simulation");
        memset(auth_table, 0x00, AUTH_TABLE_LENGTH);
 
        DbpString("Starting Hitag2 simulation");


@@ -1051,16 +1042,16 @@ void SimulateHitagTag(bool tag_mem_supplied, byte_t* data) {
 
        if (tag_mem_supplied) {
                DbpString("Loading hitag2 memory...");
 
        if (tag_mem_supplied) {
                DbpString("Loading hitag2 memory...");

-               memcpy((byte_t*)tag.sectors,data,48);
+               memcpy((uint8_t*)tag.sectors, data, 48);

        }
 
        uint32_t block = 0;
        }
 
        uint32_t block = 0;

-       for (size_t i=0; i<12; i++) {
-               for (size_t j=0; j<4; j++) {
+       for (size_t i = 0; i < 12; i++) {
+               for (size_t j = 0; j < 4; j++) {

                        block <<= 8;
                        block |= tag.sectors[i][j];
                }
                        block <<= 8;
                        block |= tag.sectors[i][j];
                }

-               Dbprintf("| %d | %08x |",i,block);
+               Dbprintf("| %d | %08x |", i, block);

        }
 
        // Set up simulator mode, frequency divisor which will drive the FPGA
        }
 
        // Set up simulator mode, frequency divisor which will drive the FPGA


@@ -1068,7 +1059,6 @@ void SimulateHitagTag(bool tag_mem_supplied, byte_t* data) {
        FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_EDGE_DETECT);
        FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 95); //125Khz
        SetAdcMuxFor(GPIO_MUXSEL_LOPKD);
        FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_EDGE_DETECT);
        FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 95); //125Khz
        SetAdcMuxFor(GPIO_MUXSEL_LOPKD);

-       RELAY_OFF();

 
        // Configure output pin that is connected to the FPGA (for modulating)
        AT91C_BASE_PIOA->PIO_OER = GPIO_SSC_DOUT;
 
        // Configure output pin that is connected to the FPGA (for modulating)
        AT91C_BASE_PIOA->PIO_OER = GPIO_SSC_DOUT;


@@ -1096,22 +1086,22 @@ void SimulateHitagTag(bool tag_mem_supplied, byte_t* data) {
        AT91C_BASE_TC1->TC_CMR = AT91C_TC_CLKS_TIMER_DIV1_CLOCK | AT91C_TC_ETRGEDG_RISING | AT91C_TC_ABETRG | AT91C_TC_LDRA_RISING;
 
        // Reset the received frame, frame count and timing info
        AT91C_BASE_TC1->TC_CMR = AT91C_TC_CLKS_TIMER_DIV1_CLOCK | AT91C_TC_ETRGEDG_RISING | AT91C_TC_ABETRG | AT91C_TC_LDRA_RISING;
 
        // Reset the received frame, frame count and timing info

-       memset(rx,0x00,sizeof(rx));
-       frame_count = 0;
+       memset(rx, 0x00, sizeof(rx));
+       // frame_count = 0;

        response = 0;
        overflow = 0;
 
        // Enable and reset counter
        AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
 
        response = 0;
        overflow = 0;
 
        // Enable and reset counter
        AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
 

-       while(!BUTTON_PRESS()) {
+       while (!BUTTON_PRESS()) {

                // Watchdog hit
                WDT_HIT();
 
                // Receive frame, watch for at most T0*EOF periods
                while (AT91C_BASE_TC1->TC_CV < T0*HITAG_T_EOF) {
                        // Check if rising edge in modulation is detected
                // Watchdog hit
                WDT_HIT();
 
                // Receive frame, watch for at most T0*EOF periods
                while (AT91C_BASE_TC1->TC_CV < T0*HITAG_T_EOF) {
                        // Check if rising edge in modulation is detected

-                       if(AT91C_BASE_TC1->TC_SR & AT91C_TC_LDRAS) {
+                       if (AT91C_BASE_TC1->TC_SR & AT91C_TC_LDRAS) {

                                // Retrieve the new timing values
                                int ra = (AT91C_BASE_TC1->TC_RA/T0) + overflow;
                                overflow = 0;
                                // Retrieve the new timing values
                                int ra = (AT91C_BASE_TC1->TC_RA/T0) + overflow;
                                overflow = 0;


@@ -1122,17 +1112,17 @@ void SimulateHitagTag(bool tag_mem_supplied, byte_t* data) {
                                LED_B_ON();
 
                                // Capture reader frame
                                LED_B_ON();
 
                                // Capture reader frame

-                               if(ra >= HITAG_T_STOP) {
+                               if (ra >= HITAG_T_STOP) {

                                        if (rxlen != 0) {
                                                //DbpString("wierd0?");
                                        }
                                        // Capture the T0 periods that have passed since last communication or field drop (reset)
                                        response = (ra - HITAG_T_LOW);
                                        if (rxlen != 0) {
                                                //DbpString("wierd0?");
                                        }
                                        // Capture the T0 periods that have passed since last communication or field drop (reset)
                                        response = (ra - HITAG_T_LOW);

-                               } else if(ra >= HITAG_T_1_MIN ) {
+                               } else if (ra >= HITAG_T_1_MIN) {

                                        // '1' bit
                                        rx[rxlen / 8] |= 1 << (7-(rxlen%8));
                                        rxlen++;
                                        // '1' bit
                                        rx[rxlen / 8] |= 1 << (7-(rxlen%8));
                                        rxlen++;

-                               } else if(ra >= HITAG_T_0_MIN) {
+                               } else if (ra >= HITAG_T_0_MIN) {

                                        // '0' bit
                                        rx[rxlen / 8] |= 0 << (7-(rxlen%8));
                                        rxlen++;
                                        // '0' bit
                                        rx[rxlen / 8] |= 0 << (7-(rxlen%8));
                                        rxlen++;


@@ -1143,10 +1133,10 @@ void SimulateHitagTag(bool tag_mem_supplied, byte_t* data) {
                }
 
                // Check if frame was captured
                }
 
                // Check if frame was captured

-               if(rxlen > 4) {
-                       frame_count++;
+               if (rxlen > 4) {
+                       // frame_count++;

                        if (!bQuiet) {
                        if (!bQuiet) {

-                               if (!LogTraceHitag(rx,rxlen,response,0,true)) {
+                               if (!LogTraceHitag(rx, rxlen, response, 0, true)) {

                                        DbpString("Trace full");
                                        if (bQuitTraceFull) {
                                                break;
                                        DbpString("Trace full");
                                        if (bQuitTraceFull) {
                                                break;


@@ -1160,22 +1150,22 @@ void SimulateHitagTag(bool tag_mem_supplied, byte_t* data) {
                        AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
 
                        // Process the incoming frame (rx) and prepare the outgoing frame (tx)
                        AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
 
                        // Process the incoming frame (rx) and prepare the outgoing frame (tx)

-                       hitag2_handle_reader_command(rx,rxlen,tx,&txlen);
+                       hitag2_handle_reader_command(rx, rxlen, tx, &txlen);

 
                        // Wait for HITAG_T_WAIT_1 carrier periods after the last reader bit,
                        // not that since the clock counts since the rising edge, but T_Wait1 is
                        // with respect to the falling edge, we need to wait actually (T_Wait1 - T_Low)
                        // periods. The gap time T_Low varies (4..10). All timer values are in
                        // terms of T0 units
 
                        // Wait for HITAG_T_WAIT_1 carrier periods after the last reader bit,
                        // not that since the clock counts since the rising edge, but T_Wait1 is
                        // with respect to the falling edge, we need to wait actually (T_Wait1 - T_Low)
                        // periods. The gap time T_Low varies (4..10). All timer values are in
                        // terms of T0 units

-                       while(AT91C_BASE_TC0->TC_CV < T0*(HITAG_T_WAIT_1-HITAG_T_LOW));
+                       while (AT91C_BASE_TC0->TC_CV < T0*(HITAG_T_WAIT_1-HITAG_T_LOW));

 
                        // Send and store the tag answer (if there is any)
                        if (txlen) {
                                // Transmit the tag frame
 
                        // Send and store the tag answer (if there is any)
                        if (txlen) {
                                // Transmit the tag frame

-                               hitag_send_frame(tx,txlen);
+                               hitag_send_frame(tx, txlen);

                                // Store the frame in the trace
                                if (!bQuiet) {
                                // Store the frame in the trace
                                if (!bQuiet) {

-                                       if (!LogTraceHitag(tx,txlen,0,0,false)) {
+                                       if (!LogTraceHitag(tx, txlen, 0, 0, false)) {

                                                DbpString("Trace full");
                                                if (bQuitTraceFull) {
                                                        break;
                                                DbpString("Trace full");
                                                if (bQuitTraceFull) {
                                                        break;


@@ -1187,7 +1177,7 @@ void SimulateHitagTag(bool tag_mem_supplied, byte_t* data) {
                        }
 
                        // Reset the received frame and response timing info
                        }
 
                        // Reset the received frame and response timing info

-                       memset(rx,0x00,sizeof(rx));
+                       memset(rx, 0x00, sizeof(rx));

                        response = 0;
 
                        // Enable and reset external trigger in timer for capturing future frames
                        response = 0;
 
                        // Enable and reset external trigger in timer for capturing future frames


@@ -1211,14 +1201,14 @@ void SimulateHitagTag(bool tag_mem_supplied, byte_t* data) {
 
 }
 
 
 }
 

-void ReaderHitag(hitag_function htf, hitag_data* htd) {
-       int frame_count;
+void ReaderHitag(hitag_function htf, hitag_data *htd) {
+       // int frame_count;

        int response;
        int response;

-       byte_t rx[HITAG_FRAME_LEN];
-       size_t rxlen=0;
-       byte_t txbuf[HITAG_FRAME_LEN];
-       byte_t* tx = txbuf;
-       size_t txlen=0;
+       uint8_t rx[HITAG_FRAME_LEN];
+       size_t rxlen = 0;
+       uint8_t txbuf[HITAG_FRAME_LEN];
+       uint8_t *tx = txbuf;
+       size_t txlen = 0;

        int lastbit;
        bool bSkip;
        int reset_sof;
        int lastbit;
        bool bSkip;
        int reset_sof;


@@ -1238,54 +1228,61 @@ void ReaderHitag(hitag_function htf, hitag_data* htd) {
        //DbpString("Starting Hitag reader family");
 
        // Check configuration
        //DbpString("Starting Hitag reader family");
 
        // Check configuration

-       switch(htf) {
-       case RHT2F_PASSWORD: {
-               Dbprintf("List identifier in password mode");
-               memcpy(password,htd->pwd.password,4);
-               blocknr = 0;
-               bQuitTraceFull = false;
-               bQuiet = false;
-               bPwd = false;
-       } break;
-       case RHT2F_AUTHENTICATE: {
-               DbpString("Authenticating using nr,ar pair:");
-               memcpy(NrAr,htd->auth.NrAr,8);
-               Dbhexdump(8,NrAr,false);
-               bQuiet = false;
-               bCrypto = false;
-               bAuthenticating = false;
-               bQuitTraceFull = true;
-       } break;
-       case RHT2F_CRYPTO:
-       {
-               DbpString("Authenticating using key:");
-               memcpy(key,htd->crypto.key,6);    //HACK; 4 or 6??  I read both in the code.
-               Dbhexdump(6,key,false);
-               blocknr = 0;
-               bQuiet = false;
-               bCrypto = false;
-               bAuthenticating = false;
-               bQuitTraceFull = true;
-       } break;
-       case RHT2F_TEST_AUTH_ATTEMPTS: {
-               Dbprintf("Testing %d authentication attempts",(auth_table_len/8));
-               auth_table_pos = 0;
-               memcpy(NrAr, auth_table, 8);
-               bQuitTraceFull = false;
-               bQuiet = false;
-               bCrypto = false;
-       } break;
-       case RHT2F_UID_ONLY: {
-               blocknr = 0;
-               bQuiet = false;
-               bCrypto = false;
-               bAuthenticating = false;
-               bQuitTraceFull = true;
-       } break;
-       default: {
-               Dbprintf("Error, unknown function: %d",htf);
-               return;
-       } break;
+       switch (htf) {
+               case RHT2F_PASSWORD: {
+                       Dbprintf("List identifier in password mode");
+                       memcpy(password, htd->pwd.password, 4);
+                       blocknr = 0;
+                       bQuitTraceFull = false;
+                       bQuiet = false;
+                       bPwd = false;
+                       bAuthenticating = false;
+               }
+               break;
+               case RHT2F_AUTHENTICATE: {
+                       DbpString("Authenticating using nr,ar pair:");
+                       memcpy(NrAr, htd->auth.NrAr, 8);
+                       Dbhexdump(8, NrAr, false);
+                       bQuiet = false;
+                       bCrypto = false;
+                       bAuthenticating = false;
+                       bQuitTraceFull = true;
+               }
+               break;
+               case RHT2F_CRYPTO:
+               {
+                       DbpString("Authenticating using key:");
+                       memcpy(key, htd->crypto.key, 6);    //HACK; 4 or 6??  I read both in the code.
+                       Dbhexdump(6, key, false);
+                       blocknr = 0;
+                       bQuiet = false;
+                       bCrypto = false;
+                       bAuthenticating = false;
+                       bQuitTraceFull = true;
+               }
+               break;
+               case RHT2F_TEST_AUTH_ATTEMPTS: {
+                       Dbprintf("Testing %d authentication attempts", (auth_table_len/8));
+                       auth_table_pos = 0;
+                       memcpy(NrAr, auth_table, 8);
+                       bQuitTraceFull = false;
+                       bQuiet = false;
+                       bCrypto = false;
+               }
+               break;
+               case RHT2F_UID_ONLY: {
+                       blocknr = 0;
+                       bQuiet = false;
+                       bCrypto = false;
+                       bAuthenticating = false;
+                       bQuitTraceFull = true;
+               }
+               break;
+               default: {
+                       Dbprintf("Error, unknown function: %d", htf);
+                       return;
+               }
+               break;

        }
 
        LED_D_ON();
        }
 
        LED_D_ON();


@@ -1301,14 +1298,10 @@ void ReaderHitag(hitag_function htf, hitag_data* htd) {
        // Set Frequency divisor which will drive the FPGA and analog mux selection
        FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 95); //125Khz
        SetAdcMuxFor(GPIO_MUXSEL_LOPKD);
        // Set Frequency divisor which will drive the FPGA and analog mux selection
        FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 95); //125Khz
        SetAdcMuxFor(GPIO_MUXSEL_LOPKD);

-       RELAY_OFF();

 
        // Disable modulation at default, which means enable the field
        LOW(GPIO_SSC_DOUT);
 
 
        // Disable modulation at default, which means enable the field
        LOW(GPIO_SSC_DOUT);
 

-       // Give it a bit of time for the resonant antenna to settle.
-       SpinDelay(30);
-

        // Enable Peripheral Clock for TIMER_CLOCK0, used to measure exact timing before answering
        AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_TC0);
 
        // Enable Peripheral Clock for TIMER_CLOCK0, used to measure exact timing before answering
        AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_TC0);
 


@@ -1332,12 +1325,12 @@ void ReaderHitag(hitag_function htf, hitag_data* htd) {
        AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
 
        // Reset the received frame, frame count and timing info
        AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
 
        // Reset the received frame, frame count and timing info

-       frame_count = 0;
+       // frame_count = 0;

        response = 0;
        lastbit = 1;
 
        // Tag specific configuration settings (sof, timings, etc.)
        response = 0;
        lastbit = 1;
 
        // Tag specific configuration settings (sof, timings, etc.)

-       if (htf < 10){
+       if (htf < 10) {

                // hitagS settings
                reset_sof = 1;
                t_wait = 200;
                // hitagS settings
                reset_sof = 1;
                t_wait = 200;


@@ -1353,19 +1346,23 @@ void ReaderHitag(hitag_function htf, hitag_data* htd) {
                t_wait = HITAG_T_WAIT_2;
                //DbpString("Configured for hitag2 reader");
        } else {
                t_wait = HITAG_T_WAIT_2;
                //DbpString("Configured for hitag2 reader");
        } else {

-               Dbprintf("Error, unknown hitag reader type: %d",htf);
-               return;
+               Dbprintf("Error, unknown hitag reader type: %d", htf);
+               goto out;

        }
        }

-       uint8_t attempt_count=0;
-       while(!bStop && !BUTTON_PRESS()) {
-               // Watchdog hit
+
+       // wait for tag to power up
+       // t_PowerUp = 312,5 carrier periods
+       while (AT91C_BASE_TC0->TC_CV < T0*(312-t_wait));
+
+       uint8_t attempt_count = 0;
+       while (!bStop && !BUTTON_PRESS()) {

                WDT_HIT();
 
                // Check if frame was captured and store it
                WDT_HIT();
 
                // Check if frame was captured and store it

-               if(rxlen > 0) {
-                       frame_count++;
+               if (rxlen > 0) {
+                       // frame_count++;

                        if (!bQuiet) {
                        if (!bQuiet) {

-                               if (!LogTraceHitag(rx,rxlen,response,0,false)) {
+                               if (!LogTraceHitag(rx, rxlen, response, 0, false)) {

                                        DbpString("Trace full");
                                        if (bQuitTraceFull) {
                                                break;
                                        DbpString("Trace full");
                                        if (bQuitTraceFull) {
                                                break;


@@ -1378,28 +1375,34 @@ void ReaderHitag(hitag_function htf, hitag_data* htd) {
 
                // By default reset the transmission buffer
                tx = txbuf;
 
                // By default reset the transmission buffer
                tx = txbuf;

-               switch(htf) {
+               switch (htf) {

                        case RHT2F_PASSWORD: {
                        case RHT2F_PASSWORD: {

-                               bStop = !hitag2_password(rx,rxlen,tx,&txlen);
-                       } break;
+                               bStop = !hitag2_password(rx, rxlen, tx, &txlen, false);
+                       }
+                       break;

                        case RHT2F_AUTHENTICATE: {
                        case RHT2F_AUTHENTICATE: {

-                               bStop = !hitag2_authenticate(rx,rxlen,tx,&txlen);
-                       } break;
+                               bStop = !hitag2_authenticate(rx, rxlen, tx, &txlen);
+                       }
+                       break;

                        case RHT2F_CRYPTO: {
                        case RHT2F_CRYPTO: {

-                               bStop = !hitag2_crypto(rx,rxlen,tx,&txlen, false);
-                       } break;
+                               bStop = !hitag2_crypto(rx, rxlen, tx, &txlen, false);
+                       }
+                       break;

                        case RHT2F_TEST_AUTH_ATTEMPTS: {
                        case RHT2F_TEST_AUTH_ATTEMPTS: {

-                               bStop = !hitag2_test_auth_attempts(rx,rxlen,tx,&txlen);
-                       } break;
+                               bStop = !hitag2_test_auth_attempts(rx, rxlen, tx, &txlen);
+                       }
+                       break;

                        case RHT2F_UID_ONLY: {
                                bStop = !hitag2_read_uid(rx, rxlen, tx, &txlen);
                                attempt_count++; //attempt 3 times to get uid then quit
                        case RHT2F_UID_ONLY: {
                                bStop = !hitag2_read_uid(rx, rxlen, tx, &txlen);
                                attempt_count++; //attempt 3 times to get uid then quit

-                               if (!bStop && attempt_count == 3) bStop = true;
-                       } break;
+                               if (!bStop && attempt_count == 3)
+                                       bStop = true;
+                       }
+                       break;

                        default: {
                        default: {

-                               Dbprintf("Error, unknown function: %d",htf);
-                               return;
-                       } break;
+                               Dbprintf("Error, unknown function: %d", htf);
+                               goto out;
+                       }

                }
 
                // Send and store the reader command
                }
 
                // Send and store the reader command


@@ -1411,22 +1414,22 @@ void ReaderHitag(hitag_function htf, hitag_data* htd) {
                // falling edge occured halfway the period. with respect to this falling edge,
                // we need to wait (T_Wait2 + half_tag_period) when the last was a 'one'.
                // All timer values are in terms of T0 units
                // falling edge occured halfway the period. with respect to this falling edge,
                // we need to wait (T_Wait2 + half_tag_period) when the last was a 'one'.
                // All timer values are in terms of T0 units

-               while(AT91C_BASE_TC0->TC_CV < T0*(t_wait+(HITAG_T_TAG_HALF_PERIOD*lastbit)));
+               while (AT91C_BASE_TC0->TC_CV < T0*(t_wait+(HITAG_T_TAG_HALF_PERIOD*lastbit)));

 
                //Dbprintf("DEBUG: Sending reader frame");
 
                // Transmit the reader frame
 
                //Dbprintf("DEBUG: Sending reader frame");
 
                // Transmit the reader frame

-               hitag_reader_send_frame(tx,txlen);
+               hitag_reader_send_frame(tx, txlen);

 
                // Enable and reset external trigger in timer for capturing future frames
                AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
 
                // Add transmitted frame to total count
 
                // Enable and reset external trigger in timer for capturing future frames
                AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
 
                // Add transmitted frame to total count

-               if(txlen > 0) {
-                       frame_count++;
+               if (txlen > 0) {
+                       // frame_count++;

                        if (!bQuiet) {
                                // Store the frame in the trace
                        if (!bQuiet) {
                                // Store the frame in the trace

-                               if (!LogTraceHitag(tx,txlen,HITAG_T_WAIT_2,0,true)) {
+                               if (!LogTraceHitag(tx, txlen, HITAG_T_WAIT_2, 0, true)) {

                                        if (bQuitTraceFull) {
                                                break;
                                        } else {
                                        if (bQuitTraceFull) {
                                                break;
                                        } else {


@@ -1437,7 +1440,7 @@ void ReaderHitag(hitag_function htf, hitag_data* htd) {
                }
 
                // Reset values for receiving frames
                }
 
                // Reset values for receiving frames

-               memset(rx,0x00,sizeof(rx));
+               memset(rx, 0x00, sizeof(rx));

                rxlen = 0;
                lastbit = 1;
                bSkip = true;
                rxlen = 0;
                lastbit = 1;
                bSkip = true;


@@ -1449,7 +1452,7 @@ void ReaderHitag(hitag_function htf, hitag_data* htd) {
                // Receive frame, watch for at most T0*EOF periods
                while (AT91C_BASE_TC1->TC_CV < T0*HITAG_T_WAIT_MAX) {
                        // Check if falling edge in tag modulation is detected
                // Receive frame, watch for at most T0*EOF periods
                while (AT91C_BASE_TC1->TC_CV < T0*HITAG_T_WAIT_MAX) {
                        // Check if falling edge in tag modulation is detected

-                       if(AT91C_BASE_TC1->TC_SR & AT91C_TC_LDRAS) {
+                       if (AT91C_BASE_TC1->TC_SR & AT91C_TC_LDRAS) {

                                // Retrieve the new timing values
                                int ra = (AT91C_BASE_TC1->TC_RA/T0);
 
                                // Retrieve the new timing values
                                int ra = (AT91C_BASE_TC1->TC_RA/T0);
 


@@ -1459,14 +1462,14 @@ void ReaderHitag(hitag_function htf, hitag_data* htd) {
                                LED_B_ON();
 
                                // Capture tag frame (manchester decoding using only falling edges)
                                LED_B_ON();
 
                                // Capture tag frame (manchester decoding using only falling edges)

-                               if(ra >= HITAG_T_EOF) {
+                               if (ra >= HITAG_T_EOF) {

                                        if (rxlen != 0) {
                                                //Dbprintf("DEBUG: Wierd1");
                                        }
                                        // Capture the T0 periods that have passed since last communication or field drop (reset)
                                        // We always recieve a 'one' first, which has the falling edge after a half period |-_|
                                        if (rxlen != 0) {
                                                //Dbprintf("DEBUG: Wierd1");
                                        }
                                        // Capture the T0 periods that have passed since last communication or field drop (reset)
                                        // We always recieve a 'one' first, which has the falling edge after a half period |-_|

-                                       response = ra-HITAG_T_TAG_HALF_PERIOD;
-                               } else if(ra >= HITAG_T_TAG_CAPTURE_FOUR_HALF) {
+                                       response = ra - HITAG_T_TAG_HALF_PERIOD;
+                               } else if (ra >= HITAG_T_TAG_CAPTURE_FOUR_HALF) {

                                        // Manchester coding example |-_|_-|-_| (101)
 
                                        //need to test to verify we don't exceed memory...
                                        // Manchester coding example |-_|_-|-_| (101)
 
                                        //need to test to verify we don't exceed memory...


@@ -1477,7 +1480,7 @@ void ReaderHitag(hitag_function htf, hitag_data* htd) {
                                        rxlen++;
                                        rx[rxlen / 8] |= 1 << (7-(rxlen%8));
                                        rxlen++;
                                        rxlen++;
                                        rx[rxlen / 8] |= 1 << (7-(rxlen%8));
                                        rxlen++;

-                               } else if(ra >= HITAG_T_TAG_CAPTURE_THREE_HALF) {
+                               } else if (ra >= HITAG_T_TAG_CAPTURE_THREE_HALF) {

                                        // Manchester coding example |_-|...|_-|-_| (0...01)
 
                                        //need to test to verify we don't exceed memory...
                                        // Manchester coding example |_-|...|_-|-_| (0...01)
 
                                        //need to test to verify we don't exceed memory...


@@ -1493,7 +1496,7 @@ void ReaderHitag(hitag_function htf, hitag_data* htd) {
                                        }
                                        lastbit = !lastbit;
                                        bSkip = !bSkip;
                                        }
                                        lastbit = !lastbit;
                                        bSkip = !bSkip;

-                               } else if(ra >= HITAG_T_TAG_CAPTURE_TWO_HALF) {
+                               } else if (ra >= HITAG_T_TAG_CAPTURE_TWO_HALF) {

                                        // Manchester coding example |_-|_-| (00) or |-_|-_| (11)
 
                                        //need to test to verify we don't exceed memory...
                                        // Manchester coding example |_-|_-| (00) or |-_|-_| (11)
 
                                        //need to test to verify we don't exceed memory...


@@ -1515,13 +1518,15 @@ void ReaderHitag(hitag_function htf, hitag_data* htd) {
                                }
                        }
                        //if we saw over 100 wierd values break it probably isn't hitag...
                                }
                        }
                        //if we saw over 100 wierd values break it probably isn't hitag...

-                       if (errorCount >100) break;
+                       if (errorCount > 100) break;

                        // We can break this loop if we received the last bit from a frame
                        if (AT91C_BASE_TC1->TC_CV > T0*HITAG_T_EOF) {
                        // We can break this loop if we received the last bit from a frame
                        if (AT91C_BASE_TC1->TC_CV > T0*HITAG_T_EOF) {

-                               if (rxlen>0) break;
+                               if (rxlen > 0) break;

                        }
                }
        }
                        }
                }
        }

+
+out:

        //Dbprintf("DEBUG: Done waiting for frame");
 
        LED_B_OFF();
        //Dbprintf("DEBUG: Done waiting for frame");
 
        LED_B_OFF();


@@ -1532,20 +1537,19 @@ void ReaderHitag(hitag_function htf, hitag_data* htd) {
        //Dbprintf("frame received: %d",frame_count);
        //DbpString("All done");
        if (bSuccessful)
        //Dbprintf("frame received: %d",frame_count);
        //DbpString("All done");
        if (bSuccessful)

-               cmd_send(CMD_ACK,bSuccessful,0,0,(byte_t*)tag.sectors,48);
+               cmd_send(CMD_ACK, bSuccessful, 0, 0, (uint8_t*)tag.sectors, 48);

        else
        else

-               cmd_send(CMD_ACK,bSuccessful,0,0,0,0);
-
+               cmd_send(CMD_ACK, bSuccessful, 0, 0, 0, 0);

 }
 
 }
 

-void WriterHitag(hitag_function htf, hitag_data* htd, int page) {
-       int frame_count;
+void WriterHitag(hitag_function htf, hitag_data *htd, int page) {
+       // int frame_count;

        int response;
        int response;

-       byte_t rx[HITAG_FRAME_LEN];
-       size_t rxlen=0;
-       byte_t txbuf[HITAG_FRAME_LEN];
-       byte_t* tx = txbuf;
-       size_t txlen=0;
+       uint8_t rx[HITAG_FRAME_LEN];
+       size_t rxlen = 0;
+       uint8_t txbuf[HITAG_FRAME_LEN];
+       uint8_t *tx = txbuf;
+       size_t txlen = 0;

        int lastbit;
        bool bSkip;
        int reset_sof;
        int lastbit;
        bool bSkip;
        int reset_sof;


@@ -1565,24 +1569,36 @@ void WriterHitag(hitag_function htf, hitag_data* htd, int page) {
        //DbpString("Starting Hitag reader family");
 
        // Check configuration
        //DbpString("Starting Hitag reader family");
 
        // Check configuration

-       switch(htf) {
-       case WHT2F_CRYPTO:
-       {
-               DbpString("Authenticating using key:");
-               memcpy(key,htd->crypto.key,6);    //HACK; 4 or 6??  I read both in the code.
-               memcpy(writedata, htd->crypto.data, 4);
-               Dbhexdump(6,key,false);
-               blocknr = page;
-               bQuiet = false;
-               bCrypto = false;
-               bAuthenticating = false;
-               bQuitTraceFull = true;
-               writestate = WRITE_STATE_START;
-       } break;
-       default: {
-               Dbprintf("Error, unknown function: %d",htf);
-               return;
-       } break;
+       switch (htf) {
+               case WHT2F_CRYPTO: {
+                       DbpString("Authenticating using key:");
+                       memcpy(key, htd->crypto.key, 6);    //HACK; 4 or 6??  I read both in the code.
+                       memcpy(writedata, htd->crypto.data, 4);
+                       Dbhexdump(6, key, false);
+                       blocknr = page;
+                       bQuiet = false;
+                       bCrypto = false;
+                       bAuthenticating = false;
+                       bQuitTraceFull = true;
+                       writestate = WRITE_STATE_START;
+               }
+               break;
+               case WHT2F_PASSWORD: {
+                       DbpString("Authenticating using password:");
+                       memcpy(password, htd->pwd.password, 4);
+                       memcpy(writedata, htd->crypto.data, 4);
+                       Dbhexdump(4, password, false);
+                       blocknr = page;
+                       bPwd = false;
+                       bAuthenticating = false;
+                       writestate = WRITE_STATE_START;
+               }
+               break;
+               default: {
+                       Dbprintf("Error, unknown function: %d", htf);
+                       return;
+               }
+               break;

        }
 
        LED_D_ON();
        }
 
        LED_D_ON();


@@ -1598,7 +1614,6 @@ void WriterHitag(hitag_function htf, hitag_data* htd, int page) {
        // Set Frequency divisor which will drive the FPGA and analog mux selection
        FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 95); //125Khz
        SetAdcMuxFor(GPIO_MUXSEL_LOPKD);
        // Set Frequency divisor which will drive the FPGA and analog mux selection
        FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 95); //125Khz
        SetAdcMuxFor(GPIO_MUXSEL_LOPKD);

-       RELAY_OFF();

 
        // Disable modulation at default, which means enable the field
        LOW(GPIO_SSC_DOUT);
 
        // Disable modulation at default, which means enable the field
        LOW(GPIO_SSC_DOUT);


@@ -1629,13 +1644,13 @@ void WriterHitag(hitag_function htf, hitag_data* htd, int page) {
        AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
 
        // Reset the received frame, frame count and timing info
        AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
 
        // Reset the received frame, frame count and timing info

-       frame_count = 0;
+       // frame_count = 0;

        response = 0;
        lastbit = 1;
        bStop = false;
 
        // Tag specific configuration settings (sof, timings, etc.)
        response = 0;
        lastbit = 1;
        bStop = false;
 
        // Tag specific configuration settings (sof, timings, etc.)

-       if (htf < 10){
+       if (htf < 10) {

                // hitagS settings
                reset_sof = 1;
                t_wait = 200;
                // hitagS settings
                reset_sof = 1;
                t_wait = 200;


@@ -1651,18 +1666,18 @@ void WriterHitag(hitag_function htf, hitag_data* htd, int page) {
                t_wait = HITAG_T_WAIT_2;
                //DbpString("Configured for hitag2 reader");
        } else {
                t_wait = HITAG_T_WAIT_2;
                //DbpString("Configured for hitag2 reader");
        } else {

-               Dbprintf("Error, unknown hitag reader type: %d",htf);
+               Dbprintf("Error, unknown hitag reader type: %d", htf);

                return;
        }
                return;
        }

-       while(!bStop && !BUTTON_PRESS()) {
-               // Watchdog hit
+       while (!bStop && !BUTTON_PRESS()) {
+

                WDT_HIT();
 
                // Check if frame was captured and store it
                WDT_HIT();
 
                // Check if frame was captured and store it

-               if(rxlen > 0) {
-                       frame_count++;
+               if (rxlen > 0) {
+                       // frame_count++;

                        if (!bQuiet) {
                        if (!bQuiet) {

-                               if (!LogTraceHitag(rx,rxlen,response,0,false)) {
+                               if (!LogTraceHitag(rx, rxlen, response, 0, false)) {

                                        DbpString("Trace full");
                                        if (bQuitTraceFull) {
                                                break;
                                        DbpString("Trace full");
                                        if (bQuitTraceFull) {
                                                break;


@@ -1675,14 +1690,20 @@ void WriterHitag(hitag_function htf, hitag_data* htd, int page) {
 
                // By default reset the transmission buffer
                tx = txbuf;
 
                // By default reset the transmission buffer
                tx = txbuf;

-               switch(htf) {
-               case WHT2F_CRYPTO: {
-                       bStop = !hitag2_crypto(rx,rxlen,tx,&txlen, true);
-               } break;
-               default: {
-                       Dbprintf("Error, unknown function: %d",htf);
-                       return;
-               } break;
+               switch (htf) {
+                       case WHT2F_CRYPTO: {
+                               bStop = !hitag2_crypto(rx, rxlen, tx, &txlen, true);
+                       }
+                       break;
+                       case WHT2F_PASSWORD: {
+                               bStop = !hitag2_password(rx, rxlen, tx, &txlen, true);
+                       }
+                       break;
+                       default: {
+                               Dbprintf("Error, unknown function: %d", htf);
+                               return;
+                       }
+                       break;

                }
 
                // Send and store the reader command
                }
 
                // Send and store the reader command


@@ -1694,22 +1715,22 @@ void WriterHitag(hitag_function htf, hitag_data* htd, int page) {
                // falling edge occured halfway the period. with respect to this falling edge,
                // we need to wait (T_Wait2 + half_tag_period) when the last was a 'one'.
                // All timer values are in terms of T0 units
                // falling edge occured halfway the period. with respect to this falling edge,
                // we need to wait (T_Wait2 + half_tag_period) when the last was a 'one'.
                // All timer values are in terms of T0 units

-               while(AT91C_BASE_TC0->TC_CV < T0*(t_wait+(HITAG_T_TAG_HALF_PERIOD*lastbit)));
+               while (AT91C_BASE_TC0->TC_CV < T0*(t_wait+(HITAG_T_TAG_HALF_PERIOD*lastbit)));

 
                //Dbprintf("DEBUG: Sending reader frame");
 
                // Transmit the reader frame
 
                //Dbprintf("DEBUG: Sending reader frame");
 
                // Transmit the reader frame

-               hitag_reader_send_frame(tx,txlen);
+               hitag_reader_send_frame(tx, txlen);

 
 

-                               // Enable and reset external trigger in timer for capturing future frames
+               // Enable and reset external trigger in timer for capturing future frames

                AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
 
                // Add transmitted frame to total count
                AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
 
                // Add transmitted frame to total count

-               if(txlen > 0) {
-                       frame_count++;
+               if (txlen > 0) {
+                       // frame_count++;

                        if (!bQuiet) {
                                // Store the frame in the trace
                        if (!bQuiet) {
                                // Store the frame in the trace

-                               if (!LogTraceHitag(tx,txlen,HITAG_T_WAIT_2,0,true)) {
+                               if (!LogTraceHitag(tx, txlen, HITAG_T_WAIT_2, 0, true)) {

                                        if (bQuitTraceFull) {
                                                break;
                                        } else {
                                        if (bQuitTraceFull) {
                                                break;
                                        } else {


@@ -1720,7 +1741,7 @@ void WriterHitag(hitag_function htf, hitag_data* htd, int page) {
                }
 
                // Reset values for receiving frames
                }
 
                // Reset values for receiving frames

-               memset(rx,0x00,sizeof(rx));
+               memset(rx, 0x00, sizeof(rx));

                rxlen = 0;
                lastbit = 1;
                bSkip = true;
                rxlen = 0;
                lastbit = 1;
                bSkip = true;


@@ -1732,7 +1753,7 @@ void WriterHitag(hitag_function htf, hitag_data* htd, int page) {
                // Receive frame, watch for at most T0*EOF periods
                while (AT91C_BASE_TC1->TC_CV < T0*HITAG_T_WAIT_MAX) {
                        // Check if falling edge in tag modulation is detected
                // Receive frame, watch for at most T0*EOF periods
                while (AT91C_BASE_TC1->TC_CV < T0*HITAG_T_WAIT_MAX) {
                        // Check if falling edge in tag modulation is detected

-                       if(AT91C_BASE_TC1->TC_SR & AT91C_TC_LDRAS) {
+                       if (AT91C_BASE_TC1->TC_SR & AT91C_TC_LDRAS) {

                                // Retrieve the new timing values
                                int ra = (AT91C_BASE_TC1->TC_RA/T0);
 
                                // Retrieve the new timing values
                                int ra = (AT91C_BASE_TC1->TC_RA/T0);
 


@@ -1742,31 +1763,31 @@ void WriterHitag(hitag_function htf, hitag_data* htd, int page) {
                                LED_B_ON();
 
                                // Capture tag frame (manchester decoding using only falling edges)
                                LED_B_ON();
 
                                // Capture tag frame (manchester decoding using only falling edges)

-                               if(ra >= HITAG_T_EOF) {
+                               if (ra >= HITAG_T_EOF) {

                                        if (rxlen != 0) {
                                                //Dbprintf("DEBUG: Wierd1");
                                        }
                                        // Capture the T0 periods that have passed since last communication or field drop (reset)
                                        // We always recieve a 'one' first, which has the falling edge after a half period |-_|
                                        if (rxlen != 0) {
                                                //Dbprintf("DEBUG: Wierd1");
                                        }
                                        // Capture the T0 periods that have passed since last communication or field drop (reset)
                                        // We always recieve a 'one' first, which has the falling edge after a half period |-_|

-                                       response = ra-HITAG_T_TAG_HALF_PERIOD;
-                               } else if(ra >= HITAG_T_TAG_CAPTURE_FOUR_HALF) {
+                                       response = ra - HITAG_T_TAG_HALF_PERIOD;
+                               } else if (ra >= HITAG_T_TAG_CAPTURE_FOUR_HALF) {

                                        // Manchester coding example |-_|_-|-_| (101)
 
                                        // Manchester coding example |-_|_-|-_| (101)
 

-                                       //need to test to verify we don't exceed memory...
-                                       //if ( ((rxlen+2) / 8) > HITAG_FRAME_LEN) {
-                                       //  break;
-                                       //}
+                                       // need to test to verify we don't exceed memory...
+                                       // if ( ((rxlen+2) / 8) > HITAG_FRAME_LEN) {
+                                       //     break;
+                                       // }

                                        rx[rxlen / 8] |= 0 << (7-(rxlen%8));
                                        rxlen++;
                                        rx[rxlen / 8] |= 1 << (7-(rxlen%8));
                                        rxlen++;
                                        rx[rxlen / 8] |= 0 << (7-(rxlen%8));
                                        rxlen++;
                                        rx[rxlen / 8] |= 1 << (7-(rxlen%8));
                                        rxlen++;

-                               } else if(ra >= HITAG_T_TAG_CAPTURE_THREE_HALF) {
+                               } else if (ra >= HITAG_T_TAG_CAPTURE_THREE_HALF) {

                                        // Manchester coding example |_-|...|_-|-_| (0...01)
 
                                        // Manchester coding example |_-|...|_-|-_| (0...01)
 

-                                       //need to test to verify we don't exceed memory...
-                                       //if ( ((rxlen+2) / 8) > HITAG_FRAME_LEN) {
-                                       //  break;
-                                       //}
+                                       // need to test to verify we don't exceed memory...
+                                       // if ( ((rxlen+2) / 8) > HITAG_FRAME_LEN) {
+                                       //     break;
+                                       // }

                                        rx[rxlen / 8] |= 0 << (7-(rxlen%8));
                                        rxlen++;
                                        // We have to skip this half period at start and add the 'one' the second time
                                        rx[rxlen / 8] |= 0 << (7-(rxlen%8));
                                        rxlen++;
                                        // We have to skip this half period at start and add the 'one' the second time


@@ -1776,13 +1797,13 @@ void WriterHitag(hitag_function htf, hitag_data* htd, int page) {
                                        }
                                        lastbit = !lastbit;
                                        bSkip = !bSkip;
                                        }
                                        lastbit = !lastbit;
                                        bSkip = !bSkip;

-                               } else if(ra >= HITAG_T_TAG_CAPTURE_TWO_HALF) {
+                               } else if (ra >= HITAG_T_TAG_CAPTURE_TWO_HALF) {

                                        // Manchester coding example |_-|_-| (00) or |-_|-_| (11)
 
                                        // Manchester coding example |_-|_-| (00) or |-_|-_| (11)
 

-                                       //need to test to verify we don't exceed memory...
-                                       //if ( ((rxlen+2) / 8) > HITAG_FRAME_LEN) {
-                                       //  break;
-                                       //}
+                                       // need to test to verify we don't exceed memory...
+                                       // if ( ((rxlen+2) / 8) > HITAG_FRAME_LEN) {
+                                       //     break;
+                                       // }

                                        if (tag_sof) {
                                                // Ignore bits that are transmitted during SOF
                                                tag_sof--;
                                        if (tag_sof) {
                                                // Ignore bits that are transmitted during SOF
                                                tag_sof--;


@@ -1792,24 +1813,23 @@ void WriterHitag(hitag_function htf, hitag_data* htd, int page) {
                                                rxlen++;
                                        }
                                } else {
                                                rxlen++;
                                        }
                                } else {

-                                       //Dbprintf("DEBUG: Wierd2");
+                                       // Dbprintf("DEBUG: Wierd2");

                                        errorCount++;
                                        errorCount++;

-                                       // Ignore wierd value, is to small to mean anything
+                                       // Ignore wierd value, it is too small to mean anything

                                }
                        }
                                }
                        }

-                       //if we saw over 100 wierd values break it probably isn't hitag...
-                       if (errorCount >100) break;
+                       // if we saw over 100 wierd values break it probably isn't hitag...
+                       if (errorCount > 100) break;

                        // We can break this loop if we received the last bit from a frame
                        if (AT91C_BASE_TC1->TC_CV > T0*HITAG_T_EOF) {
                        // We can break this loop if we received the last bit from a frame
                        if (AT91C_BASE_TC1->TC_CV > T0*HITAG_T_EOF) {

-                               if (rxlen>0) break;
+                               if (rxlen > 0) break;

                        }
                }
 
                // Wait some extra time for flash to be programmed
                        }
                }
 
                // Wait some extra time for flash to be programmed

-               if ((rxlen == 0) && (writestate == WRITE_STATE_PROG))
-               {
+               if ((rxlen == 0) && (writestate == WRITE_STATE_PROG)) {

                        AT91C_BASE_TC0->TC_CCR = AT91C_TC_SWTRG;
                        AT91C_BASE_TC0->TC_CCR = AT91C_TC_SWTRG;

-                       while(AT91C_BASE_TC0->TC_CV < T0*(HITAG_T_PROG - HITAG_T_WAIT_MAX));
+                       while (AT91C_BASE_TC0->TC_CV < T0*(HITAG_T_PROG - HITAG_T_WAIT_MAX));

                }
        }
        //Dbprintf("DEBUG: Done waiting for frame");
                }
        }
        //Dbprintf("DEBUG: Done waiting for frame");


@@ -1821,5 +1841,5 @@ void WriterHitag(hitag_function htf, hitag_data* htd, int page) {
        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
        //Dbprintf("frame received: %d",frame_count);
        //DbpString("All done");
        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
        //Dbprintf("frame received: %d",frame_count);
        //DbpString("All done");

-       cmd_send(CMD_ACK,bSuccessful,0,0,(byte_t*)tag.sectors,48);
+       cmd_send(CMD_ACK, bSuccessful, 0, 0, (uint8_t*)tag.sectors, 48);

 }
 }

diff --git a/armsrc/hitag2.h b/armsrc/hitag2.h
index 555f04eea33f23966c520d444dd9c547580556b0..3883c17b954d659d185b6cedc56c27b8542f5d6c 100644 (file)
--- a/armsrc/hitag2.h
+++ b/armsrc/hitag2.h
@@ -16,9 +16,9 @@
 #include <stdbool.h>
 #include "hitag.h"
 
 #include <stdbool.h>
 #include "hitag.h"
 

-void SnoopHitag(uint32_t type);
-void SimulateHitagTag(bool tag_mem_supplied, uint8_t* data);
-void ReaderHitag(hitag_function htf, hitag_data* htd);
-void WriterHitag(hitag_function htf, hitag_data* htd, int page);
+extern void SnoopHitag(uint32_t type);
+extern void SimulateHitagTag(bool tag_mem_supplied, uint8_t* data);
+extern void ReaderHitag(hitag_function htf, hitag_data* htd);
+extern void WriterHitag(hitag_function htf, hitag_data* htd, int page);

 
 #endif
 
 #endif

diff --git a/armsrc/hitagS.c b/armsrc/hitagS.c
index 9e8f1432461b359665f0cacb3f0e4ccdeba17568..5da170bbcc5e8b125bff365f856d2eb7fae2e4e5 100644 (file)
--- a/armsrc/hitagS.c
+++ b/armsrc/hitagS.c
@@ -26,18 +26,6 @@
 #define CRC_PRESET 0xFF
 #define CRC_POLYNOM 0x1D
 
 #define CRC_PRESET 0xFF
 #define CRC_POLYNOM 0x1D
 

-#define u8              uint8_t
-#define u32             uint32_t
-#define u64             uint64_t
-#define rev8(x)         ((((x)>>7)&1)+((((x)>>6)&1)<<1)+((((x)>>5)&1)<<2)+((((x)>>4)&1)<<3)+((((x)>>3)&1)<<4)+((((x)>>2)&1)<<5)+((((x)>>1)&1)<<6)+(((x)&1)<<7))
-#define rev16(x)        (rev8 (x)+(rev8 (x>> 8)<< 8))
-#define rev32(x)        (rev16(x)+(rev16(x>>16)<<16))
-#define rev64(x)        (rev32(x)+(rev32(x>>32)<<32))
-#define bit(x,n)        (((x)>>(n))&1)
-#define bit32(x,n)      ((((x)[(n)>>5])>>((n)))&1)
-#define inv32(x,i,n)    ((x)[(i)>>5]^=((u32)(n))<<((i)&31))
-#define rotl64(x, n)    ((((u64)(x))<<((n)&63))+(((u64)(x))>>((0-(n))&63)))
-

 static bool bQuiet;
 static bool bSuccessful;
 static struct hitagS_tag tag;
 static bool bQuiet;
 static bool bSuccessful;
 static struct hitagS_tag tag;


@@ -57,17 +45,17 @@ size_t blocknr;
 bool end=false;
 
 // Single bit Hitag2 functions:
 bool end=false;
 
 // Single bit Hitag2 functions:

-#define i4(x,a,b,c,d)   ((u32)((((x)>>(a))&1)+(((x)>>(b))&1)*2+(((x)>>(c))&1)*4+(((x)>>(d))&1)*8))
-static const u32 ht2_f4a = 0x2C79;          // 0010 1100 0111 1001
-static const u32 ht2_f4b = 0x6671;          // 0110 0110 0111 0001
-static const u32 ht2_f5c = 0x7907287B;          // 0111 1001 0000 0111 0010 1000 0111 1011
+#define i4(x,a,b,c,d)   ((uint32_t)((((x)>>(a))&1)+(((x)>>(b))&1)*2+(((x)>>(c))&1)*4+(((x)>>(d))&1)*8))
+static const uint32_t ht2_f4a = 0x2C79;          // 0010 1100 0111 1001
+static const uint32_t ht2_f4b = 0x6671;          // 0110 0110 0111 0001
+static const uint32_t ht2_f5c = 0x7907287B;          // 0111 1001 0000 0111 0010 1000 0111 1011

 #define ht2bs_4a(a,b,c,d)   (~(((a|b)&c)^(a|d)^b))
 #define ht2bs_4b(a,b,c,d)   (~(((d|c)&(a^b))^(d|a|b)))
 #define ht2bs_5c(a,b,c,d,e) (~((((((c^e)|d)&a)^b)&(c^b))^(((d^e)|a)&((d^b)|c))))
 #define ht2bs_4a(a,b,c,d)   (~(((a|b)&c)^(a|d)^b))
 #define ht2bs_4b(a,b,c,d)   (~(((d|c)&(a^b))^(d|a|b)))
 #define ht2bs_5c(a,b,c,d,e) (~((((((c^e)|d)&a)^b)&(c^b))^(((d^e)|a)&((d^b)|c))))

-#define uf20bs              u32
+#define uf20bs              uint32_t

 
 

-static u32 f20(const u64 x) {
-       u32 i5;
+static uint32_t f20(const uint64_t x) {
+       uint32_t i5;

 
        i5 = ((ht2_f4a >> i4(x, 1, 2, 4, 5)) & 1) * 1
                        + ((ht2_f4b >> i4(x, 7, 11, 13, 14)) & 1) * 2
 
        i5 = ((ht2_f4a >> i4(x, 1, 2, 4, 5)) & 1) * 1
                        + ((ht2_f4b >> i4(x, 7, 11, 13, 14)) & 1) * 2


@@ -77,8 +65,19 @@ static u32 f20(const u64 x) {
 
        return (ht2_f5c >> i5) & 1;
 }
 
        return (ht2_f5c >> i5) & 1;
 }

-static u64 hitag2_round(u64 *state) {
-       u64 x = *state;
+
+static uint64_t hitag2_init(const uint64_t key, const uint32_t serial, const uint32_t IV) {
+       uint32_t i;
+       uint64_t x = ((key & 0xFFFF) << 32) + serial;
+       for (i = 0; i < 32; i++) {
+               x >>= 1;
+               x += (uint64_t) (f20(x) ^ (((IV >> i) ^ (key >> (i + 16))) & 1)) << 47;
+       }
+       return x;
+}
+
+static uint64_t hitag2_round(uint64_t *state) {
+       uint64_t x = *state;

 
        x = (x >> 1)
                        + ((((x >> 0) ^ (x >> 2) ^ (x >> 3) ^ (x >> 6) ^ (x >> 7) ^ (x >> 8)
 
        x = (x >> 1)
                        + ((((x >> 0) ^ (x >> 2) ^ (x >> 3) ^ (x >> 6) ^ (x >> 7) ^ (x >> 8)


@@ -89,20 +88,12 @@ static u64 hitag2_round(u64 *state) {
        *state = x;
        return f20(x);
 }
        *state = x;
        return f20(x);
 }

-static u64 hitag2_init(const u64 key, const u32 serial, const u32 IV) {
-       u32 i;
-       u64 x = ((key & 0xFFFF) << 32) + serial;
-       for (i = 0; i < 32; i++) {
-               x >>= 1;
-               x += (u64) (f20(x) ^ (((IV >> i) ^ (key >> (i + 16))) & 1)) << 47;
-       }
-       return x;
-}
-static u32 hitag2_byte(u64 *x) {
-       u32 i, c;
+
+static uint32_t hitag2_byte(uint64_t *x) {
+       uint32_t i, c;

 
        for (i = 0, c = 0; i < 8; i++)
 
        for (i = 0, c = 0; i < 8; i++)

-               c += (u32) hitag2_round(x) << (i ^ 7);
+               c += (uint32_t) hitag2_round(x) << (i ^ 7);

        return c;
 }
 
        return c;
 }
 


@@ -858,7 +849,7 @@ static void hitagS_handle_reader_command(byte_t* rx, const size_t rxlen,
        byte_t rx_air[HITAG_FRAME_LEN];
        byte_t page;
        int i;
        byte_t rx_air[HITAG_FRAME_LEN];
        byte_t page;
        int i;

-       u64 state;
+       uint64_t state;

        unsigned char crc;
 
        // Copy the (original) received frame how it is send over the air
        unsigned char crc;
 
        // Copy the (original) received frame how it is send over the air


@@ -956,8 +947,8 @@ static void hitagS_handle_reader_command(byte_t* rx, const size_t rxlen,
                //challenge message received
                Dbprintf("Challenge for UID: %X", temp_uid);
                temp2++;
                //challenge message received
                Dbprintf("Challenge for UID: %X", temp_uid);
                temp2++;

-               state = hitag2_init(rev64(tag.key), rev32(tag.pages[0][0]),
-                               rev32(((rx[3] << 24) + (rx[2] << 16) + (rx[1] << 8) + rx[0])));
+               state = hitag2_init(REV64(tag.key), REV32(tag.pages[0][0]),
+                               REV32(((rx[3] << 24) + (rx[2] << 16) + (rx[1] << 8) + rx[0])));

                Dbprintf(
                                ",{0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%02X}",
                                rx[0], rx[1], rx[2], rx[3], rx[4], rx[5], rx[6], rx[7]);
                Dbprintf(
                                ",{0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%02X}",
                                rx[0], rx[1], rx[2], rx[3], rx[4], rx[5], rx[6], rx[7]);


@@ -1216,7 +1207,7 @@ static int hitagS_handle_tag_auth(hitag_function htf,uint64_t key, uint64_t NrAr
        unsigned char uid[32];
        byte_t uid1 = 0x00, uid2 = 0x00, uid3 = 0x00, uid4 = 0x00;
        unsigned char crc;
        unsigned char uid[32];
        byte_t uid1 = 0x00, uid2 = 0x00, uid3 = 0x00, uid4 = 0x00;
        unsigned char crc;

-       u64 state;
+       uint64_t state;

        byte_t auth_ks[4];
        byte_t conf_pages[3];
        memcpy(rx_air, rx, nbytes(rxlen));
        byte_t auth_ks[4];
        byte_t conf_pages[3];
        memcpy(rx_air, rx, nbytes(rxlen));


@@ -1356,11 +1347,11 @@ static int hitagS_handle_tag_auth(hitag_function htf,uint64_t key, uint64_t NrAr
                        *txlen = 64;
                        if(end!=true){
                                if(htf==02||htf==04){ //RHTS_KEY //WHTS_KEY
                        *txlen = 64;
                        if(end!=true){
                                if(htf==02||htf==04){ //RHTS_KEY //WHTS_KEY

-                                       state = hitag2_init(rev64(key), rev32(tag.uid), rev32(rnd));
+                                       state = hitag2_init(REV64(key), REV32(tag.uid), REV32(rnd));

                                        /*
                                        /*

-                                       Dbprintf("key: %02X %02X\n\n", key, rev64(key));
-                                       Dbprintf("tag.uid: %02X %02X\n\n", tag.uid, rev32(tag.uid));
-                                       Dbprintf("rnd: %02X %02X\n\n", rnd, rev32(rnd));
+                                       Dbprintf("key: %02X %02X\n\n", key, REV64(key));
+                                       Dbprintf("tag.uid: %02X %02X\n\n", tag.uid, REV32(tag.uid));
+                                       Dbprintf("rnd: %02X %02X\n\n", rnd, REV32(rnd));

                                        */
                                        for (i = 0; i < 4; i++) {
                                                auth_ks[i] = hitag2_byte(&state) ^ 0xff;
                                        */
                                        for (i = 0; i < 4; i++) {
                                                auth_ks[i] = hitag2_byte(&state) ^ 0xff;


@@ -1404,7 +1395,7 @@ static int hitagS_handle_tag_auth(hitag_function htf,uint64_t key, uint64_t NrAr
                pwdl0=0;
                pwdl1=0;
                if(htf==02 || htf==04) { //RHTS_KEY //WHTS_KEY
                pwdl0=0;
                pwdl1=0;
                if(htf==02 || htf==04) { //RHTS_KEY //WHTS_KEY

-                       state = hitag2_init(rev64(key), rev32(tag.uid), rev32(rnd));
+                       state = hitag2_init(REV64(key), REV32(tag.uid), REV32(rnd));

                        for (i = 0; i < 5; i++)  {
                                hitag2_byte(&state);
                        }
                        for (i = 0; i < 5; i++)  {
                                hitag2_byte(&state);
                        }

diff --git a/armsrc/util.h b/armsrc/util.h
index da333e0102bb83be995b4997fad83cc01427d8aa..7b3d0849e1d9eb8fb47e383e29b356b2c681c1cb 100644 (file)
--- a/armsrc/util.h
+++ b/armsrc/util.h
@@ -17,15 +17,21 @@
 
 #define BYTEx(x, n) (((x) >> (n * 8)) & 0xff )
 
 
 #define BYTEx(x, n) (((x) >> (n * 8)) & 0xff )
 

-#define LED_RED 1
+#define LED_RED    1

 #define LED_ORANGE 2
 #define LED_ORANGE 2

-#define LED_GREEN 4
-#define LED_RED2 8
-#define BUTTON_HOLD 1
-#define BUTTON_NO_CLICK 0
-#define BUTTON_SINGLE_CLICK -1
-#define BUTTON_DOUBLE_CLICK -2
-#define BUTTON_ERROR -99
+#define LED_GREEN  4
+#define LED_RED2   8
+
+#define BUTTON_HOLD           1
+#define BUTTON_NO_CLICK       0
+#define BUTTON_SINGLE_CLICK  -1
+#define BUTTON_DOUBLE_CLICK  -2
+#define BUTTON_ERROR        -99
+
+#define REV8(x)  ((((x)>>7)&1)|((((x)>>6)&1)<<1)|((((x)>>5)&1)<<2)|((((x)>>4)&1)<<3)|((((x)>>3)&1)<<4)|((((x)>>2)&1)<<5)|((((x)>>1)&1)<<6)|(((x)&1)<<7))
+#define REV16(x) (REV8(x)  | (REV8 (x >> 8) << 8))
+#define REV32(x) (REV16(x) | (REV16(x >> 16) << 16))
+#define REV64(x) (REV32(x) | (REV32(x >> 32) << 32))

 
 void print_result(char *name, uint8_t *buf, size_t len);
 size_t nbytes(size_t nbits);
 
 void print_result(char *name, uint8_t *buf, size_t len);
 size_t nbytes(size_t nbits);

diff --git a/client/cmdlfhitag.c b/client/cmdlfhitag.c
index cd23f88cdfeac4ad89ad8ba71f703e2374d23e2e..be8072226e89b52f620b36216687ac7624fce0ed 100644 (file)
--- a/client/cmdlfhitag.c
+++ b/client/cmdlfhitag.c
@@ -22,15 +22,13 @@
 #include "hitag.h"
 #include "cmdmain.h"
 
 #include "hitag.h"
 #include "cmdmain.h"
 

-static int CmdHelp(const char *Cmd);
-
-size_t nbytes(size_t nbits) {
-       return (nbits/8)+((nbits%8)>0);
+static size_t nbytes(size_t nbits) {
+       return (nbits/8) + ((nbits%8)>0);

 }
 
 }
 

-int CmdLFHitagList(const char *Cmd)
-{
-       uint8_t *got = malloc(USB_CMD_DATA_SIZE);
+
+static int CmdLFHitagList(const char *Cmd) {
+       uint8_t *got = malloc(USB_CMD_DATA_SIZE);

        // Query for the actual size of the trace
        UsbCommand response;
        GetFromBigBuf(got, USB_CMD_DATA_SIZE, 0, &response, -1, false);
        // Query for the actual size of the trace
        UsbCommand response;
        GetFromBigBuf(got, USB_CMD_DATA_SIZE, 0, &response, -1, false);


@@ -45,7 +43,7 @@ int CmdLFHitagList(const char *Cmd)
                got = p;
                GetFromBigBuf(got, traceLen, 0, NULL, -1, false);
        }
                got = p;
                GetFromBigBuf(got, traceLen, 0, NULL, -1, false);
        }

-       
+

        PrintAndLog("recorded activity (TraceLen = %d bytes):");
        PrintAndLog(" ETU     :nbits: who bytes");
        PrintAndLog("---------+-----+----+-----------");
        PrintAndLog("recorded activity (TraceLen = %d bytes):");
        PrintAndLog(" ETU     :nbits: who bytes");
        PrintAndLog("---------+-----+----+-----------");


@@ -57,11 +55,11 @@ int CmdLFHitagList(const char *Cmd)
 
        char filename[FILE_PATH_SIZE]  = { 0x00 };
        FILE* pf = NULL;
 
        char filename[FILE_PATH_SIZE]  = { 0x00 };
        FILE* pf = NULL;

-       
-       if (len > FILE_PATH_SIZE) 
+
+       if (len > FILE_PATH_SIZE)

                len = FILE_PATH_SIZE;
        memcpy(filename, Cmd, len);
                len = FILE_PATH_SIZE;
        memcpy(filename, Cmd, len);

-   
+

        if (strlen(filename) > 0) {
                if ((pf = fopen(filename,"wb")) == NULL) {
                        PrintAndLog("Error: Could not open file [%s]",filename);
        if (strlen(filename) > 0) {
                if ((pf = fopen(filename,"wb")) == NULL) {
                        PrintAndLog("Error: Could not open file [%s]",filename);


@@ -71,7 +69,7 @@ int CmdLFHitagList(const char *Cmd)
        }
 
        for (;;) {
        }
 
        for (;;) {

-  
+

                if(i > traceLen) { break; }
 
                bool isResponse;
                if(i > traceLen) { break; }
 
                bool isResponse;


@@ -95,7 +93,7 @@ int CmdLFHitagList(const char *Cmd)
                int len = nbytes(bits);
 
                if (len > 100) {
                int len = nbytes(bits);
 
                if (len > 100) {

-                 break;
+                       break;

                }
                if (i + len > traceLen) { break;}
 
                }
                if (i + len > traceLen) { break;}
 


@@ -104,7 +102,7 @@ int CmdLFHitagList(const char *Cmd)
                int fillupBits = 8 - (bits % 8);
                byte_t framefilled[bits+fillupBits];
                byte_t* ff = framefilled;
                int fillupBits = 8 - (bits % 8);
                byte_t framefilled[bits+fillupBits];
                byte_t* ff = framefilled;

-               
+

                int response_bit[200] = {0};
                int z = 0;
                for (int y = 0; y < len; y++) {
                int response_bit[200] = {0};
                int z = 0;
                for (int y = 0; y < len; y++) {


@@ -133,12 +131,12 @@ int CmdLFHitagList(const char *Cmd)
 
                char line[1000] = "";
                for (j = 0; j < len; j++) {
 
                char line[1000] = "";
                for (j = 0; j < len; j++) {

-                 //if((parityBits >> (len - j - 1)) & 0x01) {
-                 if (isResponse && (oddparity8(frame[j]) != ((parityBits >> (len - j - 1)) & 0x01))) {
-                       sprintf(line+(j*4), "%02x!  ", frame[j]);
-                 } else {
-                       sprintf(line+(j*4), "%02x   ", frame[j]);
-                 }
+                       //if((parityBits >> (len - j - 1)) & 0x01) {
+                       if (isResponse && (oddparity8(frame[j]) != ((parityBits >> (len - j - 1)) & 0x01))) {
+                               sprintf(line+(j*4), "%02x!  ", frame[j]);
+                       } else {
+                               sprintf(line+(j*4), "%02x   ", frame[j]);
+                       }

                }
 
                PrintAndLog(" +%7d:  %3d: %s %s",
                }
 
                PrintAndLog(" +%7d:  %3d: %s %s",


@@ -154,11 +152,11 @@ int CmdLFHitagList(const char *Cmd)
                                (isResponse ? "TAG" : "   "),
                                line);
                }
                                (isResponse ? "TAG" : "   "),
                                line);
                }

-               
+

                prev = timestamp;
                i += (len + 9);
        }
                prev = timestamp;
                i += (len + 9);
        }

-  
+

        if (pf) {
                fclose(pf);
                PrintAndLog("Recorded activity succesfully written to file: %s", filename);
        if (pf) {
                fclose(pf);
                PrintAndLog("Recorded activity succesfully written to file: %s", filename);


@@ -168,22 +166,24 @@ int CmdLFHitagList(const char *Cmd)
        return 0;
 }
 
        return 0;
 }
 

-int CmdLFHitagSnoop(const char *Cmd) {
-  UsbCommand c = {CMD_SNOOP_HITAG};
-  SendCommand(&c);
-  return 0;
+
+static int CmdLFHitagSnoop(const char *Cmd) {
+       UsbCommand c = {CMD_SNOOP_HITAG};
+       SendCommand(&c);
+       return 0;

 }
 
 }
 

-int CmdLFHitagSim(const char *Cmd) {
-    
-  UsbCommand c = {CMD_SIMULATE_HITAG};
+
+static int CmdLFHitagSim(const char *Cmd) {
+
+       UsbCommand c = {CMD_SIMULATE_HITAG};

        char filename[FILE_PATH_SIZE] = { 0x00 };
        FILE* pf;
        bool tag_mem_supplied;
        int len = strlen(Cmd);
        if (len > FILE_PATH_SIZE) len = FILE_PATH_SIZE;
        memcpy(filename, Cmd, len);
        char filename[FILE_PATH_SIZE] = { 0x00 };
        FILE* pf;
        bool tag_mem_supplied;
        int len = strlen(Cmd);
        if (len > FILE_PATH_SIZE) len = FILE_PATH_SIZE;
        memcpy(filename, Cmd, len);

-       
+

        if (strlen(filename) > 0) {
                if ((pf = fopen(filename,"rb+")) == NULL) {
                        PrintAndLog("Error: Could not open file [%s]",filename);
        if (strlen(filename) > 0) {
                if ((pf = fopen(filename,"rb+")) == NULL) {
                        PrintAndLog("Error: Could not open file [%s]",filename);


@@ -199,56 +199,114 @@ int CmdLFHitagSim(const char *Cmd) {
        } else {
                tag_mem_supplied = false;
        }
        } else {
                tag_mem_supplied = false;
        }

-       
+

        // Does the tag comes with memory
        c.arg[0] = (uint32_t)tag_mem_supplied;
 
        // Does the tag comes with memory
        c.arg[0] = (uint32_t)tag_mem_supplied;
 

-  SendCommand(&c);
-  return 0;
+       SendCommand(&c);
+       return 0;
+}
+
+
+static bool getHitagUid(uint32_t *uid) {
+       // ToDo: this is for Hitag2 only (??)
+       
+       UsbCommand c = {CMD_READER_HITAG, {RHT2F_UID_ONLY}};
+
+       SendCommand(&c);
+
+       UsbCommand resp;
+       if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) {
+               PrintAndLogEx(WARNING, "timeout while waiting for reply.");
+               return false;
+       }
+
+       if (resp.arg[0] == false) {
+               PrintAndLogEx(DEBUG, "DEBUG: Error - failed getting UID");
+               return false;
+       }
+
+       if (uid)
+               *uid = bytes_to_num(resp.d.asBytes, 4);
+
+       return true;

 }
 
 }
 

+
+static int CmdLFHitagInfo(const char *Cmd) {
+       char ctmp = param_getchar(Cmd, 0);
+       if (ctmp != '\0') {
+               PrintAndLog("Usage:   lf hitag info [h]");
+               PrintAndLog("Options:");
+               PrintAndLog("       h          This help");
+               PrintAndLog("Examples:");
+               PrintAndLog("         lf hitag info");
+               return 0;
+       }
+
+       // read UID
+       uint32_t uid = 0;
+       if (getHitagUid(&uid) == false)
+               return 1;
+
+       PrintAndLogEx(SUCCESS, "UID: %08X", uid);
+
+       // how to detemine Hitag types?
+       // read block3,  get configuration byte.
+       // PrintAndLogEx(FAILED, _RED_("TODO: This is a hardcoded example!"));
+
+       // common configurations.
+       // printHitagConfiguration(0x06);
+       //printHitagConfiguration( 0x0E );
+       //printHitagConfiguration( 0x02 );
+       //printHitagConfiguration( 0x00 );
+       //printHitagConfiguration( 0x04 );
+       return 0;
+}
+
+

 int CmdLFHitagReader(const char *Cmd) {
 int CmdLFHitagReader(const char *Cmd) {

-       UsbCommand c = {CMD_READER_HITAG};//, {param_get32ex(Cmd,0,0,10),param_get32ex(Cmd,1,0,16),param_get32ex(Cmd,2,0,16),param_get32ex(Cmd,3,0,16)}};
+       UsbCommand c = {CMD_READER_HITAG};

        hitag_data* htd = (hitag_data*)c.d.asBytes;
        hitag_data* htd = (hitag_data*)c.d.asBytes;

-       hitag_function htf = param_get32ex(Cmd,0,0,10);
-       
+       hitag_function htf = param_get32ex(Cmd, 0, 0, 10);
+

        switch (htf) {
                case 01: { //RHTSF_CHALLENGE
                        c = (UsbCommand){ CMD_READ_HITAG_S };
        switch (htf) {
                case 01: { //RHTSF_CHALLENGE
                        c = (UsbCommand){ CMD_READ_HITAG_S };

-                       num_to_bytes(param_get32ex(Cmd,1,0,16),4,htd->auth.NrAr);
-                       num_to_bytes(param_get32ex(Cmd,2,0,16),4,htd->auth.NrAr+4);
-                       c.arg[1] = param_get64ex(Cmd,3,0,0); //firstpage
-                       c.arg[2] = param_get64ex(Cmd,4,0,0); //tag mode
+                       num_to_bytes(param_get32ex(Cmd, 1, 0, 16), 4, htd->auth.NrAr);
+                       num_to_bytes(param_get32ex(Cmd, 2, 0, 16), 4, htd->auth.NrAr+4);
+                       c.arg[1] = param_get64ex(Cmd, 3, 0, 0); //firstpage
+                       c.arg[2] = param_get64ex(Cmd, 4, 0, 0); //tag mode

                } break;
                case 02: { //RHTSF_KEY
                        c = (UsbCommand){ CMD_READ_HITAG_S };
                } break;
                case 02: { //RHTSF_KEY
                        c = (UsbCommand){ CMD_READ_HITAG_S };

-                       num_to_bytes(param_get64ex(Cmd,1,0,16),6,htd->crypto.key);
-                       c.arg[1] = param_get64ex(Cmd,2,0,0); //firstpage
-                       c.arg[2] = param_get64ex(Cmd,3,0,0); //tag mode
+                       num_to_bytes(param_get64ex(Cmd, 1, 0, 16), 6, htd->crypto.key);
+                       c.arg[1] = param_get64ex(Cmd, 2, 0, 0); //firstpage
+                       c.arg[2] = param_get64ex(Cmd, 3, 0, 0); //tag mode

                } break;
                case 03: { //RHTSF_CHALLENGE BLOCK
                        c = (UsbCommand){ CMD_READ_HITAG_S_BLK };
                } break;
                case 03: { //RHTSF_CHALLENGE BLOCK
                        c = (UsbCommand){ CMD_READ_HITAG_S_BLK };

-                       num_to_bytes(param_get32ex(Cmd,1,0,16),4,htd->auth.NrAr);
-                       num_to_bytes(param_get32ex(Cmd,2,0,16),4,htd->auth.NrAr+4);
-                       c.arg[1] = param_get64ex(Cmd,3,0,0); //firstpage
-                       c.arg[2] = param_get64ex(Cmd,4,0,0); //tag mode
+                       num_to_bytes(param_get32ex(Cmd, 1, 0, 16), 4, htd->auth.NrAr);
+                       num_to_bytes(param_get32ex(Cmd, 2, 0, 16), 4, htd->auth.NrAr+4);
+                       c.arg[1] = param_get64ex(Cmd, 3, 0, 0); //firstpage
+                       c.arg[2] = param_get64ex(Cmd, 4, 0, 0); //tag mode

                } break;
                case 04: { //RHTSF_KEY BLOCK
                        c = (UsbCommand){ CMD_READ_HITAG_S_BLK };
                } break;
                case 04: { //RHTSF_KEY BLOCK
                        c = (UsbCommand){ CMD_READ_HITAG_S_BLK };

-                       num_to_bytes(param_get64ex(Cmd,1,0,16),6,htd->crypto.key);
-                       c.arg[1] = param_get64ex(Cmd,2,0,0); //firstpage
-                       c.arg[2] = param_get64ex(Cmd,3,0,0); //tag mode
+                       num_to_bytes(param_get64ex(Cmd, 1, 0, 16), 6, htd->crypto.key);
+                       c.arg[1] = param_get64ex(Cmd, 2, 0, 0); //firstpage
+                       c.arg[2] = param_get64ex(Cmd, 3, 0, 0); //tag mode

                } break;
                case RHT2F_PASSWORD: {
                } break;
                case RHT2F_PASSWORD: {

-                       num_to_bytes(param_get32ex(Cmd,1,0,16),4,htd->pwd.password);
+                       num_to_bytes(param_get32ex(Cmd, 1, 0, 16), 4, htd->pwd.password);

                } break;
                case RHT2F_AUTHENTICATE: {
                } break;
                case RHT2F_AUTHENTICATE: {

-                       num_to_bytes(param_get32ex(Cmd,1,0,16),4,htd->auth.NrAr);
-                       num_to_bytes(param_get32ex(Cmd,2,0,16),4,htd->auth.NrAr+4);
+                       num_to_bytes(param_get32ex(Cmd, 1, 0, 16), 4, htd->auth.NrAr);
+                       num_to_bytes(param_get32ex(Cmd, 2, 0, 16), 4, htd->auth.NrAr+4);

                } break;
                case RHT2F_CRYPTO: {
                } break;
                case RHT2F_CRYPTO: {

-                       num_to_bytes(param_get64ex(Cmd,1,0,16),6,htd->crypto.key);
-                       //                      num_to_bytes(param_get32ex(Cmd,2,0,16),4,htd->auth.NrAr+4);
+                       num_to_bytes(param_get64ex(Cmd, 1, 0, 16), 6, htd->crypto.key);
+                       //          num_to_bytes(param_get32ex(Cmd,2,0,16),4,htd->auth.NrAr+4);

                } break;
                case RHT2F_TEST_AUTH_ATTEMPTS: {
                        // No additional parameters needed
                } break;
                case RHT2F_TEST_AUTH_ATTEMPTS: {
                        // No additional parameters needed


@@ -261,19 +319,20 @@ int CmdLFHitagReader(const char *Cmd) {
                        PrintAndLog("");
                        PrintAndLog("Usage: hitag reader <Reader Function #>");
                        PrintAndLog("Reader Functions:");
                        PrintAndLog("");
                        PrintAndLog("Usage: hitag reader <Reader Function #>");
                        PrintAndLog("Reader Functions:");

-                       PrintAndLog(" HitagS (0*)");
-                       PrintAndLog("  01 <nr> <ar> (Challenge) <firstPage> <tagmode> read all pages from a Hitag S tag");
-                       PrintAndLog("  02 <key> (set to 0 if no authentication is needed) <firstPage> <tagmode> read all pages from a Hitag S tag");
-                       PrintAndLog("  03 <nr> <ar> (Challenge) <firstPage> <tagmode> read all blocks from a Hitag S tag");
-                       PrintAndLog("  04 <key> (set to 0 if no authentication is needed) <firstPage> <tagmode> read all blocks from a Hitag S tag");
-                       PrintAndLog("  Valid tagmodes are 0=STANDARD, 1=ADVANCED, 2=FAST_ADVANCED (default is ADVANCED)");
-                       PrintAndLog(" Hitag1 (1*)");
-                       PrintAndLog(" Hitag2 (2*)");
-                       PrintAndLog("  21 <password> (password mode)");
-                       PrintAndLog("  22 <nr> <ar> (authentication)");
-                       PrintAndLog("  23 <key> (authentication) key is in format: ISK high + ISK low");
-                       PrintAndLog("  25 (test recorded authentications)");
-                       PrintAndLog("  26 just read UID");
+                       PrintAndLog("  HitagS (0*):");
+                       PrintAndLog("    01 <nr> <ar> (Challenge) <firstPage> <tagmode> read all pages from a Hitag S tag");
+                       PrintAndLog("    02 <key> (set to 0 if no authentication is needed) <firstPage> <tagmode> read all pages from a Hitag S tag");
+                       PrintAndLog("    03 <nr> <ar> (Challenge) <firstPage> <tagmode> read all blocks from a Hitag S tag");
+                       PrintAndLog("    04 <key> (set to 0 if no authentication is needed) <firstPage> <tagmode> read all blocks from a Hitag S tag");
+                       PrintAndLog("    Valid tagmodes are 0=STANDARD, 1=ADVANCED, 2=FAST_ADVANCED (default is ADVANCED)");
+                       PrintAndLog("  Hitag1 (1*):");
+                       PrintAndLog("    (not yet implemented)");
+                       PrintAndLog("  Hitag2 (2*):");
+                       PrintAndLog("    21 <password> (password mode)");
+                       PrintAndLog("    22 <nr> <ar> (authentication)");
+                       PrintAndLog("    23 <key> (authentication) key is in format: ISK high + ISK low");
+                       PrintAndLog("    25 (test recorded authentications)");
+                       PrintAndLog("    26 just read UID");

                        return 1;
                } break;
        }
                        return 1;
                } break;
        }


@@ -286,13 +345,19 @@ int CmdLFHitagReader(const char *Cmd) {
        SendCommand(&c);
 
        UsbCommand resp;
        SendCommand(&c);
 
        UsbCommand resp;

-       WaitForResponse(CMD_ACK,&resp);
+       if (!WaitForResponseTimeout(CMD_ACK, &resp, 4000)) {
+               PrintAndLogEx(WARNING, "timeout while waiting for reply.");
+               return 1;
+       }

 
        // Check the return status, stored in the first argument
 
        // Check the return status, stored in the first argument

-       if (resp.arg[0] == false) return 1;
-       
+       if (resp.arg[0] == false)  {
+               PrintAndLogEx(DEBUG, "DEBUG: Error - hitag failed");
+               return 1;
+       }
+

        uint32_t id = bytes_to_num(resp.d.asBytes,4);
        uint32_t id = bytes_to_num(resp.d.asBytes,4);

-               
+

        if (htf == RHT2F_UID_ONLY){
                PrintAndLog("Valid Hitag2 tag found - UID: %08x",id);
        } else {
        if (htf == RHT2F_UID_ONLY){
                PrintAndLog("Valid Hitag2 tag found - UID: %08x",id);
        } else {


@@ -312,12 +377,11 @@ int CmdLFHitagReader(const char *Cmd) {
                PrintAndLog("Succesfully saved tag memory to [%s]",filename);
        }
 
                PrintAndLog("Succesfully saved tag memory to [%s]",filename);
        }
 

-

        return 0;
 }
 
 
        return 0;
 }
 
 

-int CmdLFHitagSimS(const char *Cmd) {
+static int CmdLFHitagSimS(const char *Cmd) {

        UsbCommand c = { CMD_SIMULATE_HITAG_S };
        char filename[FILE_PATH_SIZE] = { 0x00 };
        FILE* pf;
        UsbCommand c = { CMD_SIMULATE_HITAG_S };
        char filename[FILE_PATH_SIZE] = { 0x00 };
        FILE* pf;


@@ -350,7 +414,8 @@ int CmdLFHitagSimS(const char *Cmd) {
        return 0;
 }
 
        return 0;
 }
 

-int CmdLFHitagCheckChallenges(const char *Cmd) {
+
+static int CmdLFHitagCheckChallenges(const char *Cmd) {

        UsbCommand c = { CMD_TEST_HITAGS_TRACES };
        char filename[FILE_PATH_SIZE] = { 0x00 };
        FILE* pf;
        UsbCommand c = { CMD_TEST_HITAGS_TRACES };
        char filename[FILE_PATH_SIZE] = { 0x00 };
        FILE* pf;


@@ -358,7 +423,7 @@ int CmdLFHitagCheckChallenges(const char *Cmd) {
        int len = strlen(Cmd);
        if (len > FILE_PATH_SIZE) len = FILE_PATH_SIZE;
        memcpy(filename, Cmd, len);
        int len = strlen(Cmd);
        if (len > FILE_PATH_SIZE) len = FILE_PATH_SIZE;
        memcpy(filename, Cmd, len);

-       
+

        if (strlen(filename) > 0) {
                if ((pf = fopen(filename,"rb+")) == NULL) {
                        PrintAndLog("Error: Could not open file [%s]",filename);
        if (strlen(filename) > 0) {
                if ((pf = fopen(filename,"rb+")) == NULL) {
                        PrintAndLog("Error: Could not open file [%s]",filename);


@@ -369,87 +434,101 @@ int CmdLFHitagCheckChallenges(const char *Cmd) {
                        PrintAndLog("Error: File reading error");
                        fclose(pf);
                        return 1;
                        PrintAndLog("Error: File reading error");
                        fclose(pf);
                        return 1;

-        }
+               }

                fclose(pf);
        } else {
                file_given = false;
        }
                fclose(pf);
        } else {
                file_given = false;
        }

-       
+

        //file with all the challenges to try
        c.arg[0] = (uint32_t)file_given;
        c.arg[1] = param_get64ex(Cmd,2,0,0); //get mode
 
        //file with all the challenges to try
        c.arg[0] = (uint32_t)file_given;
        c.arg[1] = param_get64ex(Cmd,2,0,0); //get mode
 

-  SendCommand(&c);
-  return 0;
+       SendCommand(&c);
+       return 0;

 }
 
 
 }
 
 

-int CmdLFHitagWP(const char *Cmd) {
+static int CmdLFHitagWriter(const char *Cmd) {

        UsbCommand c = { CMD_WR_HITAG_S };
        hitag_data* htd = (hitag_data*)c.d.asBytes;
        hitag_function htf = param_get32ex(Cmd,0,0,10);
        switch (htf) {
        UsbCommand c = { CMD_WR_HITAG_S };
        hitag_data* htd = (hitag_data*)c.d.asBytes;
        hitag_function htf = param_get32ex(Cmd,0,0,10);
        switch (htf) {

-               case 03: { //WHTSF_CHALLENGE
+               case WHTSF_CHALLENGE: {

                        num_to_bytes(param_get64ex(Cmd,1,0,16),8,htd->auth.NrAr);
                        c.arg[2]= param_get32ex(Cmd, 2, 0, 10);
                        num_to_bytes(param_get32ex(Cmd,3,0,16),4,htd->auth.data);
                } break;
                        num_to_bytes(param_get64ex(Cmd,1,0,16),8,htd->auth.NrAr);
                        c.arg[2]= param_get32ex(Cmd, 2, 0, 10);
                        num_to_bytes(param_get32ex(Cmd,3,0,16),4,htd->auth.data);
                } break;

-               case 04:
-               case 24:
-               { //WHTSF_KEY
+               case WHTSF_KEY:
+               case WHT2F_CRYPTO: {

                        num_to_bytes(param_get64ex(Cmd,1,0,16),6,htd->crypto.key);
                        c.arg[2]= param_get32ex(Cmd, 2, 0, 10);
                        num_to_bytes(param_get32ex(Cmd,3,0,16),4,htd->crypto.data);
                        num_to_bytes(param_get64ex(Cmd,1,0,16),6,htd->crypto.key);
                        c.arg[2]= param_get32ex(Cmd, 2, 0, 10);
                        num_to_bytes(param_get32ex(Cmd,3,0,16),4,htd->crypto.data);

-
+               } break;
+               case WHT2F_PASSWORD: {
+                       num_to_bytes(param_get64ex(Cmd, 1, 0, 16), 4, htd->pwd.password);
+                       c.arg[2] = param_get32ex(Cmd, 2, 0, 10);
+                       num_to_bytes(param_get32ex(Cmd, 3, 0, 16), 4, htd->crypto.data);

                } break;
                default: {
                        PrintAndLog("Error: unkown writer function %d",htf);
                        PrintAndLog("Hitag writer functions");
                } break;
                default: {
                        PrintAndLog("Error: unkown writer function %d",htf);
                        PrintAndLog("Hitag writer functions");

-                       PrintAndLog(" HitagS (0*)");
-                       PrintAndLog("  03 <nr,ar> (Challenge) <page> <byte0...byte3> write page on a Hitag S tag");
-                       PrintAndLog("  04 <key> (set to 0 if no authentication is needed) <page> <byte0...byte3> write page on a Hitag S tag");
-                       PrintAndLog(" Hitag1 (1*)");
-                       PrintAndLog(" Hitag2 (2*)");
-                       PrintAndLog("  24 <key> (set to 0 if no authentication is needed) <page> <byte0...byte3> write page on a Hitag S tag");
+                       PrintAndLog("  HitagS (0*):");
+                       PrintAndLog("    03 <nr,ar> (Challenge) <page> <byte0...byte3> write page on a Hitag S tag");
+                       PrintAndLog("    04 <key> (set to 0 if no authentication is needed) <page> <byte0...byte3> write page on a Hitag S tag");
+                       PrintAndLog("  Hitag1 (1*)");
+                       PrintAndLog("    (not yet implemented)");
+                       PrintAndLog("  Hitag2 (2*):");
+                       PrintAndLog("    24 <key> (set to 0 if no authentication is needed) <page> <byte0...byte3> write page on a Hitag S tag");
+                       PrintAndLog("    27 <password> <page> <byte0...byte3> write page on a Hitag2 tag");

                        return 1;
                } break;
        }
        // Copy the hitag function into the first argument
        c.arg[0] = htf;
 
                        return 1;
                } break;
        }
        // Copy the hitag function into the first argument
        c.arg[0] = htf;
 

-  // Send the command to the proxmark
-  SendCommand(&c);
-  
-  UsbCommand resp;
-  WaitForResponse(CMD_ACK,&resp);
-  
-  // Check the return status, stored in the first argument
-  if (resp.arg[0] == false) return 1;
-  return 0;
+       // Send the command to the proxmark
+       SendCommand(&c);
+
+       UsbCommand resp;
+       if (!WaitForResponseTimeout(CMD_ACK, &resp, 4000)) {
+               PrintAndLogEx(WARNING, "timeout while waiting for reply.");
+               return 1;
+       }
+
+       // Check the return status, stored in the first argument
+       if (resp.arg[0] == false) {
+               PrintAndLogEx(DEBUG, "DEBUG: Error - hitag write failed");
+               return 1;
+       }
+       return 0;

 }
 
 
 }
 
 

-static command_t CommandTable[] = 
+static int CmdHelp(const char *Cmd);
+
+static command_t CommandTable[] =

 {
 {

-  {"help",             CmdHelp,           1, "This help"},
-  {"list",             CmdLFHitagList,    1, "<outfile> List Hitag trace history"},
-  {"reader",           CmdLFHitagReader,  1, "Act like a Hitag Reader"},
-  {"sim",              CmdLFHitagSim,     1, "<infile> Simulate Hitag transponder"},
-  {"snoop",            CmdLFHitagSnoop,   1, "Eavesdrop Hitag communication"},
-  {"writer",                   CmdLFHitagWP,      1, "Act like a Hitag Writer" },
-  {"simS",             CmdLFHitagSimS,    1, "<hitagS.hts> Simulate HitagS transponder" }, 
-  {"checkChallenges",  CmdLFHitagCheckChallenges,   1, "<challenges.cc> <tagmode> test all challenges" }, {
-                               NULL,NULL, 0, NULL }
+       {"help",             CmdHelp,                   1, "This help"},
+       {"list",             CmdLFHitagList,            0, "<outfile> List Hitag trace history"},
+       {"info",             CmdLFHitagInfo,            0, "Tag information" },
+       {"reader",           CmdLFHitagReader,          0, "Act like a Hitag Reader"},
+       {"sim",              CmdLFHitagSim,             0, "Simulate Hitag transponder"},
+       {"snoop",            CmdLFHitagSnoop,           0, "Eavesdrop Hitag communication"},
+       {"writer",           CmdLFHitagWriter,          0, "Act like a Hitag Writer" },
+       {"simS",             CmdLFHitagSimS,            0, "Simulate HitagS transponder" },
+       {"checkChallenges",  CmdLFHitagCheckChallenges, 0, "Test challenges from a file" },
+       { NULL,              NULL,                      0, NULL }

 };
 
 };
 

-int CmdLFHitag(const char *Cmd)
-{
-  CmdsParse(CommandTable, Cmd);
-  return 0;
+
+static int CmdHelp(const char *Cmd) {
+       CmdsHelp(CommandTable);
+       return 0;

 }
 
 }
 

-int CmdHelp(const char *Cmd)
-{
-  CmdsHelp(CommandTable);
-  return 0;
+
+int CmdLFHitag(const char *Cmd) {
+       CmdsParse(CommandTable, Cmd);
+       return 0;

 }
 }

diff --git a/client/cmdlfhitag.h b/client/cmdlfhitag.h
index 22b6bb06308d9b32edd1d4ed7388ea2d2fb2ead8..062ed4848e182611c972bfa9b14c6ddcb976dbc1 100644 (file)
--- a/client/cmdlfhitag.h
+++ b/client/cmdlfhitag.h
@@ -11,11 +11,7 @@
 #ifndef CMDLFHITAG_H__
 #define CMDLFHITAG_H__
 
 #ifndef CMDLFHITAG_H__
 #define CMDLFHITAG_H__
 

-int CmdLFHitag(const char *Cmd);
-
-int CmdLFHitagList(const char *Cmd);
-int CmdLFHitagSnoop(const char *Cmd);
-int CmdLFHitagSim(const char *Cmd);
-int CmdLFHitagReader(const char *Cmd);
+extern int CmdLFHitag(const char *Cmd);
+extern int CmdLFHitagReader(const char *Cmd);

 
 #endif
 
 #endif

diff --git a/common/protocols.h b/common/protocols.h
index 51fe579e1160d4c745a9b9736cb017556e0979e3..9de726613d44b8c940f5122e771929955539550a 100644 (file)
--- a/common/protocols.h
+++ b/common/protocols.h
@@ -236,6 +236,26 @@ NXP/Philips CUSTOM COMMANDS
 #define TOPAZ_WRITE_E8                                 0x54    // Write-with-erase (eight bytes)
 #define TOPAZ_WRITE_NE8                                        0x1B    // Write-no-erase (eight bytes)
 
 #define TOPAZ_WRITE_E8                                 0x54    // Write-with-erase (eight bytes)
 #define TOPAZ_WRITE_NE8                                        0x1B    // Write-no-erase (eight bytes)
 

+// HITAG1 commands
+#define HITAG1_SET_CCNEW                0xC2    // left 5 bits only
+#define HITAG1_READ_ID                  0x00    // not a real command, consists of 5 bits length, <length> bits partial SN, 8 bits CRC
+#define HITAG1_SELECT                   0x00    // left 5 bits only, followed by 32 bits SN and 8 bits CRC
+#define HITAG1_WRPPAGE                  0x80    // left 4 bits only, followed by 8 bits page and 8 bits CRC
+#define HITAG1_WRPBLK                   0x90    // left 4 bits only, followed by 8 bits block and 8 bits CRC
+#define HITAG1_WRCPAGE                  0xA0    // left 4 bits only, followed by 8 bits page or key information and 8 bits CRC
+#define HITAG1_WRCBLK                   0xB0    // left 4 bits only, followed by 8 bits block and 8 bits CRC
+#define HITAG1_RDPPAGE                  0xC0    // left 4 bits only, followed by 8 bits page and 8 bits CRC
+#define HITAG1_RDPBLK                   0xD0    // left 4 bits only, followed by 8 bits block and 8 bits CRC
+#define HITAG1_RDCPAGE                  0xE0    // left 4 bits only, followed by 8 bits page and 8 bits CRC
+#define HITAG1_RDCBLK                   0xF0    // left 4 bits only, followed by 8 bits block and 8 bits CRC
+#define HITAG1_HALT                     0x70    // left 4 bits only, followed by 8 bits (dummy) page and 8 bits CRC
+
+// HITAG2 commands
+#define HITAG2_START_AUTH               0xC0    // left 5 bits only
+#define HITAG2_READ_PAGE                0xC0    // page number in bits 5 to 3, page number inverted in bit 0 and following 2 bits
+#define HITAG2_READ_PAGE_INVERTED       0x44    // page number in bits 5 to 3, page number inverted in bit 0 and following 2 bits
+#define HITAG2_WRITE_PAGE               0x82    // page number in bits 5 to 3, page number inverted in bit 0 and following 2 bits
+#define HITAG2_HALT                     0x00    // left 5 bits only

 
 #define ISO_14443A    0
 #define ICLASS        1
 
 #define ISO_14443A    0
 #define ICLASS        1

diff --git a/include/hitag.h b/include/hitag.h
index 35660dcbbeb3e0fa1c4b3b9c65f0bcb6f5071d6c..b5b13c315f4cfef90014cb6cd9c13cf37a21daa7 100644 (file)
--- a/include/hitag.h
+++ b/include/hitag.h
@@ -31,6 +31,7 @@ typedef enum {
        WHT2F_CRYPTO              = 24,
        RHT2F_TEST_AUTH_ATTEMPTS  = 25,
        RHT2F_UID_ONLY            = 26,
        WHT2F_CRYPTO              = 24,
        RHT2F_TEST_AUTH_ATTEMPTS  = 25,
        RHT2F_UID_ONLY            = 26,

+    WHT2F_PASSWORD            = 27,

 } hitag_function;
 
 typedef struct {
 } hitag_function;
 
 typedef struct {