Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Long awaited mifare UL card emulator #17

Merged
merged 7 commits into from
Sep 23, 2020
Merged

Long awaited mifare UL card emulator #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5e48f44
Merge branch 'master' into sandbox
AAsyunkin-se Aug 17, 2020
c04c194
Merge branch 'master' into sandbox
AAsyunkin-se Aug 17, 2020
7aad104
mif ul support - 1st draft
AAsyunkin-se Sep 13, 2020
50ebd78
mif ul support - 1st draft pt2
AAsyunkin-se Sep 13, 2020
939d466
mif ul support - 2nd draft
AAsyunkin-se Sep 20, 2020
b8dd074
mif ul support - r3 merged
AAsyunkin-se Sep 23, 2020
4740edd
mif ul support - r4 merged
AAsyunkin-se Sep 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/hydrabus/commands.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -559,6 +559,11 @@ t_token tokens_connect_auto_opt[] = {
.arg_type = T_ARG_STRING, \
.help = "Send APDU(NFC-A/B) or data+crc(NFC-V) to a tag"\
},\
{\
T_EMUL_MF_ULTRALIGHT,\
.subtokens = tokens_mode_nfc_emul_mf_ul,\
.help = "Emul Tag Mifare Ultralight (optional image file from microSD)"\
},\
/*
{\
T_READ_MF_ULTRALIGHT,\
Expand Down
134 changes: 108 additions & 26 deletions src/hydranfc_v2/ce.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@

#include "bsp_print_dbg.h"
#include "hydranfc_v2_ce.h"
#include "hydranfc_v2_nfc_mode.h"

void ceNfcaCardemu4A(uint8_t mode, rfalIsoDepTxRxParam *isoDepTxRxParam);
void ceNfcfCardemu3(uint8_t mode, rfalTransceiveContext *ctx);
Expand Down Expand Up @@ -67,14 +68,15 @@ rfalLmState statePrev = RFAL_LM_STATE_NOT_INIT;
rfalTransceiveState tStateCur = 3;
rfalTransceiveState tStatePrev = 3;

static rfalLmState state;

uint16_t (*cardA_activated_ptr)(void) = NULL;

void ce_set_cardA_activated_ptr(void * ptr)
{
cardA_activated_ptr = ptr;
}


void ceInit(void)
{
transceiveCtx.txBuf = txBuf_ce;
Expand Down Expand Up @@ -107,9 +109,21 @@ void ceInit(void)
txReady = false;

ceEnabled = false;
ul_cwrite_page_set = 0;
}

static rfalLmState state;
//--------------------------------------------------------------------------
// debug quick toggles for ceHandler()

// disable to check the Listen Mode and Transcieve states of the rfal worker
// handy for debugging but flood the logs + slightly mess with timings
#define NO_DEBUG_LGS_GTS TRUE

// disable to see RX buf at RATS time
#define NO_RATS_DUMP TRUE
// disable to see RX buf at 14443-3A before ceGetRx()
#define NO_NFCA_L3_DUMP TRUE
//--------------------------------------------------------------------------

void ceHandler(void)
{
Expand All @@ -122,17 +136,22 @@ void ceHandler(void)
}

state = rfalListenGetState(&dataFlag, NULL);

#if !NO_DEBUG_LGS_GTS
if (state != statePrev) {
// new state
printf_dbg("rLGS %d\r\n", state);
statePrev = state;
}

tStateCur = rfalGetTransceiveState( );

if (tStateCur != tStatePrev) {
// new state
printf_dbg("rGTS %d\r\n", tStateCur);
tStatePrev = tStateCur;
}
#endif


switch (state) {
Expand Down Expand Up @@ -162,14 +181,18 @@ void ceHandler(void)
} else {
// idle/halt state for all the commands we "don't support"

#if !NO_RATS_DUMP
int i, rxSize;
#endif
if (rxRcvdLen > 0) {
printf_dbg("RATS ignored...\r\n");

#if !NO_RATS_DUMP
rxSize = rfalConvBitsToBytes(rxRcvdLen);
for (i = 0; i < (rxSize > 16? 16 : rxSize); i++)
printf_dbg(" %02X", rxBuf_ce[i]);
printf_dbg("\r\n");
#endif

if (state == RFAL_LM_STATE_ACTIVE_Ax) {
rfalListenSleepStart( RFAL_LM_STATE_SLEEP_A, rxBuf_ce, RX_BUF_LENGTH, &rxRcvdLen );
Expand All @@ -183,18 +206,22 @@ void ceHandler(void)
printf_dbg("HLTA\r\n");
rfalListenSleepStart( RFAL_LM_STATE_SLEEP_A, rxBuf_ce, RX_BUF_LENGTH, &rxRcvdLen );
} else {
#if !NO_NFCA_L3_DUMP
int i, rxSize;
#endif
if (rxRcvdLen > 0) {
#if !NO_NFCA_L3_DUMP
printf_dbg("Hndler A3 rx: ");

rxSize = rfalConvBitsToBytes(rxRcvdLen);
for (i = 0; i < (rxSize > 16? 16 : rxSize); i++)
printf_dbg(" %02X", rxBuf_ce[i]);
printf_dbg("\r\n");
}
#endif

// not HLTA and not RATS - layer3 comms
rxReady = true;
// not HLTA and not RATS - layer3 comms
rxReady = true;
}
}
} else {
if(!isFirstA3_Frame) {
Expand All @@ -208,6 +235,7 @@ void ceHandler(void)
rfalListenStart(configMask, &configA, &configB, &configF, rxBuf_ce, rfalConvBytesToBits(RX_BUF_LENGTH), &rxRcvdLen);
rxReady = txReady = false;
isFirstA3_Frame = true;
ul_cwrite_page_set = 0;
printf_dbg("LLoss1\r\n");
break;

Expand Down Expand Up @@ -237,6 +265,7 @@ void ceHandler(void)
rfalListenStart(configMask, &configA, &configB, &configF, rxBuf_ce, rfalConvBytesToBits(RX_BUF_LENGTH), &rxRcvdLen);
isActivatedA = false;
isFirstA3_Frame = true;
ul_cwrite_page_set = 0;
printf_dbg("LLoss2\r\n");
break;

Expand Down Expand Up @@ -440,6 +469,7 @@ ReturnCode ceGetRx(const uint8_t cmd, uint8_t *txData, uint16_t *txSize)
rfalListenStart(configMask, &configA, &configB, &configF, rxBuf_ce, rfalConvBytesToBits(RX_BUF_LENGTH), &rxRcvdLen);
rxReady = txReady = isActivatedA = false;
isFirstA3_Frame = true;
ul_cwrite_page_set = 0;
printf_dbg("LLoss3 %d\r\n", err);
break;

Expand Down Expand Up @@ -489,19 +519,25 @@ ReturnCode ceGetRx(const uint8_t cmd, uint8_t *txData, uint16_t *txSize)
rfalListenStart(configMask, &configA, &configB, &configF, rxBuf_ce, rfalConvBytesToBits(RX_BUF_LENGTH), &rxRcvdLen);
rxReady = txReady = false;
isFirstA3_Frame = true;
ul_cwrite_page_set = 0;
printf_dbg("LLoss4 %d\r\n", err);
break;

case ERR_BUSY: /* Transceive ongoing */
break;

