mirror of
https://github.com/Proxmark/proxmark3.git
synced 2025-08-19 21:03:23 -07:00
parent
1523527f94
commit
5866c187ef
9 changed files with 532 additions and 477 deletions
|
@ -161,18 +161,6 @@ void iClass_Dump(uint8_t blockno, uint8_t numblks);
|
||||||
void iClass_Clone(uint8_t startblock, uint8_t endblock, uint8_t *data);
|
void iClass_Clone(uint8_t startblock, uint8_t endblock, uint8_t *data);
|
||||||
void iClass_ReadCheck(uint8_t blockNo, uint8_t keyType);
|
void iClass_ReadCheck(uint8_t blockNo, uint8_t keyType);
|
||||||
|
|
||||||
// hitag2.h
|
|
||||||
void SnoopHitag(uint32_t type);
|
|
||||||
void SimulateHitagTag(bool tag_mem_supplied, byte_t* data);
|
|
||||||
void ReaderHitag(hitag_function htf, hitag_data* htd);
|
|
||||||
void WriterHitag(hitag_function htf, hitag_data* htd, int page);
|
|
||||||
|
|
||||||
//hitagS.h
|
|
||||||
void ReadHitagSCmd(hitag_function htf, hitag_data* htd, uint64_t startPage, uint64_t tagMode, bool readBlock);
|
|
||||||
void SimulateHitagSTag(bool tag_mem_supplied, byte_t* data);
|
|
||||||
void WritePageHitagS(hitag_function htf, hitag_data* htd,int page);
|
|
||||||
void check_challenges_cmd(bool file_given, byte_t* data, uint64_t tagMode);
|
|
||||||
|
|
||||||
// cmd.h
|
// cmd.h
|
||||||
bool cmd_receive(UsbCommand* cmd);
|
bool cmd_receive(UsbCommand* cmd);
|
||||||
bool cmd_send(uint32_t cmd, uint32_t arg0, uint32_t arg1, uint32_t arg2, void* data, size_t len);
|
bool cmd_send(uint32_t cmd, uint32_t arg0, uint32_t arg1, uint32_t arg2, void* data, size_t len);
|
||||||
|
|
160
armsrc/hitag2.c
160
armsrc/hitag2.c
|
@ -16,10 +16,12 @@
|
||||||
// (c) 2012 Roel Verdult
|
// (c) 2012 Roel Verdult
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
|
|
||||||
|
#include "hitag2.h"
|
||||||
|
|
||||||
#include "proxmark3.h"
|
#include "proxmark3.h"
|
||||||
#include "apps.h"
|
#include "apps.h"
|
||||||
#include "util.h"
|
#include "util.h"
|
||||||
#include "hitag2.h"
|
#include "hitag.h"
|
||||||
#include "string.h"
|
#include "string.h"
|
||||||
#include "BigBuf.h"
|
#include "BigBuf.h"
|
||||||
#include "fpgaloader.h"
|
#include "fpgaloader.h"
|
||||||
|
@ -48,21 +50,21 @@ struct hitag2_tag {
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct hitag2_tag tag = {
|
static struct hitag2_tag tag = {
|
||||||
.state = TAG_STATE_RESET,
|
.state = TAG_STATE_RESET,
|
||||||
.sectors = { // Password mode: | Crypto mode:
|
.sectors = { // Password mode: | Crypto mode:
|
||||||
[0] = { 0x02, 0x4e, 0x02, 0x20}, // UID | UID
|
[0] = { 0x02, 0x4e, 0x02, 0x20}, // UID | UID
|
||||||
[1] = { 0x4d, 0x49, 0x4b, 0x52}, // Password RWD | 32 bit LSB key
|
[1] = { 0x4d, 0x49, 0x4b, 0x52}, // Password RWD | 32 bit LSB key
|
||||||
[2] = { 0x20, 0xf0, 0x4f, 0x4e}, // Reserved | 16 bit MSB key, 16 bit reserved
|
[2] = { 0x20, 0xf0, 0x4f, 0x4e}, // Reserved | 16 bit MSB key, 16 bit reserved
|
||||||
[3] = { 0x0e, 0xaa, 0x48, 0x54}, // Configuration, password TAG | Configuration, password TAG
|
[3] = { 0x0e, 0xaa, 0x48, 0x54}, // Configuration, password TAG | Configuration, password TAG
|
||||||
[4] = { 0x46, 0x5f, 0x4f, 0x4b}, // Data: F_OK
|
[4] = { 0x46, 0x5f, 0x4f, 0x4b}, // Data: F_OK
|
||||||
[5] = { 0x55, 0x55, 0x55, 0x55}, // Data: UUUU
|
[5] = { 0x55, 0x55, 0x55, 0x55}, // Data: UUUU
|
||||||
[6] = { 0xaa, 0xaa, 0xaa, 0xaa}, // Data: ....
|
[6] = { 0xaa, 0xaa, 0xaa, 0xaa}, // Data: ....
|
||||||
[7] = { 0x55, 0x55, 0x55, 0x55}, // Data: UUUU
|
[7] = { 0x55, 0x55, 0x55, 0x55}, // Data: UUUU
|
||||||
[8] = { 0x00, 0x00, 0x00, 0x00}, // RSK Low
|
[8] = { 0x00, 0x00, 0x00, 0x00}, // RSK Low
|
||||||
[9] = { 0x00, 0x00, 0x00, 0x00}, // RSK High
|
[9] = { 0x00, 0x00, 0x00, 0x00}, // RSK High
|
||||||
[10] = { 0x00, 0x00, 0x00, 0x00}, // RCF
|
[10] = { 0x00, 0x00, 0x00, 0x00}, // RCF
|
||||||
[11] = { 0x00, 0x00, 0x00, 0x00}, // SYNC
|
[11] = { 0x00, 0x00, 0x00, 0x00}, // SYNC
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
static enum {
|
static enum {
|
||||||
|
@ -93,29 +95,29 @@ static uint64_t cipher_state;
|
||||||
|
|
||||||
// Basic macros:
|
// Basic macros:
|
||||||
|
|
||||||
#define u8 uint8_t
|
#define u8 uint8_t
|
||||||
#define u32 uint32_t
|
#define u32 uint32_t
|
||||||
#define u64 uint64_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 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 rev16(x) (rev8 (x)+(rev8 (x>> 8)<< 8))
|
||||||
#define rev32(x) (rev16(x)+(rev16(x>>16)<<16))
|
#define rev32(x) (rev16(x)+(rev16(x>>16)<<16))
|
||||||
#define rev64(x) (rev32(x)+(rev32(x>>32)<<32))
|
#define rev64(x) (rev32(x)+(rev32(x>>32)<<32))
|
||||||
#define bit(x,n) (((x)>>(n))&1)
|
#define bit(x,n) (((x)>>(n))&1)
|
||||||
#define bit32(x,n) ((((x)[(n)>>5])>>((n)))&1)
|
#define bit32(x,n) ((((x)[(n)>>5])>>((n)))&1)
|
||||||
#define inv32(x,i,n) ((x)[(i)>>5]^=((u32)(n))<<((i)&31))
|
#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)))
|
#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) ((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_f4a = 0x2C79; // 0010 1100 0111 1001
|
||||||
static const u32 ht2_f4b = 0x6671; // 0110 0110 0111 0001
|
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 u32 ht2_f5c = 0x7907287B; // 0111 1001 0000 0111 0010 1000 0111 1011
|
||||||
|
|
||||||
static u32 _f20 (const u64 x)
|
static u32 _f20 (const u64 x)
|
||||||
{
|
{
|
||||||
u32 i5;
|
u32 i5;
|
||||||
|
|
||||||
i5 = ((ht2_f4a >> i4 (x, 1, 2, 4, 5)) & 1)* 1
|
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, 7,11,13,14)) & 1)* 2
|
||||||
|
@ -128,8 +130,8 @@ static u32 _f20 (const u64 x)
|
||||||
|
|
||||||
static u64 _hitag2_init (const u64 key, const u32 serial, const u32 IV)
|
static u64 _hitag2_init (const u64 key, const u32 serial, const u32 IV)
|
||||||
{
|
{
|
||||||
u32 i;
|
u32 i;
|
||||||
u64 x = ((key & 0xFFFF) << 32) + serial;
|
u64 x = ((key & 0xFFFF) << 32) + serial;
|
||||||
|
|
||||||
for (i = 0; i < 32; i++)
|
for (i = 0; i < 32; i++)
|
||||||
{
|
{
|
||||||
|
@ -141,7 +143,7 @@ static u64 _hitag2_init (const u64 key, const u32 serial, const u32 IV)
|
||||||
|
|
||||||
static u64 _hitag2_round (u64 *state)
|
static u64 _hitag2_round (u64 *state)
|
||||||
{
|
{
|
||||||
u64 x = *state;
|
u64 x = *state;
|
||||||
|
|
||||||
x = (x >> 1) +
|
x = (x >> 1) +
|
||||||
((((x >> 0) ^ (x >> 2) ^ (x >> 3) ^ (x >> 6)
|
((((x >> 0) ^ (x >> 2) ^ (x >> 3) ^ (x >> 6)
|
||||||
|
@ -155,7 +157,7 @@ static u64 _hitag2_round (u64 *state)
|
||||||
|
|
||||||
static u32 _hitag2_byte (u64 * x)
|
static u32 _hitag2_byte (u64 * x)
|
||||||
{
|
{
|
||||||
u32 i, c;
|
u32 i, c;
|
||||||
|
|
||||||
for (i = 0, c = 0; i < 8; i++) c += (u32) _hitag2_round (x) << (i^7);
|
for (i = 0, c = 0; i < 8; i++) c += (u32) _hitag2_round (x) << (i^7);
|
||||||
return c;
|
return c;
|
||||||
|
@ -170,7 +172,7 @@ static int hitag2_reset(void)
|
||||||
|
|
||||||
static int hitag2_init(void)
|
static int hitag2_init(void)
|
||||||
{
|
{
|
||||||
// memcpy(&tag, &resetdata, sizeof(tag));
|
// memcpy(&tag, &resetdata, sizeof(tag));
|
||||||
hitag2_reset();
|
hitag2_reset();
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
@ -218,32 +220,32 @@ static int hitag2_cipher_transcrypt(uint64_t* cs, byte_t *data, unsigned int byt
|
||||||
// T0 = TIMER_CLOCK1 / 125000 = 192
|
// T0 = TIMER_CLOCK1 / 125000 = 192
|
||||||
#define T0 192
|
#define T0 192
|
||||||
|
|
||||||
#define SHORT_COIL() LOW(GPIO_SSC_DOUT)
|
#define SHORT_COIL() LOW(GPIO_SSC_DOUT)
|
||||||
#define OPEN_COIL() HIGH(GPIO_SSC_DOUT)
|
#define OPEN_COIL() HIGH(GPIO_SSC_DOUT)
|
||||||
|
|
||||||
#define HITAG_FRAME_LEN 20
|
#define HITAG_FRAME_LEN 20
|
||||||
#define HITAG_T_STOP 36 /* T_EOF should be > 36 */
|
#define HITAG_T_STOP 36 /* T_EOF should be > 36 */
|
||||||
#define HITAG_T_LOW 8 /* T_LOW should be 4..10 */
|
#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_0_MIN 15 /* T[0] should be 18..22 */
|
||||||
#define HITAG_T_1_MIN 25 /* T[1] should be 26..30 */
|
#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 40 /* T_EOF should be > 36 */
|
||||||
#define HITAG_T_EOF 80 /* 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_1 200 /* T_wresp should be 199..206 */
|
||||||
#define HITAG_T_WAIT_2 90 /* 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_ONE_HALF_PERIOD 10
|
||||||
#define HITAG_T_TAG_TWO_HALF_PERIOD 25
|
#define HITAG_T_TAG_TWO_HALF_PERIOD 25
|
||||||
#define HITAG_T_TAG_THREE_HALF_PERIOD 41
|
#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_HALF_PERIOD 16
|
||||||
#define HITAG_T_TAG_FULL_PERIOD 32
|
#define HITAG_T_TAG_FULL_PERIOD 32
|
||||||
|
|
||||||
#define HITAG_T_TAG_CAPTURE_ONE_HALF 13
|
#define HITAG_T_TAG_CAPTURE_ONE_HALF 13
|
||||||
#define HITAG_T_TAG_CAPTURE_TWO_HALF 25
|
#define HITAG_T_TAG_CAPTURE_TWO_HALF 25
|
||||||
#define HITAG_T_TAG_CAPTURE_THREE_HALF 41
|
#define HITAG_T_TAG_CAPTURE_THREE_HALF 41
|
||||||
#define HITAG_T_TAG_CAPTURE_FOUR_HALF 57
|
#define HITAG_T_TAG_CAPTURE_FOUR_HALF 57
|
||||||
|
|
||||||
|
|
||||||
|
@ -405,8 +407,8 @@ static void hitag2_handle_reader_command(byte_t* rx, const size_t rxlen, byte_t*
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
// LogTraceHitag(rx,rxlen,0,0,false);
|
// LogTraceHitag(rx,rxlen,0,0,false);
|
||||||
// LogTraceHitag(tx,*txlen,0,0,true);
|
// 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,7 +428,7 @@ static void hitag_reader_send_bit(int bit) {
|
||||||
|
|
||||||
// Wait for 4-10 times the carrier period
|
// Wait for 4-10 times the carrier period
|
||||||
while(AT91C_BASE_TC0->TC_CV < T0*6);
|
while(AT91C_BASE_TC0->TC_CV < T0*6);
|
||||||
// SpinDelayUs(8*8);
|
// SpinDelayUs(8*8);
|
||||||
|
|
||||||
// Disable modulation, just activates the field again
|
// Disable modulation, just activates the field again
|
||||||
LOW(GPIO_SSC_DOUT);
|
LOW(GPIO_SSC_DOUT);
|
||||||
|
@ -434,11 +436,11 @@ static void hitag_reader_send_bit(int bit) {
|
||||||
if(bit == 0) {
|
if(bit == 0) {
|
||||||
// Zero bit: |_-|
|
// Zero bit: |_-|
|
||||||
while(AT91C_BASE_TC0->TC_CV < T0*22);
|
while(AT91C_BASE_TC0->TC_CV < T0*22);
|
||||||
// SpinDelayUs(16*8);
|
// SpinDelayUs(16*8);
|
||||||
} else {
|
} else {
|
||||||
// One bit: |_--|
|
// One bit: |_--|
|
||||||
while(AT91C_BASE_TC0->TC_CV < T0*28);
|
while(AT91C_BASE_TC0->TC_CV < T0*28);
|
||||||
// SpinDelayUs(22*8);
|
// SpinDelayUs(22*8);
|
||||||
}
|
}
|
||||||
LED_A_OFF();
|
LED_A_OFF();
|
||||||
}
|
}
|
||||||
|
@ -529,8 +531,8 @@ static bool hitag2_write_page(byte_t* rx, const size_t rxlen, byte_t* tx, size_t
|
||||||
case WRITE_STATE_PAGENUM_WRITTEN:
|
case WRITE_STATE_PAGENUM_WRITTEN:
|
||||||
// Check if page number was received correctly
|
// Check if page number was received correctly
|
||||||
if ((rxlen == 10) &&
|
if ((rxlen == 10) &&
|
||||||
(rx[0] == (0x82 | (blocknr << 3) | ((blocknr^7) >> 2))) &&
|
(rx[0] == (0x82 | (blocknr << 3) | ((blocknr^7) >> 2))) &&
|
||||||
(rx[1] == (((blocknr & 0x3) ^ 0x3) << 6))) {
|
(rx[1] == (((blocknr & 0x3) ^ 0x3) << 6))) {
|
||||||
*txlen = 32;
|
*txlen = 32;
|
||||||
memset(tx, 0, HITAG_FRAME_LEN);
|
memset(tx, 0, HITAG_FRAME_LEN);
|
||||||
memcpy(tx, writedata, 4);
|
memcpy(tx, writedata, 4);
|
||||||
|
@ -740,7 +742,7 @@ static bool hitag2_test_auth_attempts(byte_t* rx, const size_t rxlen, byte_t* tx
|
||||||
}
|
}
|
||||||
*txlen = 5;
|
*txlen = 5;
|
||||||
memcpy(tx,"\xc0",nbytes(*txlen));
|
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: {
|
case 32: {
|
||||||
|
@ -854,7 +856,7 @@ void SnoopHitag(uint32_t type) {
|
||||||
// Disable timer during configuration
|
// Disable timer during configuration
|
||||||
AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
|
AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
|
||||||
|
|
||||||
// Capture mode, defaul timer source = MCK/2 (TIMER_CLOCK1), TIOA is external trigger,
|
// 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.
|
// 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;
|
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 = t1_channel_mode;
|
||||||
|
@ -1014,9 +1016,9 @@ void SnoopHitag(uint32_t type) {
|
||||||
FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
|
FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
|
||||||
LED_A_OFF();
|
LED_A_OFF();
|
||||||
|
|
||||||
// Dbprintf("frame received: %d",frame_count);
|
// Dbprintf("frame received: %d",frame_count);
|
||||||
// Dbprintf("Authentication Attempts: %d",(auth_table_len/8));
|
// Dbprintf("Authentication Attempts: %d",(auth_table_len/8));
|
||||||
// DbpString("All done");
|
// DbpString("All done");
|
||||||
}
|
}
|
||||||
|
|
||||||
void SimulateHitagTag(bool tag_mem_supplied, byte_t* data) {
|
void SimulateHitagTag(bool tag_mem_supplied, byte_t* data) {
|
||||||
|
@ -1083,9 +1085,13 @@ void SimulateHitagTag(bool tag_mem_supplied, byte_t* data) {
|
||||||
AT91C_BASE_PIOA->PIO_BSR = GPIO_SSC_FRAME;
|
AT91C_BASE_PIOA->PIO_BSR = GPIO_SSC_FRAME;
|
||||||
|
|
||||||
// Disable timer during configuration
|
// Disable timer during configuration
|
||||||
|
AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKDIS;
|
||||||
AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
|
AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
|
||||||
|
|
||||||
// Capture mode, default timer source = MCK/2 (TIMER_CLOCK1), TIOA is external trigger,
|
// TC0: Capture mode, default timer source = MCK/2 (TIMER_CLOCK1), no triggers
|
||||||
|
AT91C_BASE_TC0->TC_CMR = AT91C_TC_CLKS_TIMER_DIV1_CLOCK;
|
||||||
|
|
||||||
|
// 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.
|
// external trigger rising edge, load RA on rising edge of TIOA.
|
||||||
AT91C_BASE_TC1->TC_CMR = AT91C_TC_CLKS_TIMER_DIV1_CLOCK | AT91C_TC_ETRGEDG_RISING | AT91C_TC_ABETRG | AT91C_TC_LDRA_RISING;
|
AT91C_BASE_TC1->TC_CMR = AT91C_TC_CLKS_TIMER_DIV1_CLOCK | AT91C_TC_ETRGEDG_RISING | AT91C_TC_ABETRG | AT91C_TC_LDRA_RISING;
|
||||||
|
|
||||||
|
@ -1253,7 +1259,7 @@ void ReaderHitag(hitag_function htf, hitag_data* htd) {
|
||||||
case RHT2F_CRYPTO:
|
case RHT2F_CRYPTO:
|
||||||
{
|
{
|
||||||
DbpString("Authenticating using key:");
|
DbpString("Authenticating using key:");
|
||||||
memcpy(key,htd->crypto.key,6); //HACK; 4 or 6?? I read both in the code.
|
memcpy(key,htd->crypto.key,6); //HACK; 4 or 6?? I read both in the code.
|
||||||
Dbhexdump(6,key,false);
|
Dbhexdump(6,key,false);
|
||||||
blocknr = 0;
|
blocknr = 0;
|
||||||
bQuiet = false;
|
bQuiet = false;
|
||||||
|
@ -1311,9 +1317,13 @@ void ReaderHitag(hitag_function htf, hitag_data* htd) {
|
||||||
AT91C_BASE_PIOA->PIO_BSR = GPIO_SSC_FRAME;
|
AT91C_BASE_PIOA->PIO_BSR = GPIO_SSC_FRAME;
|
||||||
|
|
||||||
// Disable timer during configuration
|
// Disable timer during configuration
|
||||||
|
AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKDIS;
|
||||||
AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
|
AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
|
||||||
|
|
||||||
// Capture mode, defaul timer source = MCK/2 (TIMER_CLOCK1), TIOA is external trigger,
|
// TC0: Capture mode, default timer source = MCK/2 (TIMER_CLOCK1), no triggers
|
||||||
|
AT91C_BASE_TC0->TC_CMR = AT91C_TC_CLKS_TIMER_DIV1_CLOCK;
|
||||||
|
|
||||||
|
// TC1: Capture mode, default timer source = MCK/2 (TIMER_CLOCK1), TIOA is external trigger,
|
||||||
// external trigger rising edge, load RA on falling edge of TIOA.
|
// external trigger rising edge, load RA on falling edge of TIOA.
|
||||||
AT91C_BASE_TC1->TC_CMR = AT91C_TC_CLKS_TIMER_DIV1_CLOCK | AT91C_TC_ETRGEDG_FALLING | AT91C_TC_ABETRG | AT91C_TC_LDRA_FALLING;
|
AT91C_BASE_TC1->TC_CMR = AT91C_TC_CLKS_TIMER_DIV1_CLOCK | AT91C_TC_ETRGEDG_FALLING | AT91C_TC_ABETRG | AT91C_TC_LDRA_FALLING;
|
||||||
|
|
||||||
|
@ -1461,7 +1471,7 @@ void ReaderHitag(hitag_function htf, hitag_data* htd) {
|
||||||
|
|
||||||
//need to test to verify we don't exceed memory...
|
//need to test to verify we don't exceed memory...
|
||||||
//if ( ((rxlen+2) / 8) > HITAG_FRAME_LEN) {
|
//if ( ((rxlen+2) / 8) > HITAG_FRAME_LEN) {
|
||||||
// break;
|
// break;
|
||||||
//}
|
//}
|
||||||
rx[rxlen / 8] |= 0 << (7-(rxlen%8));
|
rx[rxlen / 8] |= 0 << (7-(rxlen%8));
|
||||||
rxlen++;
|
rxlen++;
|
||||||
|
@ -1472,7 +1482,7 @@ void ReaderHitag(hitag_function htf, hitag_data* htd) {
|
||||||
|
|
||||||
//need to test to verify we don't exceed memory...
|
//need to test to verify we don't exceed memory...
|
||||||
//if ( ((rxlen+2) / 8) > HITAG_FRAME_LEN) {
|
//if ( ((rxlen+2) / 8) > HITAG_FRAME_LEN) {
|
||||||
// break;
|
// break;
|
||||||
//}
|
//}
|
||||||
rx[rxlen / 8] |= 0 << (7-(rxlen%8));
|
rx[rxlen / 8] |= 0 << (7-(rxlen%8));
|
||||||
rxlen++;
|
rxlen++;
|
||||||
|
@ -1488,7 +1498,7 @@ void ReaderHitag(hitag_function htf, hitag_data* htd) {
|
||||||
|
|
||||||
//need to test to verify we don't exceed memory...
|
//need to test to verify we don't exceed memory...
|
||||||
//if ( ((rxlen+2) / 8) > HITAG_FRAME_LEN) {
|
//if ( ((rxlen+2) / 8) > HITAG_FRAME_LEN) {
|
||||||
// break;
|
// break;
|
||||||
//}
|
//}
|
||||||
if (tag_sof) {
|
if (tag_sof) {
|
||||||
// Ignore bits that are transmitted during SOF
|
// Ignore bits that are transmitted during SOF
|
||||||
|
@ -1559,7 +1569,7 @@ void WriterHitag(hitag_function htf, hitag_data* htd, int page) {
|
||||||
case WHT2F_CRYPTO:
|
case WHT2F_CRYPTO:
|
||||||
{
|
{
|
||||||
DbpString("Authenticating using key:");
|
DbpString("Authenticating using key:");
|
||||||
memcpy(key,htd->crypto.key,6); //HACK; 4 or 6?? I read both in the code.
|
memcpy(key,htd->crypto.key,6); //HACK; 4 or 6?? I read both in the code.
|
||||||
memcpy(writedata, htd->crypto.data, 4);
|
memcpy(writedata, htd->crypto.data, 4);
|
||||||
Dbhexdump(6,key,false);
|
Dbhexdump(6,key,false);
|
||||||
blocknr = page;
|
blocknr = page;
|
||||||
|
@ -1604,9 +1614,13 @@ void WriterHitag(hitag_function htf, hitag_data* htd, int page) {
|
||||||
AT91C_BASE_PIOA->PIO_BSR = GPIO_SSC_FRAME;
|
AT91C_BASE_PIOA->PIO_BSR = GPIO_SSC_FRAME;
|
||||||
|
|
||||||
// Disable timer during configuration
|
// Disable timer during configuration
|
||||||
|
AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKDIS;
|
||||||
AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
|
AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
|
||||||
|
|
||||||
// Capture mode, defaul timer source = MCK/2 (TIMER_CLOCK1), TIOA is external trigger,
|
// TC0: Capture mode, default timer source = MCK/2 (TIMER_CLOCK1), no triggers
|
||||||
|
AT91C_BASE_TC0->TC_CMR = AT91C_TC_CLKS_TIMER_DIV1_CLOCK;
|
||||||
|
|
||||||
|
// TC1: Capture mode, default timer source = MCK/2 (TIMER_CLOCK1), TIOA is external trigger,
|
||||||
// external trigger rising edge, load RA on falling edge of TIOA.
|
// external trigger rising edge, load RA on falling edge of TIOA.
|
||||||
AT91C_BASE_TC1->TC_CMR = AT91C_TC_CLKS_TIMER_DIV1_CLOCK | AT91C_TC_ETRGEDG_FALLING | AT91C_TC_ABETRG | AT91C_TC_LDRA_FALLING;
|
AT91C_BASE_TC1->TC_CMR = AT91C_TC_CLKS_TIMER_DIV1_CLOCK | AT91C_TC_ETRGEDG_FALLING | AT91C_TC_ABETRG | AT91C_TC_LDRA_FALLING;
|
||||||
|
|
||||||
|
@ -1687,7 +1701,7 @@ void WriterHitag(hitag_function htf, hitag_data* htd, int page) {
|
||||||
// Transmit the 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;
|
AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
|
||||||
|
|
||||||
// Add transmitted frame to total count
|
// Add transmitted frame to total count
|
||||||
|
@ -1740,7 +1754,7 @@ void WriterHitag(hitag_function htf, hitag_data* htd, int page) {
|
||||||
|
|
||||||
//need to test to verify we don't exceed memory...
|
//need to test to verify we don't exceed memory...
|
||||||
//if ( ((rxlen+2) / 8) > HITAG_FRAME_LEN) {
|
//if ( ((rxlen+2) / 8) > HITAG_FRAME_LEN) {
|
||||||
// break;
|
// break;
|
||||||
//}
|
//}
|
||||||
rx[rxlen / 8] |= 0 << (7-(rxlen%8));
|
rx[rxlen / 8] |= 0 << (7-(rxlen%8));
|
||||||
rxlen++;
|
rxlen++;
|
||||||
|
@ -1751,7 +1765,7 @@ void WriterHitag(hitag_function htf, hitag_data* htd, int page) {
|
||||||
|
|
||||||
//need to test to verify we don't exceed memory...
|
//need to test to verify we don't exceed memory...
|
||||||
//if ( ((rxlen+2) / 8) > HITAG_FRAME_LEN) {
|
//if ( ((rxlen+2) / 8) > HITAG_FRAME_LEN) {
|
||||||
// break;
|
// break;
|
||||||
//}
|
//}
|
||||||
rx[rxlen / 8] |= 0 << (7-(rxlen%8));
|
rx[rxlen / 8] |= 0 << (7-(rxlen%8));
|
||||||
rxlen++;
|
rxlen++;
|
||||||
|
@ -1767,7 +1781,7 @@ void WriterHitag(hitag_function htf, hitag_data* htd, int page) {
|
||||||
|
|
||||||
//need to test to verify we don't exceed memory...
|
//need to test to verify we don't exceed memory...
|
||||||
//if ( ((rxlen+2) / 8) > HITAG_FRAME_LEN) {
|
//if ( ((rxlen+2) / 8) > HITAG_FRAME_LEN) {
|
||||||
// break;
|
// break;
|
||||||
//}
|
//}
|
||||||
if (tag_sof) {
|
if (tag_sof) {
|
||||||
// Ignore bits that are transmitted during SOF
|
// Ignore bits that are transmitted during SOF
|
||||||
|
|
24
armsrc/hitag2.h
Normal file
24
armsrc/hitag2.h
Normal file
|
@ -0,0 +1,24 @@
|
||||||
|
//-----------------------------------------------------------------------------
|
||||||
|
// This code is licensed to you under the terms of the GNU GPL, version 2 or,
|
||||||
|
// at your option, any later version. See the LICENSE.txt file for the text of
|
||||||
|
// the license.
|
||||||
|
//-----------------------------------------------------------------------------
|
||||||
|
// Hitag2 emulation
|
||||||
|
//
|
||||||
|
// (c) 2009 Henryk Plötz <henryk@ploetzli.ch>
|
||||||
|
// (c) 2012 Roel Verdult
|
||||||
|
//-----------------------------------------------------------------------------
|
||||||
|
|
||||||
|
#ifndef HITAG2_H__
|
||||||
|
#define HITAG2_H__
|
||||||
|
|
||||||
|
#include <stdint.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);
|
||||||
|
|
||||||
|
#endif
|
235
armsrc/hitagS.c
235
armsrc/hitagS.c
|
@ -12,12 +12,13 @@
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
||||||
|
#include "hitagS.h"
|
||||||
|
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include "proxmark3.h"
|
#include "proxmark3.h"
|
||||||
#include "apps.h"
|
#include "apps.h"
|
||||||
#include "util.h"
|
#include "util.h"
|
||||||
#include "hitagS.h"
|
#include "hitag.h"
|
||||||
#include "hitag2.h"
|
|
||||||
#include "string.h"
|
#include "string.h"
|
||||||
#include "BigBuf.h"
|
#include "BigBuf.h"
|
||||||
#include "fpgaloader.h"
|
#include "fpgaloader.h"
|
||||||
|
@ -25,17 +26,17 @@
|
||||||
#define CRC_PRESET 0xFF
|
#define CRC_PRESET 0xFF
|
||||||
#define CRC_POLYNOM 0x1D
|
#define CRC_POLYNOM 0x1D
|
||||||
|
|
||||||
#define u8 uint8_t
|
#define u8 uint8_t
|
||||||
#define u32 uint32_t
|
#define u32 uint32_t
|
||||||
#define u64 uint64_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 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 rev16(x) (rev8 (x)+(rev8 (x>> 8)<< 8))
|
||||||
#define rev32(x) (rev16(x)+(rev16(x>>16)<<16))
|
#define rev32(x) (rev16(x)+(rev16(x>>16)<<16))
|
||||||
#define rev64(x) (rev32(x)+(rev32(x>>32)<<32))
|
#define rev64(x) (rev32(x)+(rev32(x>>32)<<32))
|
||||||
#define bit(x,n) (((x)>>(n))&1)
|
#define bit(x,n) (((x)>>(n))&1)
|
||||||
#define bit32(x,n) ((((x)[(n)>>5])>>((n)))&1)
|
#define bit32(x,n) ((((x)[(n)>>5])>>((n)))&1)
|
||||||
#define inv32(x,i,n) ((x)[(i)>>5]^=((u32)(n))<<((i)&31))
|
#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)))
|
#define rotl64(x, n) ((((u64)(x))<<((n)&63))+(((u64)(x))>>((0-(n))&63)))
|
||||||
|
|
||||||
static bool bQuiet;
|
static bool bQuiet;
|
||||||
static bool bSuccessful;
|
static bool bSuccessful;
|
||||||
|
@ -45,25 +46,25 @@ static int block_data_left = 0;
|
||||||
typedef enum modulation {
|
typedef enum modulation {
|
||||||
AC2K = 0, AC4K, MC4K, MC8K
|
AC2K = 0, AC4K, MC4K, MC8K
|
||||||
} MOD;
|
} MOD;
|
||||||
static MOD m = AC2K; //used modulation
|
static MOD m = AC2K; //used modulation
|
||||||
static uint32_t temp_uid;
|
static uint32_t temp_uid;
|
||||||
static int temp2 = 0;
|
static int temp2 = 0;
|
||||||
static int sof_bits; //number of start-of-frame bits
|
static int sof_bits; //number of start-of-frame bits
|
||||||
static byte_t pwdh0, pwdl0, pwdl1; //password bytes
|
static byte_t pwdh0, pwdl0, pwdl1; //password bytes
|
||||||
static uint32_t rnd = 0x74124485; //randomnumber
|
static uint32_t rnd = 0x74124485; //randomnumber
|
||||||
static int test = 0;
|
static int test = 0;
|
||||||
size_t blocknr;
|
size_t blocknr;
|
||||||
bool end=false;
|
bool end=false;
|
||||||
|
|
||||||
// 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) ((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_f4a = 0x2C79; // 0010 1100 0111 1001
|
||||||
static const u32 ht2_f4b = 0x6671; // 0110 0110 0111 0001
|
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 u32 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_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_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_5c(a,b,c,d,e) (~((((((c^e)|d)&a)^b)&(c^b))^(((d^e)|a)&((d^b)|c))))
|
||||||
#define uf20bs u32
|
#define uf20bs u32
|
||||||
|
|
||||||
static u32 f20(const u64 x) {
|
static u32 f20(const u64 x) {
|
||||||
u32 i5;
|
u32 i5;
|
||||||
|
@ -109,34 +110,34 @@ static u32 hitag2_byte(u64 *x) {
|
||||||
// TIMER_CLOCK1 = MCK/2, MCK is running at 48 MHz, Timer is running at 48/2 = 24 MHz
|
// TIMER_CLOCK1 = MCK/2, MCK is running at 48 MHz, Timer is running at 48/2 = 24 MHz
|
||||||
// Hitag units (T0) have duration of 8 microseconds (us), which is 1/125000 per second (carrier)
|
// Hitag units (T0) have duration of 8 microseconds (us), which is 1/125000 per second (carrier)
|
||||||
// T0 = TIMER_CLOCK1 / 125000 = 192
|
// T0 = TIMER_CLOCK1 / 125000 = 192
|
||||||
#define T0 192
|
#define T0 192
|
||||||
|
|
||||||
#define SHORT_COIL() LOW(GPIO_SSC_DOUT)
|
#define SHORT_COIL() LOW(GPIO_SSC_DOUT)
|
||||||
#define OPEN_COIL() HIGH(GPIO_SSC_DOUT)
|
#define OPEN_COIL() HIGH(GPIO_SSC_DOUT)
|
||||||
|
|
||||||
#define HITAG_FRAME_LEN 20
|
#define HITAG_FRAME_LEN 20
|
||||||
#define HITAG_T_STOP 36 /* T_EOF should be > 36 */
|
#define HITAG_T_STOP 36 /* T_EOF should be > 36 */
|
||||||
#define HITAG_T_LOW 8 /* T_LOW should be 4..10 */
|
#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_0_MIN 15 /* T[0] should be 18..22 */
|
||||||
#define HITAG_T_1_MIN 25 /* T[1] should be 26..30 */
|
#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 40 /* T_EOF should be > 36 */
|
||||||
#define HITAG_T_EOF 80 /* 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_1 200 /* T_wresp should be 199..206 */
|
||||||
#define HITAG_T_WAIT_2 90 /* 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_TAG_ONE_HALF_PERIOD 10
|
#define HITAG_T_TAG_ONE_HALF_PERIOD 10
|
||||||
#define HITAG_T_TAG_TWO_HALF_PERIOD 25
|
#define HITAG_T_TAG_TWO_HALF_PERIOD 25
|
||||||
#define HITAG_T_TAG_THREE_HALF_PERIOD 41
|
#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_HALF_PERIOD 16
|
||||||
#define HITAG_T_TAG_FULL_PERIOD 32
|
#define HITAG_T_TAG_FULL_PERIOD 32
|
||||||
|
|
||||||
#define HITAG_T_TAG_CAPTURE_ONE_HALF 13
|
#define HITAG_T_TAG_CAPTURE_ONE_HALF 13
|
||||||
#define HITAG_T_TAG_CAPTURE_TWO_HALF 25
|
#define HITAG_T_TAG_CAPTURE_TWO_HALF 25
|
||||||
#define HITAG_T_TAG_CAPTURE_THREE_HALF 41
|
#define HITAG_T_TAG_CAPTURE_THREE_HALF 41
|
||||||
#define HITAG_T_TAG_CAPTURE_FOUR_HALF 57
|
#define HITAG_T_TAG_CAPTURE_FOUR_HALF 57
|
||||||
|
|
||||||
#define DEBUG 0
|
#define DEBUG 0
|
||||||
|
|
||||||
|
@ -290,7 +291,7 @@ static void hitag_reader_send_bit(int bit) {
|
||||||
// Wait for 4-10 times the carrier period
|
// Wait for 4-10 times the carrier period
|
||||||
while (AT91C_BASE_TC0->TC_CV < T0 * 6)
|
while (AT91C_BASE_TC0->TC_CV < T0 * 6)
|
||||||
;
|
;
|
||||||
// SpinDelayUs(8*8);
|
// SpinDelayUs(8*8);
|
||||||
|
|
||||||
// Disable modulation, just activates the field again
|
// Disable modulation, just activates the field again
|
||||||
LOW(GPIO_SSC_DOUT);
|
LOW(GPIO_SSC_DOUT);
|
||||||
|
@ -299,18 +300,18 @@ static void hitag_reader_send_bit(int bit) {
|
||||||
// Zero bit: |_-|
|
// Zero bit: |_-|
|
||||||
while (AT91C_BASE_TC0->TC_CV < T0 * 11)
|
while (AT91C_BASE_TC0->TC_CV < T0 * 11)
|
||||||
;
|
;
|
||||||
// SpinDelayUs(16*8);
|
// SpinDelayUs(16*8);
|
||||||
} else {
|
} else {
|
||||||
// One bit: |_--|
|
// One bit: |_--|
|
||||||
while (AT91C_BASE_TC0->TC_CV < T0 * 14)
|
while (AT91C_BASE_TC0->TC_CV < T0 * 14)
|
||||||
;
|
;
|
||||||
// SpinDelayUs(22*8);
|
// SpinDelayUs(22*8);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
// Wait for 4-10 times the carrier period
|
// Wait for 4-10 times the carrier period
|
||||||
while (AT91C_BASE_TC0->TC_CV < T0 * 6)
|
while (AT91C_BASE_TC0->TC_CV < T0 * 6)
|
||||||
;
|
;
|
||||||
// SpinDelayUs(8*8);
|
// SpinDelayUs(8*8);
|
||||||
|
|
||||||
// Disable modulation, just activates the field again
|
// Disable modulation, just activates the field again
|
||||||
LOW(GPIO_SSC_DOUT);
|
LOW(GPIO_SSC_DOUT);
|
||||||
|
@ -319,12 +320,12 @@ static void hitag_reader_send_bit(int bit) {
|
||||||
// Zero bit: |_-|
|
// Zero bit: |_-|
|
||||||
while (AT91C_BASE_TC0->TC_CV < T0 * 22)
|
while (AT91C_BASE_TC0->TC_CV < T0 * 22)
|
||||||
;
|
;
|
||||||
// SpinDelayUs(16*8);
|
// SpinDelayUs(16*8);
|
||||||
} else {
|
} else {
|
||||||
// One bit: |_--|
|
// One bit: |_--|
|
||||||
while (AT91C_BASE_TC0->TC_CV < T0 * 28)
|
while (AT91C_BASE_TC0->TC_CV < T0 * 28)
|
||||||
;
|
;
|
||||||
// SpinDelayUs(22*8);
|
// SpinDelayUs(22*8);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -608,8 +609,8 @@ static void hitag_receive_frame(byte_t* rx, size_t* rxlen, int* response) {
|
||||||
// DATA | 1 | 0 | 1 | 1 | 0 |
|
// DATA | 1 | 0 | 1 | 1 | 0 |
|
||||||
// Manchester |--__|__--|--__|--__|__--|
|
// Manchester |--__|__--|--__|--__|__--|
|
||||||
// Anti Collision |-_-_|--__|-_-_|-_-_|--__|
|
// Anti Collision |-_-_|--__|-_-_|-_-_|--__|
|
||||||
// |<-->|
|
// |<-->|
|
||||||
// | T |
|
// | T |
|
||||||
case AC2K:
|
case AC2K:
|
||||||
if (DEBUG >= 2) { Dbprintf("decoding frame with modulation AC2K"); }
|
if (DEBUG >= 2) { Dbprintf("decoding frame with modulation AC2K"); }
|
||||||
hitag_decode_frame_AC(2, sofBits, rx, rxlen, response, rawMod, rawLen);
|
hitag_decode_frame_AC(2, sofBits, rx, rxlen, response, rawMod, rawLen);
|
||||||
|
@ -1222,8 +1223,8 @@ static int hitagS_handle_tag_auth(hitag_function htf,uint64_t key, uint64_t NrAr
|
||||||
*txlen = 0;
|
*txlen = 0;
|
||||||
|
|
||||||
if (DEBUG) {
|
if (DEBUG) {
|
||||||
Dbprintf("START hitagS_handle_tag_auth - rxlen: %d, tagstate=%d", rxlen, (int)tag.pstate);
|
Dbprintf("START hitagS_handle_tag_auth - rxlen: %d, tagstate=%d", rxlen, (int)tag.pstate);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (tag.pstate == READY && rxlen >= 32) {
|
if (tag.pstate == READY && rxlen >= 32) {
|
||||||
//received uid
|
//received uid
|
||||||
|
@ -1418,8 +1419,8 @@ static int hitagS_handle_tag_auth(hitag_function htf,uint64_t key, uint64_t NrAr
|
||||||
}
|
}
|
||||||
|
|
||||||
if (DEBUG) {
|
if (DEBUG) {
|
||||||
Dbprintf("END hitagS_handle_tag_auth - tagstate=%d", (int)tag.pstate);
|
Dbprintf("END hitagS_handle_tag_auth - tagstate=%d", (int)tag.pstate);
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
@ -1535,9 +1536,13 @@ void SimulateHitagSTag(bool tag_mem_supplied, byte_t* data) {
|
||||||
AT91C_BASE_PIOA->PIO_BSR = GPIO_SSC_FRAME;
|
AT91C_BASE_PIOA->PIO_BSR = GPIO_SSC_FRAME;
|
||||||
|
|
||||||
// Disable timer during configuration
|
// Disable timer during configuration
|
||||||
|
AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKDIS;
|
||||||
AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
|
AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
|
||||||
|
|
||||||
// Capture mode, default timer source = MCK/2 (TIMER_CLOCK1), TIOA is external trigger,
|
// TC0: Capture mode, default timer source = MCK/2 (TIMER_CLOCK1), no triggers
|
||||||
|
AT91C_BASE_TC0->TC_CMR = AT91C_TC_CLKS_TIMER_DIV1_CLOCK;
|
||||||
|
|
||||||
|
// 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.
|
// external trigger rising edge, load RA on rising edge of TIOA.
|
||||||
AT91C_BASE_TC1->TC_CMR = AT91C_TC_CLKS_TIMER_DIV1_CLOCK | AT91C_TC_ETRGEDG_RISING | AT91C_TC_ABETRG | AT91C_TC_LDRA_RISING;
|
AT91C_BASE_TC1->TC_CMR = AT91C_TC_CLKS_TIMER_DIV1_CLOCK | AT91C_TC_ETRGEDG_RISING | AT91C_TC_ABETRG | AT91C_TC_LDRA_RISING;
|
||||||
|
|
||||||
|
@ -1690,7 +1695,7 @@ void ReadHitagSintern(hitag_function htf, hitag_data* htd, stype tagMode, int st
|
||||||
memcpy(NrAr_,htd->auth.NrAr,8);
|
memcpy(NrAr_,htd->auth.NrAr,8);
|
||||||
Dbhexdump(8,NrAr_,false);
|
Dbhexdump(8,NrAr_,false);
|
||||||
NrAr=NrAr_[7] | ((uint64_t)NrAr_[6]) << 8 | ((uint64_t)NrAr_[5]) << 16 | ((uint64_t)NrAr_[4]) << 24 | ((uint64_t)NrAr_[3]) << 32 |
|
NrAr=NrAr_[7] | ((uint64_t)NrAr_[6]) << 8 | ((uint64_t)NrAr_[5]) << 16 | ((uint64_t)NrAr_[4]) << 24 | ((uint64_t)NrAr_[3]) << 32 |
|
||||||
((uint64_t)NrAr_[2]) << 40| ((uint64_t)NrAr_[1]) << 48 | ((uint64_t)NrAr_[0]) << 56;
|
((uint64_t)NrAr_[2]) << 40| ((uint64_t)NrAr_[1]) << 48 | ((uint64_t)NrAr_[0]) << 56;
|
||||||
} break;
|
} break;
|
||||||
case 02:
|
case 02:
|
||||||
case 04: { //RHTS_KEY
|
case 04: { //RHTS_KEY
|
||||||
|
@ -1708,10 +1713,10 @@ void ReadHitagSintern(hitag_function htf, hitag_data* htd, stype tagMode, int st
|
||||||
|
|
||||||
|
|
||||||
FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
|
FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
|
||||||
// Reset the return status
|
// Reset the return status
|
||||||
bSuccessful = false;
|
bSuccessful = false;
|
||||||
|
|
||||||
// Clean up trace and prepare it for storing frames
|
// Clean up trace and prepare it for storing frames
|
||||||
set_tracing(true);
|
set_tracing(true);
|
||||||
clear_trace();
|
clear_trace();
|
||||||
|
|
||||||
|
@ -1719,43 +1724,47 @@ void ReadHitagSintern(hitag_function htf, hitag_data* htd, stype tagMode, int st
|
||||||
|
|
||||||
LED_D_ON();
|
LED_D_ON();
|
||||||
|
|
||||||
// Configure output and enable pin that is connected to the FPGA (for modulating)
|
// Configure output and enable pin that is connected to the FPGA (for modulating)
|
||||||
AT91C_BASE_PIOA->PIO_OER = GPIO_SSC_DOUT;
|
AT91C_BASE_PIOA->PIO_OER = GPIO_SSC_DOUT;
|
||||||
AT91C_BASE_PIOA->PIO_PER = GPIO_SSC_DOUT;
|
AT91C_BASE_PIOA->PIO_PER = GPIO_SSC_DOUT;
|
||||||
|
|
||||||
// Set fpga in edge detect with reader field, we can modulate as reader now
|
// Set fpga in edge detect with reader field, we can modulate as reader now
|
||||||
FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_EDGE_DETECT | FPGA_LF_EDGE_DETECT_READER_FIELD);
|
FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_EDGE_DETECT | FPGA_LF_EDGE_DETECT_READER_FIELD);
|
||||||
|
|
||||||
// Set Frequency divisor which will drive the FPGA and analog mux selection
|
// Set Frequency divisor which will drive the FPGA and analog mux selection
|
||||||
FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 95); //125Khz
|
FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 95); //125Khz
|
||||||
SetAdcMuxFor(GPIO_MUXSEL_LOPKD);
|
SetAdcMuxFor(GPIO_MUXSEL_LOPKD);
|
||||||
RELAY_OFF();
|
RELAY_OFF();
|
||||||
|
|
||||||
// Disable modulation at default, which means enable the field
|
// Disable modulation at default, which means enable the field
|
||||||
LOW(GPIO_SSC_DOUT);
|
LOW(GPIO_SSC_DOUT);
|
||||||
|
|
||||||
// Give it a bit of time for the resonant antenna to settle.
|
// Give it a bit of time for the resonant antenna to settle.
|
||||||
SpinDelay(30);
|
SpinDelay(30);
|
||||||
|
|
||||||
// Enable Peripheral Clock for TIMER_CLOCK0, used to measure exact timing before answering
|
// Enable Peripheral Clock for TIMER_CLOCK0, used to measure exact timing before answering
|
||||||
AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_TC0);
|
AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_TC0);
|
||||||
|
|
||||||
// Enable Peripheral Clock for TIMER_CLOCK1, used to capture edges of the tag frames
|
// Enable Peripheral Clock for TIMER_CLOCK1, used to capture edges of the tag frames
|
||||||
AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_TC1);
|
AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_TC1);
|
||||||
AT91C_BASE_PIOA->PIO_BSR = GPIO_SSC_FRAME;
|
AT91C_BASE_PIOA->PIO_BSR = GPIO_SSC_FRAME;
|
||||||
|
|
||||||
// Disable timer during configuration
|
// Disable timer during configuration
|
||||||
|
AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKDIS;
|
||||||
AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
|
AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
|
||||||
|
|
||||||
// Capture mode, defaul timer source = MCK/2 (TIMER_CLOCK1), TIOA is external trigger,
|
// TC0: Capture mode, default timer source = MCK/2 (TIMER_CLOCK1), no triggers
|
||||||
// external trigger rising edge, load RA on falling edge of TIOA.
|
AT91C_BASE_TC0->TC_CMR = AT91C_TC_CLKS_TIMER_DIV1_CLOCK;
|
||||||
|
|
||||||
|
// TC1: Capture mode, default timer source = MCK/2 (TIMER_CLOCK1), TIOA is external trigger,
|
||||||
|
// external trigger rising edge, load RA on falling edge of TIOA.
|
||||||
AT91C_BASE_TC1->TC_CMR = AT91C_TC_CLKS_TIMER_DIV1_CLOCK | AT91C_TC_ETRGEDG_FALLING | AT91C_TC_ABETRG | AT91C_TC_LDRA_FALLING;
|
AT91C_BASE_TC1->TC_CMR = AT91C_TC_CLKS_TIMER_DIV1_CLOCK | AT91C_TC_ETRGEDG_FALLING | AT91C_TC_ABETRG | AT91C_TC_LDRA_FALLING;
|
||||||
|
|
||||||
// Enable and reset counters
|
// Enable and reset counters
|
||||||
AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
|
AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
|
||||||
AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
|
AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
|
||||||
|
|
||||||
// Reset the received frame, frame count and timing info
|
// Reset the received frame, frame count and timing info
|
||||||
frame_count = 0;
|
frame_count = 0;
|
||||||
response = 0;
|
response = 0;
|
||||||
lastbit = 1;
|
lastbit = 1;
|
||||||
|
@ -1808,8 +1817,8 @@ void ReadHitagSintern(hitag_function htf, hitag_data* htd, stype tagMode, int st
|
||||||
txlen = 0;
|
txlen = 0;
|
||||||
|
|
||||||
if (DEBUG >= 2) {
|
if (DEBUG >= 2) {
|
||||||
Dbprintf("FRO %d rxlen: %d, pstate=%d, tstate=%d", frame_count, rxlen, (int)tag.pstate, (int)tag.tstate);
|
Dbprintf("FRO %d rxlen: %d, pstate=%d, tstate=%d", frame_count, rxlen, (int)tag.pstate, (int)tag.tstate);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (rxlen == 0) {
|
if (rxlen == 0) {
|
||||||
//start authentication
|
//start authentication
|
||||||
|
@ -1864,7 +1873,7 @@ void ReadHitagSintern(hitag_function htf, hitag_data* htd, stype tagMode, int st
|
||||||
response = 0;
|
response = 0;
|
||||||
|
|
||||||
// get tag id in anti-collision mode (proprietary data format, so switch off manchester and read at double the data rate, for 4 x the data bits)
|
// get tag id in anti-collision mode (proprietary data format, so switch off manchester and read at double the data rate, for 4 x the data bits)
|
||||||
hitag_receive_frame(rx, &rxlen, &response);
|
hitag_receive_frame(rx, &rxlen, &response);
|
||||||
}
|
}
|
||||||
end=false;
|
end=false;
|
||||||
LED_B_OFF();
|
LED_B_OFF();
|
||||||
|
@ -1922,7 +1931,7 @@ void WritePageHitagS(hitag_function htf, hitag_data* htd,int page_) {
|
||||||
memcpy(NrAr_,htd->auth.NrAr,8);
|
memcpy(NrAr_,htd->auth.NrAr,8);
|
||||||
Dbhexdump(8,NrAr_,false);
|
Dbhexdump(8,NrAr_,false);
|
||||||
NrAr=NrAr_[7] | ((uint64_t)NrAr_[6]) << 8 | ((uint64_t)NrAr_[5]) << 16 | ((uint64_t)NrAr_[4]) << 24 | ((uint64_t)NrAr_[3]) << 32 |
|
NrAr=NrAr_[7] | ((uint64_t)NrAr_[6]) << 8 | ((uint64_t)NrAr_[5]) << 16 | ((uint64_t)NrAr_[4]) << 24 | ((uint64_t)NrAr_[3]) << 32 |
|
||||||
((uint64_t)NrAr_[2]) << 40| ((uint64_t)NrAr_[1]) << 48 | ((uint64_t)NrAr_[0]) << 56;
|
((uint64_t)NrAr_[2]) << 40| ((uint64_t)NrAr_[1]) << 48 | ((uint64_t)NrAr_[0]) << 56;
|
||||||
} break;
|
} break;
|
||||||
case 04: { //WHTS_KEY
|
case 04: { //WHTS_KEY
|
||||||
memcpy(data,htd->crypto.data,4);
|
memcpy(data,htd->crypto.data,4);
|
||||||
|
@ -1940,13 +1949,13 @@ void WritePageHitagS(hitag_function htf, hitag_data* htd,int page_) {
|
||||||
Dbprintf("Page: %d",page_);
|
Dbprintf("Page: %d",page_);
|
||||||
Dbprintf("DATA: %02X %02X %02X %02X", data[0], data[1], data[2], data[3]);
|
Dbprintf("DATA: %02X %02X %02X %02X", data[0], data[1], data[2], data[3]);
|
||||||
FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
|
FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
|
||||||
// Reset the return status
|
// Reset the return status
|
||||||
bSuccessful = false;
|
bSuccessful = false;
|
||||||
|
|
||||||
tag.pstate = READY;
|
tag.pstate = READY;
|
||||||
tag.tstate = NO_OP;
|
tag.tstate = NO_OP;
|
||||||
|
|
||||||
// Clean up trace and prepare it for storing frames
|
// Clean up trace and prepare it for storing frames
|
||||||
set_tracing(true);
|
set_tracing(true);
|
||||||
clear_trace();
|
clear_trace();
|
||||||
|
|
||||||
|
@ -1954,45 +1963,49 @@ void WritePageHitagS(hitag_function htf, hitag_data* htd,int page_) {
|
||||||
|
|
||||||
LED_D_ON();
|
LED_D_ON();
|
||||||
|
|
||||||
// Configure output and enable pin that is connected to the FPGA (for modulating)
|
// Configure output and enable pin that is connected to the FPGA (for modulating)
|
||||||
AT91C_BASE_PIOA->PIO_OER = GPIO_SSC_DOUT;
|
AT91C_BASE_PIOA->PIO_OER = GPIO_SSC_DOUT;
|
||||||
AT91C_BASE_PIOA->PIO_PER = GPIO_SSC_DOUT;
|
AT91C_BASE_PIOA->PIO_PER = GPIO_SSC_DOUT;
|
||||||
|
|
||||||
// Set fpga in edge detect with reader field, we can modulate as reader now
|
// Set fpga in edge detect with reader field, we can modulate as reader now
|
||||||
FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_EDGE_DETECT | FPGA_LF_EDGE_DETECT_READER_FIELD);
|
FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_EDGE_DETECT | FPGA_LF_EDGE_DETECT_READER_FIELD);
|
||||||
|
|
||||||
// Set Frequency divisor which will drive the FPGA and analog mux selection
|
// Set Frequency divisor which will drive the FPGA and analog mux selection
|
||||||
FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 95); //125Khz
|
FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 95); //125Khz
|
||||||
SetAdcMuxFor(GPIO_MUXSEL_LOPKD);
|
SetAdcMuxFor(GPIO_MUXSEL_LOPKD);
|
||||||
RELAY_OFF();
|
RELAY_OFF();
|
||||||
|
|
||||||
// Disable modulation at default, which means enable the field
|
// Disable modulation at default, which means enable the field
|
||||||
LOW(GPIO_SSC_DOUT);
|
LOW(GPIO_SSC_DOUT);
|
||||||
|
|
||||||
// Give it a bit of time for the resonant antenna to settle.
|
// Give it a bit of time for the resonant antenna to settle.
|
||||||
SpinDelay(30);
|
SpinDelay(30);
|
||||||
|
|
||||||
// Enable Peripheral Clock for TIMER_CLOCK0, used to measure exact timing before answering
|
// Enable Peripheral Clock for TIMER_CLOCK0, used to measure exact timing before answering
|
||||||
AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_TC0);
|
AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_TC0);
|
||||||
|
|
||||||
// Enable Peripheral Clock for TIMER_CLOCK1, used to capture edges of the tag frames
|
// Enable Peripheral Clock for TIMER_CLOCK1, used to capture edges of the tag frames
|
||||||
AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_TC1);
|
AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_TC1);
|
||||||
AT91C_BASE_PIOA->PIO_BSR = GPIO_SSC_FRAME;
|
AT91C_BASE_PIOA->PIO_BSR = GPIO_SSC_FRAME;
|
||||||
|
|
||||||
// Disable timer during configuration
|
// Disable timer during configuration
|
||||||
|
AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKDIS;
|
||||||
AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
|
AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
|
||||||
|
|
||||||
// Capture mode, defaul timer source = MCK/2 (TIMER_CLOCK1), TIOA is external trigger,
|
// TC0: Capture mode, default timer source = MCK/2 (TIMER_CLOCK1), no triggers
|
||||||
// external trigger rising edge, load RA on falling edge of TIOA.
|
AT91C_BASE_TC0->TC_CMR = AT91C_TC_CLKS_TIMER_DIV1_CLOCK;
|
||||||
|
|
||||||
|
// TC1: Capture mode, default timer source = MCK/2 (TIMER_CLOCK1), TIOA is external trigger,
|
||||||
|
// external trigger rising edge, load RA on falling edge of TIOA.
|
||||||
AT91C_BASE_TC1->TC_CMR = AT91C_TC_CLKS_TIMER_DIV1_CLOCK
|
AT91C_BASE_TC1->TC_CMR = AT91C_TC_CLKS_TIMER_DIV1_CLOCK
|
||||||
| AT91C_TC_ETRGEDG_FALLING | AT91C_TC_ABETRG
|
| AT91C_TC_ETRGEDG_FALLING | AT91C_TC_ABETRG
|
||||||
| AT91C_TC_LDRA_FALLING;
|
| AT91C_TC_LDRA_FALLING;
|
||||||
|
|
||||||
// Enable and reset counters
|
// Enable and reset counters
|
||||||
AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
|
AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
|
||||||
AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
|
AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
|
||||||
|
|
||||||
// Reset the received frame, frame count and timing info
|
// Reset the received frame, frame count and timing info
|
||||||
frame_count = 0;
|
frame_count = 0;
|
||||||
response = 0;
|
response = 0;
|
||||||
lastbit = 1;
|
lastbit = 1;
|
||||||
|
@ -2181,10 +2194,10 @@ void check_challenges_cmd(bool file_given, byte_t* data, uint64_t tagMode) {
|
||||||
|
|
||||||
|
|
||||||
FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
|
FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
|
||||||
// Reset the return status
|
// Reset the return status
|
||||||
bSuccessful = false;
|
bSuccessful = false;
|
||||||
|
|
||||||
// Clean up trace and prepare it for storing frames
|
// Clean up trace and prepare it for storing frames
|
||||||
set_tracing(true);
|
set_tracing(true);
|
||||||
clear_trace();
|
clear_trace();
|
||||||
|
|
||||||
|
@ -2192,44 +2205,48 @@ void check_challenges_cmd(bool file_given, byte_t* data, uint64_t tagMode) {
|
||||||
|
|
||||||
LED_D_ON();
|
LED_D_ON();
|
||||||
|
|
||||||
// Configure output and enable pin that is connected to the FPGA (for modulating)
|
// Configure output and enable pin that is connected to the FPGA (for modulating)
|
||||||
AT91C_BASE_PIOA->PIO_OER = GPIO_SSC_DOUT;
|
AT91C_BASE_PIOA->PIO_OER = GPIO_SSC_DOUT;
|
||||||
AT91C_BASE_PIOA->PIO_PER = GPIO_SSC_DOUT;
|
AT91C_BASE_PIOA->PIO_PER = GPIO_SSC_DOUT;
|
||||||
|
|
||||||
// Set fpga in edge detect with reader field, we can modulate as reader now
|
// Set fpga in edge detect with reader field, we can modulate as reader now
|
||||||
FpgaWriteConfWord(
|
FpgaWriteConfWord(
|
||||||
FPGA_MAJOR_MODE_LF_EDGE_DETECT | FPGA_LF_EDGE_DETECT_READER_FIELD);
|
FPGA_MAJOR_MODE_LF_EDGE_DETECT | FPGA_LF_EDGE_DETECT_READER_FIELD);
|
||||||
|
|
||||||
// Set Frequency divisor which will drive the FPGA and analog mux selection
|
// Set Frequency divisor which will drive the FPGA and analog mux selection
|
||||||
FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 95); //125Khz
|
FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 95); //125Khz
|
||||||
SetAdcMuxFor(GPIO_MUXSEL_LOPKD);
|
SetAdcMuxFor(GPIO_MUXSEL_LOPKD);
|
||||||
RELAY_OFF();
|
RELAY_OFF();
|
||||||
|
|
||||||
// Disable modulation at default, which means enable the field
|
// Disable modulation at default, which means enable the field
|
||||||
LOW(GPIO_SSC_DOUT);
|
LOW(GPIO_SSC_DOUT);
|
||||||
|
|
||||||
// Give it a bit of time for the resonant antenna to settle.
|
// Give it a bit of time for the resonant antenna to settle.
|
||||||
SpinDelay(30);
|
SpinDelay(30);
|
||||||
|
|
||||||
// Enable Peripheral Clock for TIMER_CLOCK0, used to measure exact timing before answering
|
// Enable Peripheral Clock for TIMER_CLOCK0, used to measure exact timing before answering
|
||||||
AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_TC0);
|
AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_TC0);
|
||||||
|
|
||||||
// Enable Peripheral Clock for TIMER_CLOCK1, used to capture edges of the tag frames
|
// Enable Peripheral Clock for TIMER_CLOCK1, used to capture edges of the tag frames
|
||||||
AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_TC1);
|
AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_TC1);
|
||||||
AT91C_BASE_PIOA->PIO_BSR = GPIO_SSC_FRAME;
|
AT91C_BASE_PIOA->PIO_BSR = GPIO_SSC_FRAME;
|
||||||
|
|
||||||
// Disable timer during configuration
|
// Disable timer during configuration
|
||||||
|
AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKDIS;
|
||||||
AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
|
AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
|
||||||
|
|
||||||
// Capture mode, defaul timer source = MCK/2 (TIMER_CLOCK1), TIOA is external trigger,
|
// TC0: Capture mode, default timer source = MCK/2 (TIMER_CLOCK1), no triggers
|
||||||
// external trigger rising edge, load RA on falling edge of TIOA.
|
AT91C_BASE_TC0->TC_CMR = AT91C_TC_CLKS_TIMER_DIV1_CLOCK;
|
||||||
|
|
||||||
|
// TC1: Capture mode, default timer source = MCK/2 (TIMER_CLOCK1), TIOA is external trigger,
|
||||||
|
// external trigger rising edge, load RA on falling edge of TIOA.
|
||||||
AT91C_BASE_TC1->TC_CMR = AT91C_TC_CLKS_TIMER_DIV1_CLOCK | AT91C_TC_ETRGEDG_FALLING | AT91C_TC_ABETRG | AT91C_TC_LDRA_FALLING;
|
AT91C_BASE_TC1->TC_CMR = AT91C_TC_CLKS_TIMER_DIV1_CLOCK | AT91C_TC_ETRGEDG_FALLING | AT91C_TC_ABETRG | AT91C_TC_LDRA_FALLING;
|
||||||
|
|
||||||
// Enable and reset counters
|
// Enable and reset counters
|
||||||
AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
|
AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
|
||||||
AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
|
AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
|
||||||
|
|
||||||
// Reset the received frame, frame count and timing info
|
// Reset the received frame, frame count and timing info
|
||||||
frame_count = 0;
|
frame_count = 0;
|
||||||
response = 0;
|
response = 0;
|
||||||
lastbit = 1;
|
lastbit = 1;
|
||||||
|
|
26
armsrc/hitagS.h
Normal file
26
armsrc/hitagS.h
Normal file
|
@ -0,0 +1,26 @@
|
||||||
|
//-----------------------------------------------------------------------------
|
||||||
|
// This code is licensed to you under the terms of the GNU GPL, version 2 or,
|
||||||
|
// at your option, any later version. See the LICENSE.txt file for the text of
|
||||||
|
// the license.
|
||||||
|
//-----------------------------------------------------------------------------
|
||||||
|
// HitagS emulation (preliminary test version)
|
||||||
|
//
|
||||||
|
// (c) 2016 Oguzhan Cicek, Hendrik Schwartke, Ralf Spenneberg
|
||||||
|
// <info@os-s.de>
|
||||||
|
//-----------------------------------------------------------------------------
|
||||||
|
// Some code was copied from Hitag2.c
|
||||||
|
//-----------------------------------------------------------------------------
|
||||||
|
|
||||||
|
#ifndef HITAGS_H__
|
||||||
|
#define HITAGS_H__
|
||||||
|
|
||||||
|
#include <stdint.h>
|
||||||
|
#include <stdbool.h>
|
||||||
|
#include "hitag.h"
|
||||||
|
|
||||||
|
void ReadHitagSCmd(hitag_function htf, hitag_data* htd, uint64_t startPage, uint64_t tagMode, bool readBlock);
|
||||||
|
void SimulateHitagSTag(bool tag_mem_supplied, uint8_t* data);
|
||||||
|
void WritePageHitagS(hitag_function htf, hitag_data* htd, int page);
|
||||||
|
void check_challenges_cmd(bool file_given, uint8_t* data, uint64_t tagMode);
|
||||||
|
|
||||||
|
#endif
|
|
@ -19,8 +19,7 @@
|
||||||
#include "common.h"
|
#include "common.h"
|
||||||
#include "util.h"
|
#include "util.h"
|
||||||
#include "parity.h"
|
#include "parity.h"
|
||||||
#include "hitag2.h"
|
#include "hitag.h"
|
||||||
#include "hitagS.h"
|
|
||||||
#include "cmdmain.h"
|
#include "cmdmain.h"
|
||||||
|
|
||||||
static int CmdHelp(const char *Cmd);
|
static int CmdHelp(const char *Cmd);
|
||||||
|
|
93
include/hitag.h
Normal file
93
include/hitag.h
Normal file
|
@ -0,0 +1,93 @@
|
||||||
|
//-----------------------------------------------------------------------------
|
||||||
|
// This code is licensed to you under the terms of the GNU GPL, version 2 or,
|
||||||
|
// at your option, any later version. See the LICENSE.txt file for the text of
|
||||||
|
// the license.
|
||||||
|
//-----------------------------------------------------------------------------
|
||||||
|
// Hitag2, HitagS
|
||||||
|
//
|
||||||
|
// (c) 2012 Roel Verdult
|
||||||
|
// (c) 2016 Oguzhan Cicek, Hendrik Schwartke, Ralf Spenneberg
|
||||||
|
// <info@os-s.de>
|
||||||
|
//-----------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
||||||
|
#ifndef HITAG_H__
|
||||||
|
#define HITAG_H__
|
||||||
|
|
||||||
|
#ifdef _MSC_VER
|
||||||
|
#define PACKED
|
||||||
|
#else
|
||||||
|
#define PACKED __attribute__((packed))
|
||||||
|
#endif
|
||||||
|
|
||||||
|
typedef enum {
|
||||||
|
RHTSF_CHALLENGE = 01,
|
||||||
|
RHTSF_KEY = 02,
|
||||||
|
WHTSF_CHALLENGE = 03,
|
||||||
|
WHTSF_KEY = 04,
|
||||||
|
RHT2F_PASSWORD = 21,
|
||||||
|
RHT2F_AUTHENTICATE = 22,
|
||||||
|
RHT2F_CRYPTO = 23,
|
||||||
|
WHT2F_CRYPTO = 24,
|
||||||
|
RHT2F_TEST_AUTH_ATTEMPTS = 25,
|
||||||
|
RHT2F_UID_ONLY = 26,
|
||||||
|
} hitag_function;
|
||||||
|
|
||||||
|
typedef struct {
|
||||||
|
uint8_t password[4];
|
||||||
|
} PACKED rht2d_password;
|
||||||
|
|
||||||
|
typedef struct {
|
||||||
|
uint8_t NrAr[8];
|
||||||
|
uint8_t data[4];
|
||||||
|
} PACKED rht2d_authenticate;
|
||||||
|
|
||||||
|
typedef struct {
|
||||||
|
uint8_t key[6];
|
||||||
|
uint8_t data[4];
|
||||||
|
} PACKED rht2d_crypto;
|
||||||
|
|
||||||
|
typedef union {
|
||||||
|
rht2d_password pwd;
|
||||||
|
rht2d_authenticate auth;
|
||||||
|
rht2d_crypto crypto;
|
||||||
|
} hitag_data;
|
||||||
|
|
||||||
|
|
||||||
|
//---------------------------------------------------------
|
||||||
|
// Hitag S
|
||||||
|
//---------------------------------------------------------
|
||||||
|
typedef enum PROTO_STATE {READY=0,INIT,AUTHENTICATE,SELECTED,QUIET,TTF,FAIL} PSTATE; //protocol-state
|
||||||
|
typedef enum TAG_STATE {NO_OP=0,READING_PAGE,READING_BLOCK,WRITING_PAGE_ACK,WRITING_PAGE_DATA,WRITING_BLOCK_DATA} TSATE; //tag-state
|
||||||
|
typedef enum SOF_TYPE {STANDARD=0,ADVANCED,FAST_ADVANCED,ONE,NO_BITS} stype; //number of start-of-frame bits
|
||||||
|
|
||||||
|
struct hitagS_tag {
|
||||||
|
PSTATE pstate; //protocol-state
|
||||||
|
TSATE tstate; //tag-state
|
||||||
|
uint32_t uid;
|
||||||
|
uint8_t pages[64][4];
|
||||||
|
uint64_t key;
|
||||||
|
uint8_t pwdl0, pwdl1, pwdh0;
|
||||||
|
//con0
|
||||||
|
int max_page;
|
||||||
|
stype mode;
|
||||||
|
//con1
|
||||||
|
bool auth; //0=Plain 1=Auth
|
||||||
|
bool TTFC; //Transponder Talks first coding. 0=Manchester 1=Biphase
|
||||||
|
int TTFDR; //data rate in TTF Mode
|
||||||
|
int TTFM; //the number of pages that are sent to the RWD
|
||||||
|
bool LCON; //0=con1/2 read write 1=con1 read only and con2 OTP
|
||||||
|
bool LKP; //0=page2/3 read write 1=page2/3 read only in Plain mode and no access in authenticate mode
|
||||||
|
//con2
|
||||||
|
//0=read write 1=read only
|
||||||
|
bool LCK7; //page4/5
|
||||||
|
bool LCK6; //page6/7
|
||||||
|
bool LCK5; //page8-11
|
||||||
|
bool LCK4; //page12-15
|
||||||
|
bool LCK3; //page16-23
|
||||||
|
bool LCK2; //page24-31
|
||||||
|
bool LCK1; //page32-47
|
||||||
|
bool LCK0; //page48-63
|
||||||
|
} ;
|
||||||
|
|
||||||
|
#endif
|
|
@ -1,55 +0,0 @@
|
||||||
//-----------------------------------------------------------------------------
|
|
||||||
// (c) 2012 Roel Verdult
|
|
||||||
//
|
|
||||||
// This code is licensed to you under the terms of the GNU GPL, version 2 or,
|
|
||||||
// at your option, any later version. See the LICENSE.txt file for the text of
|
|
||||||
// the license.
|
|
||||||
//-----------------------------------------------------------------------------
|
|
||||||
// Hitag2 type prototyping
|
|
||||||
//-----------------------------------------------------------------------------
|
|
||||||
// HitagS added
|
|
||||||
//-----------------------------------------------------------------------------
|
|
||||||
|
|
||||||
#ifndef _HITAG2_H_
|
|
||||||
#define _HITAG2_H_
|
|
||||||
|
|
||||||
#ifdef _MSC_VER
|
|
||||||
#define PACKED
|
|
||||||
#else
|
|
||||||
#define PACKED __attribute__((packed))
|
|
||||||
#endif
|
|
||||||
|
|
||||||
typedef enum {
|
|
||||||
RHTSF_CHALLENGE = 01,
|
|
||||||
RHTSF_KEY = 02,
|
|
||||||
WHTSF_CHALLENGE = 03,
|
|
||||||
WHTSF_KEY = 04,
|
|
||||||
RHT2F_PASSWORD = 21,
|
|
||||||
RHT2F_AUTHENTICATE = 22,
|
|
||||||
RHT2F_CRYPTO = 23,
|
|
||||||
WHT2F_CRYPTO = 24,
|
|
||||||
RHT2F_TEST_AUTH_ATTEMPTS = 25,
|
|
||||||
RHT2F_UID_ONLY = 26,
|
|
||||||
} hitag_function;
|
|
||||||
|
|
||||||
typedef struct {
|
|
||||||
byte_t password[4];
|
|
||||||
} PACKED rht2d_password;
|
|
||||||
|
|
||||||
typedef struct {
|
|
||||||
byte_t NrAr[8];
|
|
||||||
byte_t data[4];
|
|
||||||
} PACKED rht2d_authenticate;
|
|
||||||
|
|
||||||
typedef struct {
|
|
||||||
byte_t key[6];
|
|
||||||
byte_t data[4];
|
|
||||||
} PACKED rht2d_crypto;
|
|
||||||
|
|
||||||
typedef union {
|
|
||||||
rht2d_password pwd;
|
|
||||||
rht2d_authenticate auth;
|
|
||||||
rht2d_crypto crypto;
|
|
||||||
} hitag_data;
|
|
||||||
|
|
||||||
#endif
|
|
|
@ -1,51 +0,0 @@
|
||||||
//-----------------------------------------------------------------------------
|
|
||||||
// This code is licensed to you under the terms of the GNU GPL, version 2 or,
|
|
||||||
// at your option, any later version. See the LICENSE.txt file for the text of
|
|
||||||
// the license.
|
|
||||||
//-----------------------------------------------------------------------------
|
|
||||||
// HitagS emulation (preliminary test version)
|
|
||||||
//
|
|
||||||
// (c) 2016 Oguzhan Cicek, Hendrik Schwartke, Ralf Spenneberg
|
|
||||||
// <info@os-s.de>
|
|
||||||
//-----------------------------------------------------------------------------
|
|
||||||
|
|
||||||
|
|
||||||
#ifndef _HITAGS_H_
|
|
||||||
#define _HITAGS_H_
|
|
||||||
|
|
||||||
#include "hitag2.h"
|
|
||||||
|
|
||||||
typedef enum PROTO_STATE {READY=0,INIT,AUTHENTICATE,SELECTED,QUIET,TTF,FAIL} PSTATE; //protocol-state
|
|
||||||
typedef enum TAG_STATE {NO_OP=0,READING_PAGE,READING_BLOCK,WRITING_PAGE_ACK,WRITING_PAGE_DATA,WRITING_BLOCK_DATA} TSATE; //tag-state
|
|
||||||
typedef enum SOF_TYPE {STANDARD=0,ADVANCED,FAST_ADVANCED,ONE,NO_BITS} stype; //number of start-of-frame bits
|
|
||||||
|
|
||||||
struct hitagS_tag {
|
|
||||||
PSTATE pstate; //protocol-state
|
|
||||||
TSATE tstate; //tag-state
|
|
||||||
uint32_t uid;
|
|
||||||
uint8_t pages[64][4];
|
|
||||||
uint64_t key;
|
|
||||||
byte_t pwdl0,pwdl1,pwdh0;
|
|
||||||
//con0
|
|
||||||
int max_page;
|
|
||||||
stype mode;
|
|
||||||
//con1
|
|
||||||
bool auth; //0=Plain 1=Auth
|
|
||||||
bool TTFC; //Transponder Talks first coding. 0=Manchester 1=Biphase
|
|
||||||
int TTFDR; //data rate in TTF Mode
|
|
||||||
int TTFM; //the number of pages that are sent to the RWD
|
|
||||||
bool LCON; //0=con1/2 read write 1=con1 read only and con2 OTP
|
|
||||||
bool LKP; //0=page2/3 read write 1=page2/3 read only in Plain mode and no access in authenticate mode
|
|
||||||
//con2
|
|
||||||
//0=read write 1=read only
|
|
||||||
bool LCK7; //page4/5
|
|
||||||
bool LCK6; //page6/7
|
|
||||||
bool LCK5; //page8-11
|
|
||||||
bool LCK4; //page12-15
|
|
||||||
bool LCK3; //page16-23
|
|
||||||
bool LCK2; //page24-31
|
|
||||||
bool LCK1; //page32-47
|
|
||||||
bool LCK0; //page48-63
|
|
||||||
} ;
|
|
||||||
|
|
||||||
#endif
|
|
Loading…
Add table
Add a link
Reference in a new issue