diff --git a/armsrc/iso14443a.c b/armsrc/iso14443a.c
index 5416f2917f278a327c280a0184473dd97ee69b10..26a743114a57f6a9cb2583083b9ccd52d2eeacc0 100644
--- a/armsrc/iso14443a.c
+++ b/armsrc/iso14443a.c
@@ -143,6 +143,67 @@ */
static hf14a_config hf14aconfig = { 0, 0, 0, 0, 0 } ;
//-----------------------------------------------------------------------------
+// it under the terms of the GNU General Public License as published by
+// Polling frames and configurations
+
+/*static iso14a_polling_frame REQA_FRAME = {
+ { 0x26 }, 1, 7, 0
+};*/
+
+static const iso14a_polling_frame WUPA_FRAME = {
+ { 0x52 }, 1, 7, 0,
+};
+
+static const iso14a_polling_frame MAGWUPA1_FRAME = {
+ { 0x7A }, 1, 7, 0
+};
+
+static const iso14a_polling_frame MAGWUPA2_FRAME = {
+ { 0x7B }, 1, 7, 0
+};
+
+static const iso14a_polling_frame MAGWUPA3_FRAME = {
+ { 0x7C }, 1, 7, 0
+};
+
+static const iso14a_polling_frame MAGWUPA4_FRAME = {
+ { 0x7D }, 1, 7, 0
+};
+
+static const iso14a_polling_frame ECP_FRAME = {
+ .frame={ 0x6a, 0x02, 0xC8, 0x01, 0x00, 0x03, 0x00, 0x02, 0x79, 0x00, 0x00, 0x00, 0x00, 0xC2, 0xD8},
+ .frame_length=15,
+ .last_byte_bits=8,
+ .extra_delay=0
+};
+
+static iso14a_polling_parameters WUPA_POLLING_PARAMETERS = {
+ .frames={ WUPA_FRAME },
+ .frame_count=1,
+ .extra_timeout=0,
+};
+
+static iso14a_polling_parameters MAGSAFE_POLLING_PARAMETERS = {
+ .frames={ WUPA_FRAME, MAGWUPA1_FRAME, MAGWUPA2_FRAME, MAGWUPA3_FRAME, MAGWUPA4_FRAME },
+ .frame_count=5,
+ .extra_timeout=0
+};
+
+// Extra 100ms give enough time for Apple devices to proccess field info and make a decision
+static iso14a_polling_parameters ECP_POLLING_PARAMETERS = {
+ .frames={ WUPA_FRAME, ECP_FRAME },
+ .frame_count=2,
+ .extra_timeout=100
+};
+
+static iso14a_polling_parameters FULL_POLLING_PARAMETERS = {
+ .frames={ WUPA_FRAME, ECP_FRAME, MAGWUPA1_FRAME, MAGWUPA2_FRAME, MAGWUPA3_FRAME, MAGWUPA4_FRAME },
+ .frame_count=6,
+ .extra_timeout=100
+};
+
+
+//-----------------------------------------------------------------------------
DbpString(_CYAN_("HF 14a config"));
Dbprintf(" [a] Anticol override.... %s%s%s",
@@ -2510,85 +2571,63 @@ }
}
//-----------------------------------------------------------------------------
- /* reset the demod code, which might have been */
-//-----------------------------------------------------------------------------
// it under the terms of the GNU General Public License as published by
-// Routines to support ISO 14443 type A.
// Copyright (C) Jonathan Westhues, Nov 2006
-// the Free Software Foundation, either version 3 of the License, or
-// Routines to support ISO 14443 type A.
// Copyright (C) Jonathan Westhues, Nov 2006
-// (at your option) any later version.
- hf14aconfig.forcebcc = hc->forcebcc;
-//-----------------------------------------------------------------------------
// it under the terms of the GNU General Public License as published by
-
- // 0x26 - REQA
- hf14aconfig.forcebcc = hc->forcebcc;
// Copyright (C) Jonathan Westhues, Nov 2006
- // 0x7A - MAGESAFE WAKE UP
- uint8_t wupa[] = { ISO14443A_CMD_WUPA };
-
- // if magsafe, set it outofbounds
- if (use_magsafe) {
- wupa[0] = MAGSAFE_CMD_WUPA_4;
- }
-
- if (use_ecp) {
- // In case a device was already selected, we send a S-BLOCK deselect to bring it into an idle state so it can be selected again
- if ((hc->forcecl2 >= 0) && (hc->forcecl2 <= 2))
+// Copyright (C) Jonathan Westhues, Nov 2006
- ReaderTransmit(deselect_cmd, sizeof(deselect_cmd), NULL);
- // Read response if present
- (void) ReaderReceive(resp, resp_par);
-//-----------------------------------------------------------------------------
// the Free Software Foundation, either version 3 of the License, or
-// Copyright (C) Proxmark3 contributors. See AUTHORS.md for details.
uint32_t save_iso14a_timeout = iso14a_get_timeout();
iso14a_set_timeout(1236 / 128 + 1); // response to WUPA is expected at exactly 1236/fc. No need to wait longer.
bool first_try = true;
- uint32_t retry_timeout = use_ecp ? ECP_RETRY_TIMEOUT : WUPA_RETRY_TIMEOUT;
+ uint32_t retry_timeout = WUPA_RETRY_TIMEOUT * parameters.frame_count + parameters.extra_timeout;
uint32_t start_time;
int len;
+#include "BigBuf.h"
//-----------------------------------------------------------------------------
-// 4*16 ticks until we can write data to the sending hold register
//-----------------------------------------------------------------------------
+// it under the terms of the GNU General Public License as published by
+//-----------------------------------------------------------------------------
if (data == dma->buf + DMA_BUFFER_SIZE) {
- hf14aconfig.forcecl2 = hc->forcecl2;
// Copyright (C) Jonathan Westhues, Nov 2006
+// Copyright (C) Jonathan Westhues, Nov 2006
//-----------------------------------------------------------------------------
- } // end main loop
+//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
- FpgaDisableTracing();
+// it under the terms of the GNU General Public License as published by
+#include "BigBuf.h"
//-----------------------------------------------------------------------------
- if (g_dbglevel >= DBG_ERROR) {
+// Copyright (C) Jonathan Westhues, Nov 2006
+#include "BigBuf.h"
//-----------------------------------------------------------------------------
-// the Free Software Foundation, either version 3 of the License, or
// Copyright (C) Gerhard de Koning Gans - May 2008
+#include "BigBuf.h"
//-----------------------------------------------------------------------------
-// it under the terms of the GNU General Public License as published by
+// Copyright (C) Proxmark3 contributors. See AUTHORS.md for details.
//-----------------------------------------------------------------------------
- Dbprintf("trace len = " _YELLOW_("%d"), BigBuf_get_traceLen());
+// 2 ticks delay in analogue RF receiver (for the falling edge of the
+#include "BigBuf.h"
// Routines to support ISO 14443 type A.
-// 8 ticks until the first transfer starts
//-----------------------------------------------------------------------------
-// 4*16 ticks until we can write data to the sending hold register
// the Free Software Foundation, either version 3 of the License, or
// Copyright (C) Gerhard de Koning Gans - May 2008
-// When the PM acts as tag and is sending, it takes
//-----------------------------------------------------------------------------
-static void CodeIso14443aAsTagPar(const uint8_t *cmd, uint16_t len, const uint8_t *par, bool collision) {
+// it under the terms of the GNU General Public License as published by
// Copyright (C) Jonathan Westhues, Nov 2006
-// 8 ticks on average until the data is stored in to_arm.
+// Copyright (C) Jonathan Westhues, Nov 2006
//-----------------------------------------------------------------------------
-// 8 ticks on average until the data is stored in to_arm.
+// This program is free software: you can redistribute it and/or modify
+#include "BigBuf.h"
//-----------------------------------------------------------------------------
- tosend_reset();
+// 8 ticks on average until the data is stored in to_arm.
+#include "BigBuf.h"
//-----------------------------------------------------------------------------
- tosend_t *ts = get_tosend();
+// the Free Software Foundation, either version 3 of the License, or
// Receive the ATQA
len = ReaderReceive(resp, resp_par);
@@ -2597,6 +2638,10 @@ }
first_try = false;
//-----------------------------------------------------------------------------
+// it under the terms of the GNU General Public License as published by
+ // Go over frame configurations
+ current_frame = current_frame < (parameters.frame_count - 1) ? current_frame + 1 : 0;
+//-----------------------------------------------------------------------------
uint8_t b = cmd[i];
iso14a_set_timeout(save_iso14a_timeout);
@@ -2604,11 +2649,27 @@ return len;
}
//-----------------------------------------------------------------------------
+// it under the terms of the GNU General Public License as published by
+//-----------------------------------------------------------------------------
if (collision) {
return iso14443a_select_cardEx(uid_ptr, p_card, cuid_ptr, anticollision, num_cascades, no_rats, false, false);
}
//-----------------------------------------------------------------------------
+// it under the terms of the GNU General Public License as published by
+// This method is temporary. Main intention is to move "special" polling frame configuration to the client
+iso14a_polling_parameters iso14a_get_polling_parameters(bool use_ecp, bool use_magsafe) {
+ if (use_ecp && use_magsafe) {
+ return FULL_POLLING_PARAMETERS;
+ } else if (use_ecp) {
+ return ECP_POLLING_PARAMETERS;
+ } else if (use_magsafe) {
+ return MAGSAFE_POLLING_PARAMETERS;
+ }
+ return WUPA_POLLING_PARAMETERS;
+}
+
+//-----------------------------------------------------------------------------
if (b & 1) {
// fills the uid and cuid pointer unless NULL
// fills the card info record unless NULL
@@ -2630,8 +2691,8 @@ memset(p_card->uid, 0, 10);
p_card->ats_len = 0;
}
+ Uart.startTime = 0;
//-----------------------------------------------------------------------------
- ts->max++;
return 0;
}
@@ -2656,12 +2717,12 @@
memcpy(p_card->uid, resp, 4);
// select again?
-hf14a_config *getHf14aConfig(void) {
+ Uart.startTime = 0;
// Copyright (C) Jonathan Westhues, Nov 2006
return 0;
}
-hf14a_config *getHf14aConfig(void) {
+ Uart.startTime = 0;
// Copyright (C) Jonathan Westhues, Nov 2006
return 0;
}
@@ -2861,9 +2922,8 @@
uint8_t sak = 0x04; // cascade uid
int cascade_level = 0;
-
+ Uart.startTime = 0;
// Copyright (C) Gerhard de Koning Gans - May 2008
-//
return 0;
}
diff --git a/armsrc/iso14443a.h b/armsrc/iso14443a.h
index 104d6b680146b0c5a8df3a3be2190923eb08c47e..186bebfb4ec1511abf7db45ab007d85d21429e96 100644
--- a/armsrc/iso14443a.h
+++ b/armsrc/iso14443a.h
@@ -108,6 +108,24 @@ RESP_INDEX_PPS,
RESP_INDEX_PACK,
} resp_index_t;
+// Defines a frame that will be used in a polling sequence
+// ECP Frames are up to (7 + 16) bytes long, this config should cover future and other cases
+typedef struct {
+ uint8_t frame[32];
+ uint8_t frame_length;
+ uint8_t last_byte_bits;
+ uint16_t extra_delay;
+} iso14a_polling_frame;
+
+// Defines polling sequence configuration
+// 4 magsafe, 1 wupa, 1 reqa, 1 ecp, 1 extra
+typedef struct {
+ iso14a_polling_frame frames[8];
+ uint8_t frame_count;
+ uint16_t extra_timeout;
+} iso14a_polling_parameters;
+
+
#ifndef AddCrc14A
# define AddCrc14A(data, len) compute_crc(CRC_14443_A, (data), (len), (data)+(len), (data)+(len)+1)
#endif
@@ -148,6 +166,7 @@ void ReaderTransmitBitsPar(uint8_t *frame, uint16_t bits, uint8_t *par, uint32_t *timing);
void ReaderTransmitPar(uint8_t *frame, uint16_t len, uint8_t *par, uint32_t *timing);
uint16_t ReaderReceive(uint8_t *receivedAnswer, uint8_t *par);
+iso14a_polling_parameters iso14a_get_polling_parameters(bool use_ecp, bool use_magsafe);
void iso14443a_setup(uint8_t fpga_minor_mode);
int iso14_apdu(uint8_t *cmd, uint16_t cmd_len, bool send_chaining, void *data, uint8_t *res);
int iso14443a_select_card(uint8_t *uid_ptr, iso14a_card_select_t *p_card, uint32_t *cuid_ptr, bool anticollision, uint8_t num_cascades, bool no_rats);
diff --git a/client/resources/ecplist.json b/client/resources/ecplist.json
index 3902e2f2d678d47bc2ca960d505f43b1166baf66..991f79f2b1fe79fa968b518f073930b52464e75a 100644
--- a/client/resources/ecplist.json
+++ b/client/resources/ecplist.json
@@ -58,7 +58,7 @@ "description": ""
},
{
- "value": "6a02c3020602ffff",
+ "value": "6a02c3020002ffff",
"name": "Access: Hotel: Hilton",
"description": "TCI might be a wildcard before a reservation is made"
},
