From ff3e07447893b004c6de5c7202c9b50f2c81ab04 Mon Sep 17 00:00:00 2001 From: iceman1001 Date: Tue, 1 Mar 2016 07:03:00 +0100 Subject: [PATCH] CHG: some minor changes to the 14b, the read 14b lua, --- armsrc/iso14443b.c | 15 ++++++++++----- client/cmdhf14b.c | 36 +++++++++++++++--------------------- client/lualibs/read14b.lua | 2 +- 3 files changed, 26 insertions(+), 27 deletions(-) diff --git a/armsrc/iso14443b.c b/armsrc/iso14443b.c index 9d033f61..a47f3017 100644 --- a/armsrc/iso14443b.c +++ b/armsrc/iso14443b.c @@ -778,11 +778,11 @@ static void GetSamplesFor14443bDemod(int n, bool quiet) AT91C_BASE_PDC_SSC->PDC_PTCR = AT91C_PDC_RXTDIS; - if (!quiet && Demod.len == 0) { - Dbprintf("max behindby = %d, samples = %d, gotFrame = %d, Demod.len = %d, Demod.sumI = %d, Demod.sumQ = %d", + if (!quiet) { + Dbprintf("max behindby = %d, samples = %d, gotFrame = %s, Demod.len = %d, Demod.sumI = %d, Demod.sumQ = %d", max, samples, - gotFrame, + (gotFrame) ? "true" : "false", Demod.len, Demod.sumI, Demod.sumQ @@ -995,7 +995,7 @@ int iso14443b_select_card() void iso14443b_setup() { FpgaDownloadAndGo(FPGA_BITSTREAM_HF); - + BigBuf_free(); // Set up the synchronous serial port FpgaSetupSsc(); @@ -1009,7 +1009,7 @@ void iso14443b_setup() { //SpinDelay(100); // Start the timer - //StartCountSspClk(); + StartCountSspClk(); DemodReset(); UartReset(); @@ -1324,6 +1324,11 @@ void RAMFUNC SnoopIso14443b(void) */ void SendRawCommand14443B(uint32_t datalen, uint32_t recv, uint8_t powerfield, uint8_t data[]) { + // param ISO_ + // param ISO_CONNECT + // param ISO14A_NO_DISCONNECT + //if (param & ISO14A_NO_DISCONNECT) + // return; iso14443b_setup(); if ( datalen == 0 && recv == 0 && powerfield == 0){ diff --git a/client/cmdhf14b.c b/client/cmdhf14b.c index 1263e3a0..fbe4d2e6 100644 --- a/client/cmdhf14b.c +++ b/client/cmdhf14b.c @@ -688,11 +688,6 @@ uint32_t srix4kEncode(uint32_t value) { // vv vv vv pp 4 bytes : 00 1A 20 01 */ - -#define NibbleHigh(b) ( (b & 0xF0) >> 4 ) -#define NibbleLow(b) ( b & 0x0F ) -#define Crumb(b,p) (((b & (0x3 << p) ) >> p ) & 0xF) - // only the lower crumbs. uint8_t block = (value & 0xFF); uint8_t i = 0; @@ -703,18 +698,18 @@ uint32_t srix4kEncode(uint32_t value) { // Scrambled part // Crumb swapping of value. uint8_t temp[] = {0,0}; - temp[0] = (Crumb(value, 22) << 4 | Crumb(value, 14 ) << 2 | Crumb(value, 6)) << 4; - temp[0] |= Crumb(value, 20) << 4 | Crumb(value, 12 ) << 2 | Crumb(value, 4); - temp[1] = (Crumb(value, 18) << 4 | Crumb(value, 10 ) << 2 | Crumb(value, 2)) << 4; - temp[1] |= Crumb(value, 16) << 4 | Crumb(value, 8 ) << 2 | Crumb(value, 0); + temp[0] = (CRUMB(value, 22) << 4 | CRUMB(value, 14 ) << 2 | CRUMB(value, 6)) << 4; + temp[0] |= CRUMB(value, 20) << 4 | CRUMB(value, 12 ) << 2 | CRUMB(value, 4); + temp[1] = (CRUMB(value, 18) << 4 | CRUMB(value, 10 ) << 2 | CRUMB(value, 2)) << 4; + temp[1] |= CRUMB(value, 16) << 4 | CRUMB(value, 8 ) << 2 | CRUMB(value, 0); // chksum part uint32_t chksum = 0xFF - block; // chksum is reduced by each nibbles of value. for (i = 0; i < 3; ++i){ - chksum -= NibbleHigh(valuebytes[i]); - chksum -= NibbleLow(valuebytes[i]); + chksum -= NIBBLE_HIGH(valuebytes[i]); + chksum -= NIBBLE_LOW(valuebytes[i]); } // base4 conversion and left shift twice @@ -727,17 +722,17 @@ uint32_t srix4kEncode(uint32_t value) { // merge scambled and chksum parts uint32_t encvalue = - ( NibbleLow ( base4[0]) << 28 ) | - ( NibbleHigh( temp[0]) << 24 ) | + ( NIBBLE_LOW ( base4[0]) << 28 ) | + ( NIBBLE_HIGH( temp[0]) << 24 ) | - ( NibbleLow ( base4[1]) << 20 ) | - ( NibbleLow ( temp[0]) << 16 ) | + ( NIBBLE_LOW ( base4[1]) << 20 ) | + ( NIBBLE_LOW ( temp[0]) << 16 ) | - ( NibbleLow ( base4[2]) << 12 ) | - ( NibbleHigh( temp[1]) << 8 ) | + ( NIBBLE_LOW ( base4[2]) << 12 ) | + ( NIBBLE_HIGH( temp[1]) << 8 ) | - ( NibbleLow ( base4[3]) << 4 ) | - NibbleLow ( temp[1] ); + ( NIBBLE_LOW ( base4[3]) << 4 ) | + NIBBLE_LOW ( temp[1] ); PrintAndLog("ICE encoded | %08X -> %08X", value, encvalue); return encvalue; @@ -804,8 +799,7 @@ int CmdteaSelfTest(const char *Cmd){ SwapEndian64ex(v , 8, 4, v_ptr); // ENCRYPTION KEY: - - uint8_t key[16] = {0x00}; + uint8_t key[16] = {0x55,0xFE,0xF6,0x30,0x62,0xBF,0x0B,0xC1,0xC9,0xB3,0x7C,0x34,0x97,0x3E,0x29,0xFB }; uint8_t keyle[16]; uint8_t* key_ptr = keyle; SwapEndian64ex(key , sizeof(key), 4, key_ptr); diff --git a/client/lualibs/read14b.lua b/client/lualibs/read14b.lua index dd720fea..ab51f8bf 100644 --- a/client/lualibs/read14b.lua +++ b/client/lualibs/read14b.lua @@ -107,7 +107,7 @@ local function select1443b() -- bit 0-1-2 | N slots ( 0 = 1, 1 = 2, 2 = 4, 3 = 8, 4 == 16) -- bit 3 | (1== WUPB, 0 == REQB) -- bit 4-5-6-7 | AFI application family identifier - local result, err = sendRaw('050000', 1, 1) + local result, err = sendRaw('050008', 1, 1) if result then resp = Command.parse( result ) len = tonumber(resp.arg1) * 2 -- 2.39.2