Mirrors/unleashed-firmware
2
0
Fork 0
mirror of https://github.com/DarkFlippers/unleashed-firmware synced 2024-11-22 20:43:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/dev' into leptoptilos

Browse source
This commit is contained in:
Methodius 2024-02-07 14:01:54 +09:00
commit 95e653cf76
No known key found for this signature in database
GPG key ID: 122FA99A00B41679
14 changed files with 826 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
applications/main/nfc/application.fam
View file

@ -155,6 +155,15 @@ App(
sources=["plugins/supported_cards/zolotaya_korona_online.c"],
)
App(
appid="clipper_parser",
apptype=FlipperAppType.PLUGIN,
entry_point="clipper_plugin_ep",
targets=["f7"],
requires=["nfc"],
sources=["plugins/supported_cards/clipper.c"],
)
App(
appid="hid_parser",
apptype=FlipperAppType.PLUGIN,
@ -191,6 +200,15 @@ App(
sources=["plugins/supported_cards/ndef.c"],
)
App(
appid="itso_parser",
apptype=FlipperAppType.PLUGIN,
entry_point="itso_plugin_ep",
targets=["f7"],
requires=["nfc"],
sources=["plugins/supported_cards/itso.c"],
)
App(
appid="nfc_start",
targets=["f7"],

36
applications/main/nfc/helpers/protocol_support/mf_classic/mf_classic.c
View file

@ -14,6 +14,7 @@ enum {
SubmenuIndexDetectReader = SubmenuIndexCommonMax,
SubmenuIndexWrite,
SubmenuIndexUpdate,
SubmenuIndexDictAttack
};
static void nfc_scene_info_on_enter_mf_classic(NfcApp* instance) {
@ -120,6 +121,13 @@ static void nfc_scene_read_menu_on_enter_mf_classic(NfcApp* instance) {
SubmenuIndexDetectReader,
nfc_protocol_support_common_submenu_callback,
instance);
submenu_add_item(
submenu,
"Unlock with Dictionary",
SubmenuIndexDictAttack,
nfc_protocol_support_common_submenu_callback,
instance);
}
}
@ -151,6 +159,13 @@ static void nfc_scene_saved_menu_on_enter_mf_classic(NfcApp* instance) {
SubmenuIndexDetectReader,
nfc_protocol_support_common_submenu_callback,
instance);
submenu_add_item(
submenu,
"Unlock with Dictionary",
SubmenuIndexDictAttack,
nfc_protocol_support_common_submenu_callback,
instance);
}
submenu_add_item(
submenu,
@ -158,6 +173,7 @@ static void nfc_scene_saved_menu_on_enter_mf_classic(NfcApp* instance) {
SubmenuIndexWrite,
nfc_protocol_support_common_submenu_callback,
instance);
submenu_add_item(
submenu,
"Update from Initial Card",
@ -173,13 +189,20 @@ static void nfc_scene_emulate_on_enter_mf_classic(NfcApp* instance) {
}
static bool nfc_scene_read_menu_on_event_mf_classic(NfcApp* instance, SceneManagerEvent event) {
if(event.type == SceneManagerEventTypeCustom && event.event == SubmenuIndexDetectReader) {
scene_manager_next_scene(instance->scene_manager, NfcSceneSaveConfirm);
dolphin_deed(DolphinDeedNfcDetectReader);
return true;
bool consumed = false;
if(event.type == SceneManagerEventTypeCustom) {
if(event.event == SubmenuIndexDetectReader) {
scene_manager_next_scene(instance->scene_manager, NfcSceneSaveConfirm);
dolphin_deed(DolphinDeedNfcDetectReader);
consumed = true;
} else if(event.event == SubmenuIndexDictAttack) {
scene_manager_next_scene(instance->scene_manager, NfcSceneMfClassicDictAttack);
consumed = true;
}
}
return false;
return consumed;
}
static bool nfc_scene_saved_menu_on_event_mf_classic(NfcApp* instance, SceneManagerEvent event) {
@ -195,6 +218,9 @@ static bool nfc_scene_saved_menu_on_event_mf_classic(NfcApp* instance, SceneMana
} else if(event.event == SubmenuIndexUpdate) {
scene_manager_next_scene(instance->scene_manager, NfcSceneMfClassicUpdateInitial);
consumed = true;
} else if(event.event == SubmenuIndexDictAttack) {
scene_manager_next_scene(instance->scene_manager, NfcSceneMfClassicDictAttack);
consumed = true;
}
}

4
applications/main/nfc/helpers/protocol_support/nfc_protocol_support.c
View file

@ -517,8 +517,8 @@ static bool
scene_manager_has_previous_scene(instance->scene_manager, NfcSceneSetType) ?
DolphinDeedNfcAddSave :
DolphinDeedNfcSave);
const NfcProtocol protocol =
instance->protocols_detected[instance->protocols_detected_selected_idx];
const NfcProtocol protocol = nfc_device_get_protocol(instance->nfc_device);
consumed =
nfc_protocol_support[protocol]->scene_save_name.on_event(instance, event);
} else {

2
applications/main/nfc/plugins/supported_cards/aime.c
View file

@ -60,7 +60,7 @@ static bool aime_read(Nfc* nfc, NfcDevice* device) {
}
error = mf_classic_poller_sync_read(nfc, &keys, data);
if(error != MfClassicErrorNone) {
if(error == MfClassicErrorNotPresent) {
FURI_LOG_W(TAG, "Failed to read data");
break;
}

621
applications/main/nfc/plugins/supported_cards/clipper.c Normal file
View file

@ -0,0 +1,621 @@
/*
* clipper.c - Parser for Clipper cards (San Francisco, California).
*
* Based on research, some of which dates to 2007!
*
* Copyright 2024 Jeremy Cooper <jeremy.gthb@baymoo.org>
*
* This program is free software: you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "nfc_supported_card_plugin.h"
#include <flipper_application/flipper_application.h>
#include <lib/nfc/protocols/mf_desfire/mf_desfire.h>
#include <lib/nfc/helpers/nfc_util.h>
#include <applications/services/locale/locale.h>
#include <furi_hal_rtc.h>
#include <inttypes.h>
//
// Table of application ids observed in the wild, and their sources.
//
static const struct {
const MfDesfireApplicationId app;
const char* type;
} clipper_types[] = {
// Application advertised on classic, plastic cards.
{.app = {.data = {0x90, 0x11, 0xf2}}, .type = "Card"},
// Application advertised on a mobile device.
{.app = {.data = {0x91, 0x11, 0xf2}}, .type = "Mobile Device"},
};
static const size_t kNumCardTypes = sizeof(clipper_types) / sizeof(clipper_types[0]);
struct IdMapping_struct {
uint16_t id;
const char* name;
};
typedef struct IdMapping_struct IdMapping;
#define COUNT(_array) sizeof(_array) / sizeof(_array[0])
//
// Known transportation agencies and their identifiers.
//
static const IdMapping agency_names[] = {
{.id = 0x0001, .name = "AC Transit"},
{.id = 0x0004, .name = "BART"},
{.id = 0x0006, .name = "Caltrain"},
{.id = 0x0008, .name = "CCTA"},
{.id = 0x000b, .name = "GGT"},
{.id = 0x000f, .name = "SamTrans"},
{.id = 0x0011, .name = "VTA"},
{.id = 0x0012, .name = "Muni"},
{.id = 0x0019, .name = "GG Ferry"},
{.id = 0x001b, .name = "SF Bay Ferry"},
};
static const size_t kNumAgencies = COUNT(agency_names);
//
// Known station names for various agencies.
//
static const IdMapping bart_zones[] = {
{.id = 0x0001, .name = "Colma"},
{.id = 0x0002, .name = "Daly City"},
{.id = 0x0003, .name = "Balboa Park"},
{.id = 0x0004, .name = "Glen Park"},
{.id = 0x0005, .name = "24th St Mission"},
{.id = 0x0006, .name = "16th St Mission"},
{.id = 0x0007, .name = "Civic Center/UN Plaza"},
{.id = 0x0008, .name = "Powell St"},
{.id = 0x0009, .name = "Montgomery St"},
{.id = 0x000a, .name = "Embarcadero"},
{.id = 0x000b, .name = "West Oakland"},
{.id = 0x000c, .name = "12th St/Oakland City Center"},
{.id = 0x000d, .name = "19th St/Oakland"},
{.id = 0x000e, .name = "MacArthur"},
{.id = 0x000f, .name = "Rockridge"},
{.id = 0x0010, .name = "Orinda"},
{.id = 0x0011, .name = "Lafayette"},
{.id = 0x0012, .name = "Walnut Creek"},
{.id = 0x0013, .name = "Pleasant Hill/Contra Costa Centre"},
{.id = 0x0014, .name = "Concord"},
{.id = 0x0015, .name = "North Concord/Martinez"},
{.id = 0x0016, .name = "Pittsburg/Bay Point"},
{.id = 0x0017, .name = "Ashby"},
{.id = 0x0018, .name = "Downtown Berkeley"},
{.id = 0x0019, .name = "North Berkeley"},
{.id = 0x001a, .name = "El Cerrito Plaza"},
{.id = 0x001b, .name = "El Cerrito Del Norte"},
{.id = 0x001c, .name = "Richmond"},
{.id = 0x001d, .name = "Lake Merrit"},
{.id = 0x001e, .name = "Fruitvale"},
{.id = 0x001f, .name = "Coliseum"},
{.id = 0x0021, .name = "San Leandro"},
{.id = 0x0022, .name = "Hayward"},
{.id = 0x0023, .name = "South Hayward"},
{.id = 0x0024, .name = "Union City"},
{.id = 0x0025, .name = "Fremont"},
{.id = 0x0026, .name = "Daly City(2)?"},
{.id = 0x0027, .name = "Dublin/Pleasanton"},
{.id = 0x0028, .name = "South San Francisco"},
{.id = 0x0029, .name = "San Bruno"},
{.id = 0x002a, .name = "SFO Airport"},
{.id = 0x002b, .name = "Millbrae"},
{.id = 0x002c, .name = "West Dublin/Pleasanton"},
{.id = 0x002d, .name = "OAK Airport"},
{.id = 0x002e, .name = "Warm Springs/South Fremont"},
};
static const size_t kNumBARTZones = COUNT(bart_zones);
static const IdMapping muni_zones[] = {
{.id = 0x0000, .name = "City Street"},
{.id = 0x0005, .name = "Embarcadero"},
{.id = 0x0006, .name = "Montgomery"},
{.id = 0x0007, .name = "Powell"},
{.id = 0x0008, .name = "Civic Center"},
{.id = 0x0009, .name = "Van Ness"}, // Guessed
{.id = 0x000a, .name = "Church"},
{.id = 0x000b, .name = "Castro"},
{.id = 0x000c, .name = "Forest Hill"}, // Guessed
{.id = 0x000d, .name = "West Portal"},
};
static const size_t kNumMUNIZones = COUNT(muni_zones);
static const IdMapping actransit_zones[] = {
{.id = 0x0000, .name = "City Street"},
};
static const size_t kNumACTransitZones = COUNT(actransit_zones);
//
// Full agency+zone mapping.
//
static const struct {
uint16_t agency_id;
const IdMapping* zone_map;
size_t zone_count;
} agency_zone_map[] = {
{.agency_id = 0x0001, .zone_map = actransit_zones, .zone_count = kNumACTransitZones},
{.agency_id = 0x0004, .zone_map = bart_zones, .zone_count = kNumBARTZones},
{.agency_id = 0x0012, .zone_map = muni_zones, .zone_count = kNumMUNIZones}};
static const size_t kNumAgencyZoneMaps = COUNT(agency_zone_map);
// File ids of important files on the card.
static const MfDesfireFileId clipper_ecash_file_id = 2;
static const MfDesfireFileId clipper_histidx_file_id = 6;
static const MfDesfireFileId clipper_identity_file_id = 8;
static const MfDesfireFileId clipper_history_file_id = 14;
struct ClipperCardInfo_struct {
uint32_t serial_number;
uint16_t counter;
uint16_t last_txn_id;
uint32_t last_updated_tm_1900;
uint16_t last_terminal_id;
int16_t balance_cents;
};
typedef struct ClipperCardInfo_struct ClipperCardInfo;
// Forward declarations for helper functions.
static void furi_string_cat_timestamp(
FuriString* str,
const char* date_hdr,
const char* time_hdr,
uint32_t tmst_1900);
static void epoch_1900_datetime_to_furi(uint32_t seconds, FuriHalRtcDateTime* out);
static bool get_file_contents(
const MfDesfireApplication* app,
const MfDesfireFileId* id,
MfDesfireFileType type,
size_t min_size,
const uint8_t** out);
static bool decode_id_file(const uint8_t* ef8_data, ClipperCardInfo* info);
static bool decode_cash_file(const uint8_t* ef2_data, ClipperCardInfo* info);
static bool get_map_item(uint16_t id, const IdMapping* map, size_t sz, const char** out);
static bool get_agency_zone_name(uint16_t agency_id, uint16_t zone_id, const char** out);
static void
decode_usd(int16_t amount_cents, bool* out_is_negative, int16_t* out_usd, uint16_t* out_cents);
static bool dump_ride_history(
const uint8_t* index_file,
const uint8_t* history_file,
size_t len,
FuriString* parsed_data);
static bool dump_ride_event(const uint8_t* record, FuriString* parsed_data);
// Unmarshal a 32-bit integer, big endian, unsigned
static inline uint32_t get_u32be(const uint8_t* field) {
return nfc_util_bytes2num(field, 4);
}
// Unmarshal a 16-bit integer, big endian, unsigned
static uint16_t get_u16be(const uint8_t* field) {
return nfc_util_bytes2num(field, 2);
}
// Unmarshal a 16-bit integer, big endian, signed, two's-complement
static int16_t get_i16be(const uint8_t* field) {
uint16_t raw = get_u16be(field);
if(raw > 0x7fff)
return -((uint32_t)0x10000 - raw);
else
return raw;
}
static bool clipper_parse(const NfcDevice* device, FuriString* parsed_data) {
furi_assert(device);
furi_assert(parsed_data);
bool parsed = false;
do {
const MfDesfireData* data = nfc_device_get_data(device, NfcProtocolMfDesfire);
const MfDesfireApplication* app = NULL;
const char* device_description = NULL;
for(size_t i = 0; i < kNumCardTypes; i++) {
app = mf_desfire_get_application(data, &clipper_types[i].app);
device_description = clipper_types[i].type;
if(app != NULL) break;
}
// If no matching application was found, abort this parser.
if(app == NULL) break;
ClipperCardInfo info;
const uint8_t* id_data;
if(!get_file_contents(
app, &clipper_identity_file_id, MfDesfireFileTypeStandard, 5, &id_data))
break;
if(!decode_id_file(id_data, &info)) break;
const uint8_t* cash_data;
if(!get_file_contents(app, &clipper_ecash_file_id, MfDesfireFileTypeBackup, 32, &cash_data))
break;
if(!decode_cash_file(cash_data, &info)) break;
int16_t balance_usd;
uint16_t balance_cents;
bool _balance_is_negative;
decode_usd(info.balance_cents, &_balance_is_negative, &balance_usd, &balance_cents);
furi_string_cat_printf(
parsed_data,
"\e#Clipper\n"
"Serial: %" PRIu32 "\n"
"Balance: $%d.%02u\n"
"Type: %s\n"
"\e#Last Update\n",
info.serial_number,
balance_usd,
balance_cents,
device_description);
if(info.last_updated_tm_1900 != 0)
furi_string_cat_timestamp(
parsed_data, "Date: ", "\nTime: ", info.last_updated_tm_1900);
else
furi_string_cat_str(parsed_data, "Never");
furi_string_cat_printf(
parsed_data,
"\nTerminal: 0x%04x\n"
"Transaction Id: %u\n"
"Counter: %u\n",
info.last_terminal_id,
info.last_txn_id,
info.counter);
const uint8_t *history_index, *history;
if(!get_file_contents(
app, &clipper_histidx_file_id, MfDesfireFileTypeBackup, 16, &history_index))
break;
if(!get_file_contents(
app, &clipper_history_file_id, MfDesfireFileTypeStandard, 512, &history))
break;
if(!dump_ride_history(history_index, history, 512, parsed_data)) break;
parsed = true;
} while(false);
return parsed;
}
static bool get_file_contents(
const MfDesfireApplication* app,
const MfDesfireFileId* id,
MfDesfireFileType type,
size_t min_size,
const uint8_t** out) {
const MfDesfireFileSettings* settings = mf_desfire_get_file_settings(app, id);
if(settings == NULL) return false;
if(settings->type != type) return false;
const MfDesfireFileData* file_data = mf_desfire_get_file_data(app, id);
if(file_data == NULL) return false;
if(simple_array_get_count(file_data->data) < min_size) return false;
*out = simple_array_cget_data(file_data->data);
return true;
}
static bool decode_id_file(const uint8_t* ef8_data, ClipperCardInfo* info) {
// Identity file (8)
//
// Byte view
//
// 0 1 2 3 4 5 6 7 8
// +----+----.----.----.----+----.----.----+
// 0x00 | uk | card_id | unknown |
// +----+----.----.----.----+----.----.----+
// 0x08 | unknown |
// +----.----.----.----.----.----.----.----+
// 0x10 ...
//
//
// Field Datatype Description
// ----- -------- -----------
// uk ?8?? Unknown, 8-bit byte
// card_id U32BE Card identifier
//
info->serial_number = nfc_util_bytes2num(&ef8_data[1], 4);
return true;
}
static bool decode_cash_file(const uint8_t* ef2_data, ClipperCardInfo* info) {
// ECash file (2)
//
// Byte view
//
// 0 1 2 3 4 5 6 7 8
// +----.----+----.----+----.----.----.----+
// 0x00 | unk00 | counter | timestamp_1900 |
// +----.----+----.----+----.----.----.----+
// 0x08 | term_id | unk01 |
// +----.----+----.----+----.----.----.----+
// 0x10 | txn_id | balance | unknown |
// +----.----+----.----+----.----.----.----+
// 0x18 | unknown |
// +---------------------------------------+
//
// Field Datatype Description
// ----- -------- -----------
// unk00 U8[2] Unknown bytes
// counter U16BE Unknown, appears to be a counter
// timestamp_1900 U32BE Timestamp of last transaction, in seconds
// since 1900-01-01 GMT.
// unk01 U8[6] Unknown bytes
// txn_id U16BE Id of last transaction.
// balance S16BE Card cash balance, in cents.
// Cards can obtain negative balances in this
// system, so balances are signed integers.
// Maximum card balance is therefore
// $327.67.
// unk02 U8[12] Unknown bytes.
//
info->counter = get_u16be(&ef2_data[2]);
info->last_updated_tm_1900 = get_u32be(&ef2_data[4]);
info->last_terminal_id = get_u16be(&ef2_data[8]);
info->last_txn_id = get_u16be(&ef2_data[0x10]);
info->balance_cents = get_i16be(&ef2_data[0x12]);
return true;
}
static bool dump_ride_history(
const uint8_t* index_file,
const uint8_t* history_file,
size_t len,
FuriString* parsed_data) {
static const size_t kRideRecordSize = 0x20;
for(size_t i = 0; i < 16; i++) {
uint8_t record_num = index_file[i];
if(record_num == 0xff) break;
size_t record_offset = record_num * kRideRecordSize;
if(record_offset + kRideRecordSize > len) break;
const uint8_t* record = &history_file[record_offset];
if(!dump_ride_event(record, parsed_data)) break;
}
return true;
}
static bool dump_ride_event(const uint8_t* record, FuriString* parsed_data) {
// Ride record
//
// 0 1 2 3 4 5 6 7 8
// +----+----+----.----+----.----+----.----+
// 0x00 |0x10| ? | agency | ? | fare |
// +----.----+----.----+----.----.----.----+
// 0x08 | ? | vehicle | time_on |
// +----.----.----.----+----.----+----.----+
// 0x10 | time_off | zone_on | zone_off|
// +----+----.----.----.----+----+----+----+
// 0x18 | ? | ? | ? | ? | ? |
// +----+----.----.----.----+----+----+----+
//
// Field Datatype Description
// ----- -------- -----------
// agency U16BE Transportation agency identifier.
// Known ids:
// 1 == AC Transit
// 4 == BART
// 18 == SF MUNI
// fare I16BE Fare deducted, in cents.
// vehicle U16BE Vehicle id (0 == not provided)
// time_on U32BE Boarding time, in seconds since 1900-01-01 GMT.
// time_off U32BE Off-boarding time, if present, in seconds
// since 1900-01-01 GMT. Set to zero if no offboard
// has been recorded.
// zone_on U16BE Id of boarding zone or station. Agency-specific.
// zone_off U16BE Id of offboarding zone or station. Agency-
// specific.
if(record[0] != 0x10) return false;
uint16_t agency_id = get_u16be(&record[2]);
if(agency_id == 0)
// Likely empty record. Skip.
return false;
const char* agency_name;
bool ok = get_map_item(agency_id, agency_names, kNumAgencies, &agency_name);
if(!ok) agency_name = "Unknown";
uint16_t vehicle_id = get_u16be(&record[0x0a]);
int16_t fare_raw_cents = get_i16be(&record[6]);
bool _fare_is_negative;
int16_t fare_usd;
uint16_t fare_cents;
decode_usd(fare_raw_cents, &_fare_is_negative, &fare_usd, &fare_cents);
uint32_t time_on_raw = get_u32be(&record[0x0c]);
uint32_t time_off_raw = get_u32be(&record[0x10]);
uint16_t zone_id_on = get_u16be(&record[0x14]);
uint16_t zone_id_off = get_u16be(&record[0x16]);
const char *zone_on, *zone_off;
if(!get_agency_zone_name(agency_id, zone_id_on, &zone_on)) {
zone_on = "Unknown";
}
if(!get_agency_zone_name(agency_id, zone_id_off, &zone_off)) {
zone_off = "Unknown";
}
furi_string_cat_str(parsed_data, "\e#Ride Record\n");
furi_string_cat_timestamp(parsed_data, "Date: ", "\nTime: ", time_on_raw);
furi_string_cat_printf(
parsed_data,
"\n"
"Fare: $%d.%02u\n"
"Agency: %s (%04x)\n"
"On: %s (%04x)\n",
fare_usd,
fare_cents,
agency_name,
agency_id,
zone_on,
zone_id_on);
if(vehicle_id != 0) {
furi_string_cat_printf(parsed_data, "Vehicle id: %d\n", vehicle_id);
}
if(time_off_raw != 0) {
furi_string_cat_printf(parsed_data, "Off: %s (%04x)\n", zone_off, zone_id_off);
furi_string_cat_timestamp(parsed_data, "Date Off: ", "\nTime Off: ", time_off_raw);
furi_string_cat_str(parsed_data, "\n");
}
return true;
}
static bool get_map_item(uint16_t id, const IdMapping* map, size_t sz, const char** out) {
for(size_t i = 0; i < sz; i++) {
if(map[i].id == id) {
*out = map[i].name;
return true;
}
}
return false;
}
static bool get_agency_zone_name(uint16_t agency_id, uint16_t zone_id, const char** out) {
for(size_t i = 0; i < kNumAgencyZoneMaps; i++) {
if(agency_zone_map[i].agency_id == agency_id) {
return get_map_item(
zone_id, agency_zone_map[i].zone_map, agency_zone_map[i].zone_count, out);
}
}
return false;
}
// Split a balance/fare amount from raw cents to dollars and cents portion,
// automatically adjusting the cents portion so that it is always positive,
// for easier display.
static void
decode_usd(int16_t amount_cents, bool* out_is_negative, int16_t* out_usd, uint16_t* out_cents) {
*out_usd = amount_cents / 100;
if(amount_cents >= 0) {
*out_is_negative = false;
*out_cents = amount_cents % 100;
} else {
*out_is_negative = true;
*out_cents = (amount_cents * -1) % 100;
}
}
// Decode a raw 1900-based timestamp and append a human-readable form to a
// FuriString.
static void furi_string_cat_timestamp(
FuriString* str,
const char* date_hdr,
const char* time_hdr,
uint32_t tmst_1900) {
FuriHalRtcDateTime tm;
epoch_1900_datetime_to_furi(tmst_1900, &tm);
FuriString* date_str = furi_string_alloc();
locale_format_date(date_str, &tm, locale_get_date_format(), "-");
FuriString* time_str = furi_string_alloc();
locale_format_time(time_str, &tm, locale_get_time_format(), true);
furi_string_cat_printf(
str,
"%s%s%s%s (UTC)",
date_hdr,
furi_string_get_cstr(date_str),
time_hdr,
furi_string_get_cstr(time_str));
furi_string_free(date_str);
furi_string_free(time_str);
}
// Convert a "1900"-based timestamp to Furi time, assuming a UTC/GMT timezone.
static void epoch_1900_datetime_to_furi(uint32_t seconds, FuriHalRtcDateTime* out) {
uint16_t year, month, day, hour, minute, second;
// Calculate absolute number of days elapsed since the 1900 epoch
// and save the residual for the time within the day.
uint32_t absolute_days = seconds / 86400;
uint32_t seconds_within_day = seconds % 86400;
// Calculate day of the week.
// January 1, 1900 was a Monday ("day of week" = 1)
uint8_t dow = (absolute_days + 1) % 7;
//
// Compute the date by simply marching through time in as large chunks
// as possible.
//
for(year = 1900;; year++) {
uint16_t year_days = furi_hal_rtc_get_days_per_year(year);
if(absolute_days >= year_days)
absolute_days -= year_days;
else
break;
}
bool is_leap = furi_hal_rtc_is_leap_year(year);
for(month = 1;; month++) {
uint8_t days_in_month = furi_hal_rtc_get_days_per_month(is_leap, month);
if(absolute_days >= days_in_month)
absolute_days -= days_in_month;
else
break;
}
day = absolute_days + 1;
hour = seconds_within_day / 3600;
uint16_t sub_hour = seconds_within_day % 3600;
minute = sub_hour / 60;
second = sub_hour % 60;
out->year = year;
out->month = month;
out->day = day;
out->hour = hour;
out->minute = minute;
out->second = second;
out->weekday = dow;
}
/* Actual implementation of app<>plugin interface */
static const NfcSupportedCardsPlugin clipper_plugin = {
.protocol = NfcProtocolMfDesfire,
.verify = NULL,
.read = NULL,
.parse = clipper_parse,
};
/* Plugin descriptor to comply with basic plugin specification */
static const FlipperAppPluginDescriptor clipper_plugin_descriptor = {
.appid = NFC_SUPPORTED_CARD_PLUGIN_APP_ID,
.ep_api_version = NFC_SUPPORTED_CARD_PLUGIN_API_VERSION,
.entry_point = &clipper_plugin,
};
/* Plugin entry point - must return a pointer to const descriptor */
const FlipperAppPluginDescriptor* clipper_plugin_ep() {
return &clipper_plugin_descriptor;
}

2
applications/main/nfc/plugins/supported_cards/hid.c
View file

@ -60,7 +60,7 @@ static bool hid_read(Nfc* nfc, NfcDevice* device) {
}
error = mf_classic_poller_sync_read(nfc, &keys, data);
if(error != MfClassicErrorNone) {
if(error == MfClassicErrorNotPresent) {
FURI_LOG_W(TAG, "Failed to read data");
break;
}

124
applications/main/nfc/plugins/supported_cards/itso.c Normal file
View file

@ -0,0 +1,124 @@
/* itso.c - Parser for ITSO cards (United Kingdom). */
#include "nfc_supported_card_plugin.h"
#include <flipper_application/flipper_application.h>
#include <lib/nfc/protocols/mf_desfire/mf_desfire.h>
#include <applications/services/locale/locale.h>
#include <furi_hal_rtc.h>
static const MfDesfireApplicationId itso_app_id = {.data = {0x16, 0x02, 0xa0}};
static const MfDesfireFileId itso_file_id = 0x0f;
int64_t swap_int64(int64_t val) {
val = ((val << 8) & 0xFF00FF00FF00FF00ULL) | ((val >> 8) & 0x00FF00FF00FF00FFULL);
val = ((val << 16) & 0xFFFF0000FFFF0000ULL) | ((val >> 16) & 0x0000FFFF0000FFFFULL);
return (val << 32) | ((val >> 32) & 0xFFFFFFFFULL);
}
uint64_t swap_uint64(uint64_t val) {
val = ((val << 8) & 0xFF00FF00FF00FF00ULL) | ((val >> 8) & 0x00FF00FF00FF00FFULL);
val = ((val << 16) & 0xFFFF0000FFFF0000ULL) | ((val >> 16) & 0x0000FFFF0000FFFFULL);
return (val << 32) | (val >> 32);
}
static bool itso_parse(const NfcDevice* device, FuriString* parsed_data) {
furi_assert(device);
furi_assert(parsed_data);
bool parsed = false;
do {
const MfDesfireData* data = nfc_device_get_data(device, NfcProtocolMfDesfire);
const MfDesfireApplication* app = mf_desfire_get_application(data, &itso_app_id);
if(app == NULL) break;
typedef struct {
uint64_t part1;
uint64_t part2;
uint64_t part3;
uint64_t part4;
} ItsoFile;
const MfDesfireFileSettings* file_settings =
mf_desfire_get_file_settings(app, &itso_file_id);
if(file_settings == NULL || file_settings->type != MfDesfireFileTypeStandard ||
file_settings->data.size < sizeof(ItsoFile))
break;
const MfDesfireFileData* file_data = mf_desfire_get_file_data(app, &itso_file_id);
if(file_data == NULL) break;
const ItsoFile* itso_file = simple_array_cget_data(file_data->data);
uint64_t x1 = swap_uint64(itso_file->part1);
uint64_t x2 = swap_uint64(itso_file->part2);
char cardBuff[32];
char dateBuff[18];
snprintf(cardBuff, sizeof(cardBuff), "%llx%llx", x1, x2);
snprintf(dateBuff, sizeof(dateBuff), "%llx", x2);
char* cardp = cardBuff + 4;
cardp[18] = '\0';
// All itso card numbers are prefixed with "633597"
if(strncmp(cardp, "633597", 6) != 0) break;
char* datep = dateBuff + 12;
dateBuff[17] = '\0';
// DateStamp is defined in BS EN 1545 - Days passed since 01/01/1997
uint32_t dateStamp = (int)strtol(datep, NULL, 16);
uint32_t unixTimestamp = dateStamp * 24 * 60 * 60 + 852076800U;
furi_string_set(parsed_data, "\e#ITSO Card\n");
// Digit count in each space-separated group
static const uint8_t digit_count[] = {6, 4, 4, 4};
for(uint32_t i = 0, k = 0; i < COUNT_OF(digit_count); k += digit_count[i++]) {
for(uint32_t j = 0; j < digit_count[i]; ++j) {
furi_string_push_back(parsed_data, cardp[j + k]);
}
furi_string_push_back(parsed_data, ' ');
}
FuriHalRtcDateTime timestamp = {0};
furi_hal_rtc_timestamp_to_datetime(unixTimestamp, &timestamp);
FuriString* timestamp_str = furi_string_alloc();
locale_format_date(timestamp_str, &timestamp, locale_get_date_format(), "-");
furi_string_cat(parsed_data, "\nExpiry: ");
furi_string_cat(parsed_data, timestamp_str);
furi_string_free(timestamp_str);
parsed = true;
} while(false);
return parsed;
}
/* Actual implementation of app<>plugin interface */
static const NfcSupportedCardsPlugin itso_plugin = {
.protocol = NfcProtocolMfDesfire,
.verify = NULL,
.read = NULL,
.parse = itso_parse,
};
/* Plugin descriptor to comply with basic plugin specification */
static const FlipperAppPluginDescriptor itso_plugin_descriptor = {
.appid = NFC_SUPPORTED_CARD_PLUGIN_APP_ID,
.ep_api_version = NFC_SUPPORTED_CARD_PLUGIN_API_VERSION,
.entry_point = &itso_plugin,
};
/* Plugin entry point - must return a pointer to const descriptor */
const FlipperAppPluginDescriptor* itso_plugin_ep() {
return &itso_plugin_descriptor;
}

4
applications/main/nfc/plugins/supported_cards/plantain.c
View file

@ -135,14 +135,14 @@ static bool plantain_read(Nfc* nfc, NfcDevice* device) {
}
error = mf_classic_poller_sync_read(nfc, &keys, data);
if(error != MfClassicErrorNone) {
if(error == MfClassicErrorNotPresent) {
FURI_LOG_W(TAG, "Failed to read data");
break;
}
nfc_device_set_data(device, NfcProtocolMfClassic, data);
is_read = mf_classic_is_card_read(data);
is_read = (error == MfClassicErrorNone);
} while(false);
mf_classic_free(data);

4
applications/main/nfc/plugins/supported_cards/two_cities.c
View file

@ -85,14 +85,14 @@ static bool two_cities_read(Nfc* nfc, NfcDevice* device) {
}
error = mf_classic_poller_sync_read(nfc, &keys, data);
if(error != MfClassicErrorNone) {
if(error == MfClassicErrorNotPresent) {
FURI_LOG_W(TAG, "Failed to read data");
break;
}
nfc_device_set_data(device, NfcProtocolMfClassic, data);
is_read = mf_classic_is_card_read(data);
is_read = (error == MfClassicErrorNone);
} while(false);
mf_classic_free(data);

7
applications/main/nfc/scenes/nfc_scene_retry_confirm.c
View file

@ -28,8 +28,11 @@ bool nfc_scene_retry_confirm_on_event(void* context, SceneManagerEvent event) {
if(event.event == DialogExResultRight) {
consumed = scene_manager_previous_scene(nfc->scene_manager);
} else if(event.event == DialogExResultLeft) {
if(scene_manager_has_previous_scene(
nfc->scene_manager, NfcSceneMfUltralightUnlockWarn)) {
if(scene_manager_has_previous_scene(nfc->scene_manager, NfcSceneMfClassicDictAttack)) {
consumed = scene_manager_search_and_switch_to_previous_scene(
nfc->scene_manager, NfcSceneMfClassicDictAttack);
} else if(scene_manager_has_previous_scene(
nfc->scene_manager, NfcSceneMfUltralightUnlockWarn)) {
consumed = scene_manager_search_and_switch_to_previous_scene(
nfc->scene_manager, NfcSceneMfUltralightUnlockMenu);
} else if(scene_manager_has_previous_scene(nfc->scene_manager, NfcSceneDetect)) {

17
applications/main/nfc/scenes/nfc_scene_save_success.c
View file

@ -37,20 +37,19 @@ bool nfc_scene_save_success_on_event(void* context, SceneManagerEvent event) {
} else if(scene_manager_has_previous_scene(nfc->scene_manager, NfcSceneReadSuccess)) {
consumed = scene_manager_search_and_switch_to_another_scene(
nfc->scene_manager, NfcSceneFileSelect);
} else {
} else if(scene_manager_has_previous_scene(nfc->scene_manager, NfcSceneFileSelect)) {
consumed = scene_manager_search_and_switch_to_previous_scene(
nfc->scene_manager, NfcSceneFileSelect);
if(!consumed) {
consumed = scene_manager_search_and_switch_to_previous_scene(
nfc->scene_manager, NfcSceneSavedMenu);
if(!consumed) {
consumed = scene_manager_search_and_switch_to_another_scene(
nfc->scene_manager, NfcSceneFileSelect);
}
}
} else if(scene_manager_has_previous_scene(nfc->scene_manager, NfcSceneSavedMenu)) {
consumed = scene_manager_search_and_switch_to_previous_scene(
nfc->scene_manager, NfcSceneSavedMenu);
} else {
consumed = scene_manager_search_and_switch_to_another_scene(
nfc->scene_manager, NfcSceneFileSelect);
}
}
}
return consumed;
}

3
applications/main/nfc/scenes/nfc_scene_start.c
View file

@ -24,8 +24,7 @@ void nfc_scene_start_on_enter(void* context) {
furi_string_reset(nfc->file_name);
nfc_device_clear(nfc->nfc_device);
iso14443_3a_reset(nfc->iso14443_3a_edit_data);
// Clear detected protocols list
memset(nfc->protocols_detected, NfcProtocolIso14443_3a, NfcProtocolNum);
// Reset detected protocols list
nfc_app_reset_detected_protocols(nfc);
submenu_add_item(submenu, "Read", SubmenuIndexRead, nfc_scene_start_submenu_callback, nfc);

1
lib/nfc/protocols/mf_classic/mf_classic.h
View file

@ -39,6 +39,7 @@ typedef enum {
MfClassicErrorNotPresent,
MfClassicErrorProtocol,
MfClassicErrorAuth,
MfClassicErrorPartialRead,
MfClassicErrorTimeout,
} MfClassicError;

21
lib/nfc/protocols/mf_classic/mf_classic_poller_sync.c
View file

@ -475,19 +475,16 @@ MfClassicError
nfc_poller_stop(poller);
if(poller_context.error != MfClassicErrorNone) {
error = poller_context.error;
} else {
const MfClassicData* mfc_data = nfc_poller_get_data(poller);
uint8_t sectors_read = 0;
uint8_t keys_found = 0;
const MfClassicData* mfc_data = nfc_poller_get_data(poller);
uint8_t sectors_read = 0;
uint8_t keys_found = 0;
mf_classic_get_read_sectors_and_keys(mfc_data, &sectors_read, &keys_found);
if((sectors_read > 0) || (keys_found > 0)) {
mf_classic_copy(data, mfc_data);
} else {
error = MfClassicErrorNotPresent;
}
mf_classic_get_read_sectors_and_keys(mfc_data, &sectors_read, &keys_found);
if((sectors_read == 0) && (keys_found == 0)) {
error = MfClassicErrorNotPresent;
} else {
mf_classic_copy(data, mfc_data);
error = mf_classic_is_card_read(mfc_data) ? MfClassicErrorNone : MfClassicErrorPartialRead;
}
nfc_poller_free(poller);