Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-04-28 03:59:58 -07:00
Code Issues Packages Projects Releases Wiki Activity

Kostyly for iso14443-4a poller (pwt_ext)

Browse Source 
Co-authored-by: Nikita Vostokov <1042932+wosk@users.noreply.github.com>
This commit is contained in:
Methodius
2024-01-20 05:35:37 +09:00
parent b5964b9795
commit ecabcbc58a
7 changed files with 113 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/nfc/protocols/emv/emv_poller_i.c
View File

@@ -261,7 +261,7 @@ EmvError emv_poller_select_ppse(EmvPoller* instance) {
do {
FURI_LOG_D(TAG, "Send select PPSE");
Iso14443_4aError iso14443_4a_error = iso14443_4a_poller_send_block(
Iso14443_4aError iso14443_4a_error = iso14443_4a_poller_send_block_pwt_ext(
instance->iso14443_4a_poller, instance->tx_buffer, instance->rx_buffer);
if(iso14443_4a_error != Iso14443_4aErrorNone) {
@@ -313,7 +313,7 @@ EmvError emv_poller_select_application(EmvPoller* instance) {
do {
FURI_LOG_D(TAG, "Start application");
Iso14443_4aError iso14443_4a_error = iso14443_4a_poller_send_block(
Iso14443_4aError iso14443_4a_error = iso14443_4a_poller_send_block_pwt_ext(
instance->iso14443_4a_poller, instance->tx_buffer, instance->rx_buffer);
emv_trace(instance, "Start application answer:");
@@ -365,7 +365,7 @@ EmvError emv_poller_get_processing_options(EmvPoller* instance) {
do {
FURI_LOG_D(TAG, "Get proccessing options");
Iso14443_4aError iso14443_4a_error = iso14443_4a_poller_send_block(
Iso14443_4aError iso14443_4a_error = iso14443_4a_poller_send_block_pwt_ext(
instance->iso14443_4a_poller, instance->tx_buffer, instance->rx_buffer);
emv_trace(instance, "Get processing options answer:");
@@ -408,7 +408,7 @@ EmvError emv_poller_read_sfi_record(EmvPoller* instance, uint8_t sfi, uint8_t re
bit_buffer_copy_bytes(instance->tx_buffer, emv_sfi_header, sizeof(emv_sfi_header));
do {
Iso14443_4aError iso14443_4a_error = iso14443_4a_poller_send_block(
Iso14443_4aError iso14443_4a_error = iso14443_4a_poller_send_block_pwt_ext(
instance->iso14443_4a_poller, instance->tx_buffer, instance->rx_buffer);
emv_trace(instance, "SFI record:");

1
lib/nfc/protocols/iso14443_4a/iso14443_4a.h
View File

@@ -13,6 +13,7 @@ typedef enum {
Iso14443_4aErrorNotPresent,
Iso14443_4aErrorProtocol,
Iso14443_4aErrorTimeout,
Iso14443_4aErrorSendCtrl,
} Iso14443_4aError;
typedef enum {

5
lib/nfc/protocols/iso14443_4a/iso14443_4a_poller.h
View File

@@ -56,6 +56,11 @@ Iso14443_4aError iso14443_4a_poller_send_block(
const BitBuffer* tx_buffer,
BitBuffer* rx_buffer);
Iso14443_4aError iso14443_4a_poller_send_block_pwt_ext(
Iso14443_4aPoller* instance,
const BitBuffer* tx_buffer,
BitBuffer* rx_buffer);
/**
* @brief Send HALT command to the card.
*

38
lib/nfc/protocols/iso14443_4a/iso14443_4a_poller_i.c
View File

@@ -81,3 +81,41 @@ Iso14443_4aError iso14443_4a_poller_send_block(
return error;
}
Iso14443_4aError iso14443_4a_poller_send_block_pwt_ext(
Iso14443_4aPoller* instance,
const BitBuffer* tx_buffer,
BitBuffer* rx_buffer) {
furi_assert(instance);
bit_buffer_reset(instance->tx_buffer);
iso14443_4_layer_encode_block(instance->iso14443_4_layer, tx_buffer, instance->tx_buffer);
Iso14443_4aError error = Iso14443_4aErrorNone;
do {
bit_buffer_reset(instance->rx_buffer);
Iso14443_3aError iso14443_3a_error = iso14443_3a_poller_send_standard_frame(
instance->iso14443_3a_poller,
instance->tx_buffer,
instance->rx_buffer,
iso14443_4a_get_fwt_fc_max(instance->data));
if(iso14443_3a_error != Iso14443_3aErrorNone) {
error = iso14443_4a_process_error(iso14443_3a_error);
break;
} else {
error = iso14443_4_layer_decode_block_pwt_ext(
instance->iso14443_4_layer, rx_buffer, instance->rx_buffer);
if(error == Iso14443_4aErrorSendCtrl) {
// Send response for Control message
bit_buffer_copy(instance->tx_buffer, rx_buffer);
continue;
}
break;
}
} while(true);
return error;
}