Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-07-30 02:18:11 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix EMV reading

Browse Source 
2 MasterCard were successfully read

Issues: some VISA and Mastercard and all UnionPay can't be read

TODO: currency, country, Application name
TODO: Support multi application mode to read co-branded card.
This commit is contained in:
Nikita Vostokov
2024-01-15 03:53:03 +00:00
committed by Methodius
parent 3a82b3aa3c
commit 08a5adf18e
6 changed files with 99 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/nfc/protocols/emv/emv.h
+1 -1
View File
@@ -41,7 +41,7 @@ typedef struct {
bool app_started;
char name[32];
bool name_found;
uint8_t pan[10];
uint8_t pan[10]; // card_number
uint8_t pan_len;
uint8_t exp_month;
uint8_t exp_year;
lib/nfc/protocols/emv/emv_poller.c
+7 -6
View File
@@ -71,7 +71,6 @@ static NfcCommand emv_poller_handler_select_ppse(EmvPoller* instance) {
instance->state = EmvPollerStateSelectApplication;
} else {
FURI_LOG_E(TAG, "Failed to select PPSE");
iso14443_4a_poller_halt(instance->iso14443_4a_poller);
instance->state = EmvPollerStateReadFailed;
}
@@ -86,7 +85,6 @@ static NfcCommand emv_poller_handler_select_application(EmvPoller* instance) {
instance->state = EmvPollerStateGetProcessingOptions;
} else {
FURI_LOG_E(TAG, "Failed to select application");
iso14443_4a_poller_halt(instance->iso14443_4a_poller);
instance->state = EmvPollerStateReadFailed;
}
@@ -98,10 +96,14 @@ static NfcCommand emv_poller_handler_get_processing_options(EmvPoller* instance)
if(instance->error == EmvErrorNone) {
FURI_LOG_D(TAG, "Get processing options success");
instance->state = EmvPollerStateReadSuccess;
if(instance->data->emv_application.pan_len > 0) {
instance->state = EmvPollerStateReadSuccess;
} else {
FURI_LOG_D(TAG, "No AFL still. Fallback to bruteforce files");
instance->state = EmvPollerStateReadFiles;
}
} else {
FURI_LOG_E(TAG, "Failed to get processing options");
iso14443_4a_poller_halt(instance->iso14443_4a_poller);
instance->state = EmvPollerStateReadFiles;
}
@@ -116,7 +118,6 @@ static NfcCommand emv_poller_handler_read_files(EmvPoller* instance) {
instance->state = EmvPollerStateReadSuccess;
} else {
FURI_LOG_E(TAG, "Failed to read files");
iso14443_4a_poller_halt(instance->iso14443_4a_poller);
instance->state = EmvPollerStateReadFailed;
}
@@ -133,7 +134,7 @@ static NfcCommand emv_poller_handler_read_fail(EmvPoller* instance) {
}
static NfcCommand emv_poller_handler_read_success(EmvPoller* instance) {
FURI_LOG_D(TAG, "Read success.");
FURI_LOG_D(TAG, "Read success");
iso14443_4a_poller_halt(instance->iso14443_4a_poller);
instance->emv_event.type = EmvPollerEventTypeReadSuccess;
NfcCommand command = instance->callback(instance->general_event, instance->context);
lib/nfc/protocols/emv/emv_poller_i.c
+37 -22
View File
@@ -183,6 +183,7 @@ static bool emv_decode_response(const uint8_t* buff, uint16_t len, EmvApplicatio
break;
}
case EMV_TAG_TRACK_2_EQUIV: {
FURI_LOG_T(TAG, "found EMV_TAG_TRACK_2_EQUIV %x", tag);
// 0xD0 delimits PAN from expiry (YYMM)
for(int x = 1; x < tlen; x++) {
if(buff[i + x + 1] > 0xD0) {
@@ -194,41 +195,45 @@ static bool emv_decode_response(const uint8_t* buff, uint16_t len, EmvApplicatio
}
}
// Convert 4-bit to ASCII representation
char track_2_equiv[41];
uint8_t track_2_equiv_len = 0;
for(int x = 0; x < tlen; x++) {
char top = (buff[i + x] >> 4) + '0';
char bottom = (buff[i + x] & 0x0F) + '0';
track_2_equiv[x * 2] = top;
track_2_equiv_len++;
if(top == '?') break;
track_2_equiv[x * 2 + 1] = bottom;
track_2_equiv_len++;
if(bottom == '?') break;
}
track_2_equiv[track_2_equiv_len] = '\0';
// // Convert 4-bit to ASCII representation
// char track_2_equiv[41];
// uint8_t track_2_equiv_len = 0;
// for(int x = 0; x < tlen; x++) {
// char top = (buff[i + x] >> 4) + '0';
// char bottom = (buff[i + x] & 0x0F) + '0';
// track_2_equiv[x * 2] = top;
// track_2_equiv_len++;
// if(top == '?') break;
// track_2_equiv[x * 2 + 1] = bottom;
// track_2_equiv_len++;
// if(bottom == '?') break;
// }
// track_2_equiv[track_2_equiv_len] = '\0';
// FURI_LOG_T(TAG, "found EMV_TAG_TRACK_2_EQUIV %x : %s", tag, track_2_equiv);
success = true;
FURI_LOG_T(TAG, "found EMV_TAG_TRACK_2_EQUIV %x : %s", tag, track_2_equiv);
break;
}
case EMV_TAG_PAN:
memcpy(app->pan, &buff[i], tlen);
app->pan_len = tlen;
success = true;
FURI_LOG_T(TAG, "found EMV_TAG_PAN %x", tag);
break;
case EMV_TAG_EXP_DATE:
app->exp_year = buff[i];
app->exp_month = buff[i + 1];
success = true;
FURI_LOG_T(TAG, "found EMV_TAG_EXP_DATE %x", tag);
break;
case EMV_TAG_CURRENCY_CODE:
app->currency_code = (buff[i] << 8 | buff[i + 1]);
success = true;
FURI_LOG_T(TAG, "found EMV_TAG_CURRENCY_CODE %x", tag);
break;
case EMV_TAG_COUNTRY_CODE:
app->country_code = (buff[i] << 8 | buff[i + 1]);
success = true;
FURI_LOG_T(TAG, "found EMV_TAG_COUNTRY_CODE %x", tag);
break;
}
}
@@ -413,6 +418,7 @@ EmvError emv_poller_read_sfi_record(EmvPoller* instance, uint8_t sfi, uint8_t re
emv_trace(instance, "SFI record:");
if(iso14443_4a_error != Iso14443_4aErrorNone) {
FURI_LOG_E(TAG, "Failed to read SFI %d record %d", sfi, record_num);
error = emv_process_error(iso14443_4a_error);
break;
}
@@ -423,8 +429,9 @@ EmvError emv_poller_read_sfi_record(EmvPoller* instance, uint8_t sfi, uint8_t re
buff,
bit_buffer_get_size_bytes(instance->rx_buffer),
&instance->data->emv_application)) {
error = EmvErrorProtocol;
FURI_LOG_E(TAG, "Failed to read SFI record %d", record_num);
// It's ok while bruteforcing
//error = EmvErrorProtocol;
FURI_LOG_T(TAG, "Failed to parse SFI %d record %d", sfi, record_num);
}
} while(false);
@@ -449,8 +456,12 @@ EmvError emv_poller_read_files(EmvPoller* instance) {
uint8_t record_end = afl->data[i + 2];
// Iterate through all records in file
for(uint8_t record = record_start; record <= record_end; ++record) {
error |= emv_poller_read_sfi_record(instance, sfi, record);
error = emv_poller_read_sfi_record(instance, sfi, record);
if(error != EmvErrorNone) break;
if(instance->data->emv_application.pan_len != 0)
return EmvErrorNone; // Card number fetched
}
error = EmvErrorProtocol;
}
return error;
@@ -462,15 +473,19 @@ EmvError emv_poller_read(EmvPoller* instance) {
memset(&instance->data->emv_application, 0, sizeof(EmvApplication));
do {
error |= emv_poller_select_ppse(instance);
error = emv_poller_select_ppse(instance);
if(error != EmvErrorNone) break;
error |= emv_poller_select_application(instance);
error = emv_poller_select_application(instance);
if(error != EmvErrorNone) break;
if(emv_poller_get_processing_options(instance) != EmvErrorNone)
error = emv_poller_get_processing_options(instance);
if(error != EmvErrorNone) break;
if(instance->data->emv_application.pan_len == 0) {
error = emv_poller_read_files(instance);
if(error != EmvErrorNone) break;
}
} while(false);
return error;