case ERR_NONE:
ST_MEMCPY(txData, transceiveCtx.rxBuf, *transceiveCtx.rxRcvdLen);
*txSize = rfalConvBitsToBytes(*transceiveCtx.rxRcvdLen);

rxReady = false;
txReady = true;
break;
if (*transceiveCtx.rxRcvdLen > 0) {
ST_MEMCPY(txData, transceiveCtx.rxBuf,
*transceiveCtx.rxRcvdLen);
*txSize = rfalConvBitsToBytes(*transceiveCtx.rxRcvdLen);

rxReady = false;
txReady = true;
} else {
err = ERR_BUSY; // no data available yet
}
break;
}
}
}
Expand Down Expand Up @@ -560,7 +596,7 @@ ReturnCode ceGetRx(const uint8_t cmd, uint8_t *txData, uint16_t *txSize)
return err;
}

ReturnCode ceSetTx(const uint8_t cmd, const uint8_t * rxData, const uint16_t rxSize)
ReturnCode ceSetTx(const uint8_t cmd, const uint8_t* rxData, const uint16_t rxSize, bool is_card_reset_needed)
{
ReturnCode err = ERR_NOTFOUND;
uint16_t rxSizeBytes = rfalConvBitsToBytes(rxSize);
Expand All @@ -584,23 +620,69 @@ ReturnCode ceSetTx(const uint8_t cmd, const uint8_t * rxData, const uint16_t rxS
ST_MEMCPY(transceiveCtx.txBuf, rxData, rxSizeBytes); // at least 1 byte for 1 bit
transceiveCtx.txBufLen = rxSize; // in bits!
*transceiveCtx.rxRcvdLen = 0;
// options here are tailored for Mifare emulation where 4 bit responses are needed
transceiveCtx.flags = (uint32_t)RFAL_TXRX_FLAGS_CRC_TX_MANUAL |
(uint32_t)RFAL_TXRX_FLAGS_CRC_RX_REMV | // RFAL_TXRX_FLAGS_CRC_RX_KEEP
(uint32_t)RFAL_TXRX_FLAGS_NFCIP1_OFF |
(uint32_t)RFAL_TXRX_FLAGS_AGC_ON |
(uint32_t)RFAL_TXRX_FLAGS_PAR_RX_REMV | // RFAL_TXRX_FLAGS_PAR_RX_KEEP
(uint32_t)RFAL_TXRX_FLAGS_PAR_TX_NONE |
(uint32_t)RFAL_TXRX_FLAGS_NFCV_FLAG_AUTO;
if (is_card_reset_needed) {
// use blocking transmit if rxSize > 0 and then go to sleep
if (rxSize > 0) {
// options here are tailored for Mifare emulation where 4 bit responses are needed
// todo see if there is a use case for several bytes tx and then sleep
// and check if it works
transceiveCtx.flags = (uint32_t)RFAL_TXRX_FLAGS_CRC_TX_MANUAL |
(uint32_t)RFAL_TXRX_FLAGS_CRC_RX_REMV | // RFAL_TXRX_FLAGS_CRC_RX_KEEP
(uint32_t)RFAL_TXRX_FLAGS_NFCIP1_OFF |
(uint32_t)RFAL_TXRX_FLAGS_AGC_ON |
(uint32_t)RFAL_TXRX_FLAGS_PAR_RX_REMV | // RFAL_TXRX_FLAGS_PAR_RX_KEEP
(uint32_t)RFAL_TXRX_FLAGS_PAR_TX_NONE |
(uint32_t)RFAL_TXRX_FLAGS_NFCV_FLAG_AUTO;

// ReturnCode rfalTransceiveBlockingTx( uint8_t* txBuf, uint16_t txBufLen, uint8_t* rxBuf, uint16_t rxBufLen, uint16_t* actLen, uint32_t flags, uint32_t fwt )
rfalStartTransceive(&transceiveCtx);
do {
rfalWorker();
err = rfalGetTransceiveStatus();
} while (rfalIsTransceiveInTx() && (err == ERR_BUSY));

if (rfalIsTransceiveInRx()) {
err = ERR_NONE;
} else {
printf_dbg("rfalGetTransceiveStatus %d\r\n", err);
}
}

err = rfalStartTransceive(&transceiveCtx);
// sleep after NAK etc
// todo distinguish between sleep and idle state here
rfalListenSleepStart(RFAL_LM_STATE_SLEEP_A, rxBuf_ce, RX_BUF_LENGTH, &rxRcvdLen);
// rfalListenStop();
// rfalListenStart(configMask, &configA, &configB, &configF, rxBuf_ce, rfalConvBytesToBits(RX_BUF_LENGTH), &rxRcvdLen);
rxReady = txReady = isActivatedA = false;
isFirstA3_Frame = true;
ul_cwrite_page_set = 0;
} else {
// card reset no needed

if (rxSize < 8) {
// options here are tailored for Mifare emulation where 4 bit responses are needed
// todo check flags if rxSize == 0, so we don't need to tx but need to rx
transceiveCtx.flags = (uint32_t)RFAL_TXRX_FLAGS_CRC_TX_MANUAL |
(uint32_t)RFAL_TXRX_FLAGS_CRC_RX_REMV | // RFAL_TXRX_FLAGS_CRC_RX_KEEP
(uint32_t)RFAL_TXRX_FLAGS_NFCIP1_OFF |
(uint32_t)RFAL_TXRX_FLAGS_AGC_ON |
(uint32_t)RFAL_TXRX_FLAGS_PAR_RX_REMV | // RFAL_TXRX_FLAGS_PAR_RX_KEEP
(uint32_t)RFAL_TXRX_FLAGS_PAR_TX_NONE |
(uint32_t)RFAL_TXRX_FLAGS_NFCV_FLAG_AUTO;
} else {
transceiveCtx.flags = RFAL_TXRX_FLAGS_DEFAULT;
}

if(err == ERR_NONE) {
// clear flag, after the first transmit (any other transceive is also not the first)
isFirstA3_Frame = false;
// clear rest of flags
rxReady = txReady = false;
err = rfalStartTransceive(&transceiveCtx);

if (err == ERR_NONE) {
// clear flag, after the first transmit (any other transceive is also not the first)
isFirstA3_Frame = false;
// clear rest of flags
rxReady = txReady = false;
}
}

}
}
break;
Expand Down
2 changes: 1 addition & 1 deletion src/hydranfc_v2/ce.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ extern ReturnCode ceStart(const uint8_t *rxData, const uint16_t rxSize);
extern ReturnCode ceStop(void);

extern ReturnCode ceGetRx(const uint8_t cmd, uint8_t *txData, uint16_t *txSize);
extern ReturnCode ceSetTx(const uint8_t cmd, const uint8_t* rxData, const uint16_t rxSize);
extern ReturnCode ceSetTx(const uint8_t cmd, const uint8_t* rxData, const uint16_t rxSize, bool is_card_reset_needed);

extern ReturnCode ceGetListenState(uint8_t *txData, uint16_t *txSize);

Expand Down
Loading