Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-05-16 04:24:45 -07:00
Code Issues Packages Projects Releases Wiki Activity

Format

Browse Source
This commit is contained in:
Willy-JL
2023-12-13 01:33:08 +00:00
parent de2a5d77cf
commit 4c6eb896ed
2 changed files with 45 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
applications/main/nfc/plugins/supported_cards/microel.c
View File

@@ -55,12 +55,15 @@ void generateKeyA(const uint8_t *uid, uint8_t uidSize, uint8_t keyA[]) {
calcolaSommaHex(uid, uidSize, sommaHex); calcolaSommaHex(uid, uidSize, sommaHex);
uint8_t primoCarattere = (sommaHex[0] >> 4) & 0xF; uint8_t primoCarattere = (sommaHex[0] >> 4) & 0xF;
if (primoCarattere == 0x2 || primoCarattere == 0x3 || primoCarattere == 0xA || primoCarattere == 0xB) { if(primoCarattere == 0x2 || primoCarattere == 0x3 || primoCarattere == 0xA ||
primoCarattere == 0xB) {
// XOR WITH 0x40 // XOR WITH 0x40
for(size_t i = 0; i < sizeof(sommaHex); i++) { for(size_t i = 0; i < sizeof(sommaHex); i++) {
keyA[i] = 0x40 ^ sommaHex[i]; keyA[i] = 0x40 ^ sommaHex[i];
} }
} else if (primoCarattere == 0x6 || primoCarattere == 0x7 || primoCarattere == 0xE || primoCarattere == 0xF) { } else if(
primoCarattere == 0x6 || primoCarattere == 0x7 || primoCarattere == 0xE ||
primoCarattere == 0xF) {
// XOR WITH 0xC0 // XOR WITH 0xC0
for(size_t i = 0; i < sizeof(sommaHex); i++) { for(size_t i = 0; i < sizeof(sommaHex); i++) {
keyA[i] = 0xC0 ^ sommaHex[i]; keyA[i] = 0xC0 ^ sommaHex[i];
@@ -197,7 +200,8 @@ static bool microel_parse(const NfcDevice* device, FuriString* parsed_data) {
generateKeyA(uid, UID_LENGTH, keyA); generateKeyA(uid, UID_LENGTH, keyA);
// Verify key // Verify key
MfClassicSectorTrailer* sec_tr = mf_classic_get_sector_trailer_by_sector(data, verify_sector); MfClassicSectorTrailer* sec_tr =
mf_classic_get_sector_trailer_by_sector(data, verify_sector);
uint64_t key = nfc_util_bytes2num(sec_tr->key_a.data, 6); uint64_t key = nfc_util_bytes2num(sec_tr->key_a.data, 6);
uint64_t key_for_check_from_array = nfc_util_bytes2num(keyA, KEY_LENGTH); uint64_t key_for_check_from_array = nfc_util_bytes2num(keyA, KEY_LENGTH);
if(key != key_for_check_from_array) return false; if(key != key_for_check_from_array) return false;
@@ -211,8 +215,13 @@ static bool microel_parse(const NfcDevice* device, FuriString* parsed_data) {
for(size_t i = 0; i < UID_LENGTH; i++) { for(size_t i = 0; i < UID_LENGTH; i++) {
furi_string_cat_printf(parsed_data, " %02X", uid[i]); furi_string_cat_printf(parsed_data, " %02X", uid[i]);
} }
furi_string_cat_printf(parsed_data, "\nCurrent Credit: %d.%02d E \n", balance / 100, balance % 100); furi_string_cat_printf(
furi_string_cat_printf(parsed_data, "Previus Credit: %d.%02d E \n", previus_balance / 100, previus_balance % 100); parsed_data, "\nCurrent Credit: %d.%02d E \n", balance / 100, balance % 100);
furi_string_cat_printf(
parsed_data,
"Previus Credit: %d.%02d E \n",
previus_balance / 100,
previus_balance % 100);
parsed = true; parsed = true;
} while(false); } while(false);
@@ -223,7 +232,8 @@ static bool microel_parse(const NfcDevice* device, FuriString* parsed_data) {
/* Actual implementation of app<>plugin interface */ /* Actual implementation of app<>plugin interface */
static const NfcSupportedCardsPlugin microel_plugin = { static const NfcSupportedCardsPlugin microel_plugin = {
.protocol = NfcProtocolMfClassic, .protocol = NfcProtocolMfClassic,
.verify = NULL, // the verification I need is based on verifying the keys generated via uid and try to authenticate not like on mizip that there is default b0 .verify =
NULL, // the verification I need is based on verifying the keys generated via uid and try to authenticate not like on mizip that there is default b0
.read = microel_read, .read = microel_read,
.parse = microel_parse, .parse = microel_parse,
}; };

3
applications/main/nfc/plugins/supported_cards/mizip.c
View File

@@ -67,7 +67,8 @@ static bool mizip_verify(Nfc* nfc) {
MfClassicError error = MfClassicError error =
mf_classic_poller_sync_auth(nfc, block_num, &key, MfClassicKeyTypeB, &auth_context); mf_classic_poller_sync_auth(nfc, block_num, &key, MfClassicKeyTypeB, &auth_context);
if(error != MfClassicErrorNone) { if(error != MfClassicErrorNone) {
FURI_LOG_D(TAG, "Failed to read block %u: %d, this is not a MiZIP card", block_num, error); FURI_LOG_D(
TAG, "Failed to read block %u: %d, this is not a MiZIP card", block_num, error);
break; break;
} }
FURI_LOG_D(TAG, "Found a MiZIP Card"); FURI_LOG_D(TAG, "Found a MiZIP Card");