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

Kazan parser improved: token parse option added

Browse source
This commit is contained in:
Methodius 2024-02-05 20:53:08 +09:00
parent 12d70a3c32
commit 35674a306b
No known key found for this signature in database
GPG key ID: 122FA99A00B41679
1 changed files with 81 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

110
applications/main/nfc/plugins/supported_cards/kazan.c
View file

@ -34,7 +34,7 @@ typedef struct {
uint64_t b; uint64_t b;
} MfClassicKeyPair; } MfClassicKeyPair;
static const MfClassicKeyPair kazan_1k_keys_standart[] = { static const MfClassicKeyPair kazan_1k_keys_v1[] = {
{.a = 0xFFFFFFFFFFFF, .b = 0xFFFFFFFFFFFF}, {.a = 0xFFFFFFFFFFFF, .b = 0xFFFFFFFFFFFF},
{.a = 0xFFFFFFFFFFFF, .b = 0xFFFFFFFFFFFF}, {.a = 0xFFFFFFFFFFFF, .b = 0xFFFFFFFFFFFF},
{.a = 0xFFFFFFFFFFFF, .b = 0xFFFFFFFFFFFF}, {.a = 0xFFFFFFFFFFFF, .b = 0xFFFFFFFFFFFF},
@ -53,7 +53,7 @@ static const MfClassicKeyPair kazan_1k_keys_standart[] = {
{.a = 0xFFFFFFFFFFFF, .b = 0xFFFFFFFFFFFF}, {.a = 0xFFFFFFFFFFFF, .b = 0xFFFFFFFFFFFF},
}; };
static const MfClassicKeyPair kazan_1k_keys_old[] = { static const MfClassicKeyPair kazan_1k_keys_v2[] = {
{.a = 0xFFFFFFFFFFFF, .b = 0xFFFFFFFFFFFF}, {.a = 0xFFFFFFFFFFFF, .b = 0xFFFFFFFFFFFF},
{.a = 0xFFFFFFFFFFFF, .b = 0xFFFFFFFFFFFF}, {.a = 0xFFFFFFFFFFFF, .b = 0xFFFFFFFFFFFF},
{.a = 0xFFFFFFFFFFFF, .b = 0xFFFFFFFFFFFF}, {.a = 0xFFFFFFFFFFFF, .b = 0xFFFFFFFFFFFF},
@ -72,6 +72,25 @@ static const MfClassicKeyPair kazan_1k_keys_old[] = {
{.a = 0xFFFFFFFFFFFF, .b = 0xFFFFFFFFFFFF}, {.a = 0xFFFFFFFFFFFF, .b = 0xFFFFFFFFFFFF},
}; };
static const MfClassicKeyPair kazan_1k_keys_v3[] = {
{.a = 0x165D3B5280C0, .b = 0xFC7C2BB34E0F},
{.a = 0xC178E3DA7A39, .b = 0xC70FB78B4934},
{.a = 0x1BDF96089D2F, .b = 0x9500F058ABC5},
{.a = 0xB65AA70AD524, .b = 0x733A63B8B7F3},
{.a = 0x8BDB8FECDCAF, .b = 0xB0048EE71C0F},
{.a = 0xBC10468ABF05, .b = 0x1700A7D5C034},
{.a = 0xE7F3282E0C7D, .b = 0x65909B89BDA5},
{.a = 0x986C63DD0355, .b = 0x901C125ED37D},
{.a = 0x2058EAEE8446, .b = 0xCB9B23815F87},
{.a = 0x492F3744A1DC, .b = 0x6B770AADA274},
{.a = 0x87EB933B9BF7, .b = 0xFC98A9460EE5},
{.a = 0x7EBC8337F8F0, .b = 0x887C97E53DBC},
{.a = 0xA369BF6D4452, .b = 0x03BBA7CA2F24},
{.a = 0x37569D7992EF, .b = 0x710BBD01B3B8},
{.a = 0xD4AA94C4B5E8, .b = 0x7F5C4D210F0B},
{.a = 0x521B8C4B2123, .b = 0x2D2392CC43A7},
};
enum SubscriptionType { enum SubscriptionType {
SUBSCRIPTION_TYPE_UNKNOWN, SUBSCRIPTION_TYPE_UNKNOWN,
SUBSCRIPTION_TYPE_PURSE, SUBSCRIPTION_TYPE_PURSE,
@ -96,6 +115,9 @@ enum SubscriptionType get_subscription_type(uint8_t value, FuriString* tariff_na
case 0x53: case 0x53:
furi_string_printf(tariff_name, "Standart purse"); furi_string_printf(tariff_name, "Standart purse");
return SUBSCRIPTION_TYPE_PURSE; return SUBSCRIPTION_TYPE_PURSE;
case 0x01:
furi_string_printf(tariff_name, "Token");
return SUBSCRIPTION_TYPE_ABONNEMENT_BY_TRIPS;
default: default:
furi_string_printf(tariff_name, "Unknown"); furi_string_printf(tariff_name, "Unknown");
return SUBSCRIPTION_TYPE_UNKNOWN; return SUBSCRIPTION_TYPE_UNKNOWN;
@ -106,21 +128,34 @@ static bool kazan_verify(Nfc* nfc) {
bool verified = false; bool verified = false;
do { do {
const uint8_t verification_sector_number = 10; const uint8_t verification_sector_number = 8;
const uint8_t verification_block_number = const uint8_t verification_block_number =
mf_classic_get_first_block_num_of_sector(verification_sector_number) + 1; mf_classic_get_first_block_num_of_sector(verification_sector_number) + 1;
FURI_LOG_D(TAG, "Verifying sector %u", verification_sector_number); FURI_LOG_D(TAG, "Verifying sector %u", verification_sector_number);
MfClassicKey key = {0}; MfClassicKey key_1 = {0};
nfc_util_num2bytes( nfc_util_num2bytes(
kazan_1k_keys_standart[verification_sector_number].a, COUNT_OF(key.data), key.data); kazan_1k_keys_v1[verification_sector_number].a, COUNT_OF(key_1.data), key_1.data);
MfClassicAuthContext auth_context; MfClassicAuthContext auth_context;
MfClassicError error = mf_classic_poller_sync_auth( MfClassicError error = mf_classic_poller_sync_auth(
nfc, verification_block_number, &key, MfClassicKeyTypeA, &auth_context); nfc, verification_block_number, &key_1, MfClassicKeyTypeA, &auth_context);
if(error != MfClassicErrorNone) { if(error != MfClassicErrorNone) {
FURI_LOG_D(TAG, "Failed to read block %u: %d", verification_block_number, error); FURI_LOG_D(
break; TAG, "Failed to read block %u: %d. Keys: v1", verification_block_number, error);
MfClassicKey key_2 = {0};
nfc_util_num2bytes(
kazan_1k_keys_v2[verification_sector_number].a, COUNT_OF(key_2.data), key_2.data);
MfClassicAuthContext auth_context;
MfClassicError error = mf_classic_poller_sync_auth(
nfc, verification_block_number, &key_2, MfClassicKeyTypeA, &auth_context);
if(error != MfClassicErrorNone) {
FURI_LOG_D(
TAG, "Failed to read block %u: %d. Keys: v2", verification_block_number, error);
break;
}
} }
verified = true; verified = true;
@ -145,41 +180,57 @@ static bool kazan_read(Nfc* nfc, NfcDevice* device) {
data->type = type; data->type = type;
if(type != MfClassicType1k) break; if(type != MfClassicType1k) break;
MfClassicDeviceKeys keys = { MfClassicDeviceKeys keys_v1 = {
.key_a_mask = 0, .key_a_mask = 0,
.key_b_mask = 0, .key_b_mask = 0,
}; };
MfClassicDeviceKeys keys_old = { MfClassicDeviceKeys keys_v2 = {
.key_a_mask = 0,
.key_b_mask = 0,
};
MfClassicDeviceKeys keys_v3 = {
.key_a_mask = 0, .key_a_mask = 0,
.key_b_mask = 0, .key_b_mask = 0,
}; };
for(size_t i = 0; i < mf_classic_get_total_sectors_num(data->type); i++) { for(size_t i = 0; i < mf_classic_get_total_sectors_num(data->type); i++) {
nfc_util_num2bytes( nfc_util_num2bytes(kazan_1k_keys_v1[i].a, sizeof(MfClassicKey), keys_v1.key_a[i].data);
kazan_1k_keys_standart[i].a, sizeof(MfClassicKey), keys.key_a[i].data); nfc_util_num2bytes(kazan_1k_keys_v2[i].a, sizeof(MfClassicKey), keys_v2.key_a[i].data);
nfc_util_num2bytes( nfc_util_num2bytes(kazan_1k_keys_v3[i].a, sizeof(MfClassicKey), keys_v3.key_a[i].data);
kazan_1k_keys_old[i].a, sizeof(MfClassicKey), keys_old.key_a[i].data);
FURI_BIT_SET(keys.key_a_mask, i);
FURI_BIT_SET(keys_old.key_a_mask, i);
nfc_util_num2bytes( FURI_BIT_SET(keys_v1.key_a_mask, i);
kazan_1k_keys_standart[i].b, sizeof(MfClassicKey), keys.key_b[i].data); FURI_BIT_SET(keys_v2.key_a_mask, i);
nfc_util_num2bytes( FURI_BIT_SET(keys_v3.key_a_mask, i);
kazan_1k_keys_old[i].b, sizeof(MfClassicKey), keys_old.key_b[i].data);
FURI_BIT_SET(keys.key_b_mask, i); nfc_util_num2bytes(kazan_1k_keys_v1[i].b, sizeof(MfClassicKey), keys_v1.key_b[i].data);
FURI_BIT_SET(keys_old.key_b_mask, i); nfc_util_num2bytes(kazan_1k_keys_v2[i].b, sizeof(MfClassicKey), keys_v2.key_b[i].data);
nfc_util_num2bytes(kazan_1k_keys_v3[i].b, sizeof(MfClassicKey), keys_v3.key_b[i].data);
FURI_BIT_SET(keys_v1.key_b_mask, i);
FURI_BIT_SET(keys_v2.key_b_mask, i);
FURI_BIT_SET(keys_v3.key_b_mask, i);
} }
error = mf_classic_poller_sync_read(nfc, &keys, data); error = mf_classic_poller_sync_read(nfc, &keys_v1, data);
if(error != MfClassicErrorNone) { if(error != MfClassicErrorNone) {
FURI_LOG_W(TAG, "Failed to read data: standart keys"); FURI_LOG_W(TAG, "Failed to read data: keys_v1");
break; break;
} }
if(!mf_classic_is_card_read(data)) { if(!mf_classic_is_card_read(data)) {
error = mf_classic_poller_sync_read(nfc, &keys_old, data); error = mf_classic_poller_sync_read(nfc, &keys_v2, data);
if(error != MfClassicErrorNone) { if(error != MfClassicErrorNone) {
FURI_LOG_W(TAG, "Failed to read data: old keys"); FURI_LOG_W(TAG, "Failed to read data: keys_v1");
break;
}
}
if(!mf_classic_is_card_read(data)) {
error = mf_classic_poller_sync_read(nfc, &keys_v3, data);
if(error != MfClassicErrorNone) {
FURI_LOG_W(TAG, "Failed to read data: keys_v3");
break; break;
} }
} }
@ -202,18 +253,19 @@ static bool kazan_parse(const NfcDevice* device, FuriString* parsed_data) {
bool parsed = false; bool parsed = false;
do { do {
const uint8_t verification_sector_number = 10;
const uint8_t ticket_sector_number = 8; const uint8_t ticket_sector_number = 8;
const uint8_t balance_sector_number = 9; const uint8_t balance_sector_number = 9;
// Verify keys // Verify keys
MfClassicKeyPair keys = {}; MfClassicKeyPair keys = {};
const MfClassicSectorTrailer* sec_tr = const MfClassicSectorTrailer* sec_tr =
mf_classic_get_sector_trailer_by_sector(data, verification_sector_number); mf_classic_get_sector_trailer_by_sector(data, ticket_sector_number);
keys.a = nfc_util_bytes2num(sec_tr->key_a.data, COUNT_OF(sec_tr->key_a.data)); keys.a = nfc_util_bytes2num(sec_tr->key_a.data, COUNT_OF(sec_tr->key_a.data));
keys.b = nfc_util_bytes2num(sec_tr->key_b.data, COUNT_OF(sec_tr->key_b.data));
if(keys.a != 0xF7A545095C49) { if(((keys.a != kazan_1k_keys_v1[8].a) && (keys.a != kazan_1k_keys_v2[8].a)) ||
((keys.b != kazan_1k_keys_v1[8].b) && (keys.b != kazan_1k_keys_v2[8].b))) {
FURI_LOG_D(TAG, "Parser: Failed to verify key a: %llu", keys.a); FURI_LOG_D(TAG, "Parser: Failed to verify key a: %llu", keys.a);
break; break;
} }