Skip to content

Commit cc457fa

Browse files
Leptopt1losxMasterX
Leptopt1los
authored and
xMasterX
committed
total cleanup. finally, bitlib
1 parent 6d15c23 commit cc457fa

28 files changed

+149
-1088
lines changed

‎applications/main/lfrfid/scenes/lfrfid_scene_clear_t5577.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#include "../lfrfid_i.h"
2+
#include <bit_lib.h>
23
#include "tools/t5577.h"
34
#define TAG "Clear T5577"
45

@@ -21,8 +22,7 @@ static void lfrfid_clear_t5577_password_and_config_to_EM(LfRfid* app) {
2122
};
2223

2324
// Clear custom password
24-
uint32_t custom_pass = (app->password[0] << 24) | (app->password[1] << 16) |
25-
(app->password[2] << 8) | (app->password[3]);
25+
uint32_t custom_pass = bit_lib_bytes_to_num_be(app->password, 4);
2626
snprintf(curr_buf, sizeof(curr_buf), "Custom password");
2727
view_dispatcher_switch_to_view(app->view_dispatcher, LfRfidViewPopup);
2828

‎applications/main/lfrfid/scenes/lfrfid_scene_enter_password.c

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#include "../lfrfid_i.h"
2+
#include "bit_lib.h"
23
#include "gui/scene_manager.h"
34

45
int next_scene;
@@ -16,7 +17,7 @@ void lfrfid_scene_enter_password_on_enter(void* context) {
1617
const uint32_t* password_list = lfrfid_get_t5577_default_passwords(&password_list_size);
1718
uint32_t pass = password_list[furi_get_tick() % password_list_size];
1819

19-
for(uint8_t i = 0; i < 4; i++) app->password[4 - (i + 1)] = (pass >> (8 * i)) & 0xFF;
20+
bit_lib_num_to_bytes_be(pass, 4, app->password);
2021
}
2122

2223
byte_input_set_header_text(byte_input, "Enter the password in hex");

‎applications/main/nfc/plugins/supported_cards/aime.c

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
#include "nfc_supported_card_plugin.h"
2+
#include <flipper_application.h>
23

3-
#include <flipper_application/flipper_application.h>
4-
5-
#include <nfc/nfc_device.h>
6-
#include <bit_lib/bit_lib.h>
74
#include <nfc/protocols/mf_classic/mf_classic_poller_sync.h>
85

6+
#include <bit_lib.h>
7+
98
#define TAG "Aime"
109

1110
static const uint64_t aime_key = 0x574343467632;

‎applications/main/nfc/plugins/supported_cards/all_in_one.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#include "nfc_supported_card_plugin.h"
2+
#include <flipper_application.h>
23

3-
#include <flipper_application/flipper_application.h>
44
#include <nfc/protocols/mf_ultralight/mf_ultralight.h>
55

66
#define TAG "AllInOne"

‎applications/main/nfc/plugins/supported_cards/clipper.c

+3-2
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,11 @@
1919
* along with this program. If not, see <http://www.gnu.org/licenses/>.
2020
*/
2121
#include "nfc_supported_card_plugin.h"
22+
#include <flipper_application.h>
2223

23-
#include <flipper_application/flipper_application.h>
2424
#include <lib/nfc/protocols/mf_desfire/mf_desfire.h>
25-
#include <bit_lib/bit_lib.h>
25+
26+
#include <bit_lib.h>
2627
#include <applications/services/locale/locale.h>
2728
#include <furi_hal_rtc.h>
2829
#include <inttypes.h>

‎applications/main/nfc/plugins/supported_cards/emv.c

+4-7
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,14 @@
1616
* You should have received a copy of the GNU General Public License
1717
* along with this program. If not, see <http://www.gnu.org/licenses/>.
1818
*/
19-
#include "core/string.h"
20-
#include "furi_hal_rtc.h"
21-
#include "helpers/nfc_emv_parser.h"
19+
2220
#include "nfc_supported_card_plugin.h"
21+
#include <flipper_application.h>
2322

2423
#include "protocols/emv/emv.h"
25-
#include "protocols/nfc_protocol.h"
26-
#include <flipper_application/flipper_application.h>
24+
#include "helpers/nfc_emv_parser.h"
2725

28-
#include <nfc/nfc_device.h>
29-
#include <nfc/helpers/nfc_util.h>
26+
#include <furi_hal_rtc.h>
3027

3128
#define TAG "EMV"
3229

‎applications/main/nfc/plugins/supported_cards/gallagher.c

+3-4
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,11 @@
55
*/
66

77
#include "nfc_supported_card_plugin.h"
8+
#include <flipper_application.h>
9+
810
#include "../../api/gallagher/gallagher_util.h"
911

10-
#include <flipper_application/flipper_application.h>
11-
#include <nfc/protocols/mf_classic/mf_classic.h>
12-
#include <nfc/protocols/mf_classic/mf_classic_poller_sync.h>
13-
#include <bit_lib/bit_lib.h>
12+
#include <bit_lib.h>
1413

1514
static bool gallagher_parse(const NfcDevice* device, FuriString* parsed_data) {
1615
furi_assert(device);

‎applications/main/nfc/plugins/supported_cards/hi.c

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
#include "nfc_supported_card_plugin.h"
2-
#include <flipper_application/flipper_application.h>
3-
#include <nfc/nfc_device.h>
4-
#include <bit_lib/bit_lib.h>
2+
#include <flipper_application.h>
3+
54
#include <nfc/protocols/mf_classic/mf_classic_poller_sync.h>
65

6+
#include <bit_lib.h>
7+
78
#define TAG "HI!"
89
#define KEY_LENGTH 6
910
#define HI_KEY_TO_GEN 5

‎applications/main/nfc/plugins/supported_cards/hid.c

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
#include "nfc_supported_card_plugin.h"
2+
#include <flipper_application.h>
23

3-
#include <flipper_application/flipper_application.h>
4-
5-
#include <nfc/nfc_device.h>
6-
#include <bit_lib/bit_lib.h>
74
#include <nfc/protocols/mf_classic/mf_classic_poller_sync.h>
85

6+
#include <bit_lib.h>
7+
98
#define TAG "HID"
109

1110
static const uint64_t hid_key = 0x484944204953;

‎applications/main/nfc/plugins/supported_cards/itso.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* itso.c - Parser for ITSO cards (United Kingdom). */
22
#include "nfc_supported_card_plugin.h"
3+
#include <flipper_application.h>
34

4-
#include <flipper_application/flipper_application.h>
55
#include <lib/nfc/protocols/mf_desfire/mf_desfire.h>
66

77
#include <applications/services/locale/locale.h>

‎applications/main/nfc/plugins/supported_cards/kazan.c

+20-17
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,11 @@
1717
* along with this program. If not, see <http://www.gnu.org/licenses/>.
1818
*/
1919
#include "nfc_supported_card_plugin.h"
20+
#include <flipper_application.h>
2021

21-
#include "protocols/mf_classic/mf_classic.h"
22-
#include <flipper_application/flipper_application.h>
23-
24-
#include <nfc/nfc_device.h>
25-
#include <nfc/helpers/nfc_util.h>
2622
#include <nfc/protocols/mf_classic/mf_classic_poller_sync.h>
2723

24+
#include <bit_lib.h>
2825
#include <furi_hal_rtc.h>
2926

3027
#define TAG "Kazan"
@@ -134,7 +131,7 @@ static bool kazan_verify(Nfc* nfc) {
134131
FURI_LOG_D(TAG, "Verifying sector %u", verification_sector_number);
135132

136133
MfClassicKey key_1 = {0};
137-
nfc_util_num2bytes(
134+
bit_lib_num_to_bytes_be(
138135
kazan_1k_keys_v1[verification_sector_number].a, COUNT_OF(key_1.data), key_1.data);
139136

140137
MfClassicAuthContext auth_context;
@@ -145,7 +142,7 @@ static bool kazan_verify(Nfc* nfc) {
145142
TAG, "Failed to read block %u: %d. Keys: v1", verification_block_number, error);
146143

147144
MfClassicKey key_2 = {0};
148-
nfc_util_num2bytes(
145+
bit_lib_num_to_bytes_be(
149146
kazan_1k_keys_v2[verification_sector_number].a, COUNT_OF(key_2.data), key_2.data);
150147

151148
MfClassicAuthContext auth_context;
@@ -196,17 +193,23 @@ static bool kazan_read(Nfc* nfc, NfcDevice* device) {
196193
};
197194

198195
for(size_t i = 0; i < mf_classic_get_total_sectors_num(data->type); i++) {
199-
nfc_util_num2bytes(kazan_1k_keys_v1[i].a, sizeof(MfClassicKey), keys_v1.key_a[i].data);
200-
nfc_util_num2bytes(kazan_1k_keys_v2[i].a, sizeof(MfClassicKey), keys_v2.key_a[i].data);
201-
nfc_util_num2bytes(kazan_1k_keys_v3[i].a, sizeof(MfClassicKey), keys_v3.key_a[i].data);
196+
bit_lib_num_to_bytes_be(
197+
kazan_1k_keys_v1[i].a, sizeof(MfClassicKey), keys_v1.key_a[i].data);
198+
bit_lib_num_to_bytes_be(
199+
kazan_1k_keys_v2[i].a, sizeof(MfClassicKey), keys_v2.key_a[i].data);
200+
bit_lib_num_to_bytes_be(
201+
kazan_1k_keys_v3[i].a, sizeof(MfClassicKey), keys_v3.key_a[i].data);
202202

203203
FURI_BIT_SET(keys_v1.key_a_mask, i);
204204
FURI_BIT_SET(keys_v2.key_a_mask, i);
205205
FURI_BIT_SET(keys_v3.key_a_mask, i);
206206

207-
nfc_util_num2bytes(kazan_1k_keys_v1[i].b, sizeof(MfClassicKey), keys_v1.key_b[i].data);
208-
nfc_util_num2bytes(kazan_1k_keys_v2[i].b, sizeof(MfClassicKey), keys_v2.key_b[i].data);
209-
nfc_util_num2bytes(kazan_1k_keys_v3[i].b, sizeof(MfClassicKey), keys_v3.key_b[i].data);
207+
bit_lib_num_to_bytes_be(
208+
kazan_1k_keys_v1[i].b, sizeof(MfClassicKey), keys_v1.key_b[i].data);
209+
bit_lib_num_to_bytes_be(
210+
kazan_1k_keys_v2[i].b, sizeof(MfClassicKey), keys_v2.key_b[i].data);
211+
bit_lib_num_to_bytes_be(
212+
kazan_1k_keys_v3[i].b, sizeof(MfClassicKey), keys_v3.key_b[i].data);
210213

211214
FURI_BIT_SET(keys_v1.key_b_mask, i);
212215
FURI_BIT_SET(keys_v2.key_b_mask, i);
@@ -261,8 +264,8 @@ static bool kazan_parse(const NfcDevice* device, FuriString* parsed_data) {
261264
const MfClassicSectorTrailer* sec_tr =
262265
mf_classic_get_sector_trailer_by_sector(data, ticket_sector_number);
263266

264-
keys.a = nfc_util_bytes2num(sec_tr->key_a.data, COUNT_OF(sec_tr->key_a.data));
265-
keys.b = nfc_util_bytes2num(sec_tr->key_b.data, COUNT_OF(sec_tr->key_b.data));
267+
keys.a = bit_lib_bytes_to_num_be(sec_tr->key_a.data, COUNT_OF(sec_tr->key_a.data));
268+
keys.b = bit_lib_bytes_to_num_be(sec_tr->key_b.data, COUNT_OF(sec_tr->key_b.data));
266269

267270
if(((keys.a != kazan_1k_keys_v1[8].a) && (keys.a != kazan_1k_keys_v2[8].a)) ||
268271
((keys.b != kazan_1k_keys_v1[8].b) && (keys.b != kazan_1k_keys_v2[8].b))) {
@@ -305,11 +308,11 @@ static bool kazan_parse(const NfcDevice* device, FuriString* parsed_data) {
305308
start_block_num = mf_classic_get_first_block_num_of_sector(balance_sector_number);
306309
block_start_ptr = &data->block[start_block_num].data[0];
307310

308-
const uint32_t trip_counter = nfc_util_bytes2num_little_endian(block_start_ptr, 4);
311+
const uint32_t trip_counter = bit_lib_bytes_to_num_le(block_start_ptr, 4);
309312

310313
size_t uid_len = 0;
311314
const uint8_t* uid = mf_classic_get_uid(data, &uid_len);
312-
const uint32_t card_number = nfc_util_bytes2num_little_endian(uid, 4);
315+
const uint32_t card_number = bit_lib_bytes_to_num_le(uid, 4);
313316

314317
furi_string_cat_printf(
315318
parsed_data, "\e#Kazan transport card\nCard number: %lu\n", card_number);

‎applications/main/nfc/plugins/supported_cards/metromoney.c

+12-11
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,12 @@
1717
* along with this program. If not, see <http://www.gnu.org/licenses/>.
1818
*/
1919
#include "nfc_supported_card_plugin.h"
20+
#include <flipper_application.h>
2021

21-
#include "protocols/mf_classic/mf_classic.h"
22-
#include <flipper_application/flipper_application.h>
23-
24-
#include <nfc/nfc_device.h>
25-
#include <nfc/helpers/nfc_util.h>
2622
#include <nfc/protocols/mf_classic/mf_classic_poller_sync.h>
2723

24+
#include <bit_lib.h>
25+
2826
#define TAG "Metromoney"
2927

3028
typedef struct {
@@ -61,7 +59,7 @@ static bool metromoney_verify(Nfc* nfc) {
6159
FURI_LOG_D(TAG, "Verifying sector %u", ticket_sector_number);
6260

6361
MfClassicKey key = {0};
64-
nfc_util_num2bytes(
62+
bit_lib_num_to_bytes_be(
6563
metromoney_1k_keys[ticket_sector_number].a, COUNT_OF(key.data), key.data);
6664

6765
MfClassicAuthContext auth_context;
@@ -100,9 +98,11 @@ static bool metromoney_read(Nfc* nfc, NfcDevice* device) {
10098
.key_b_mask = 0,
10199
};
102100
for(size_t i = 0; i < mf_classic_get_total_sectors_num(data->type); i++) {
103-
nfc_util_num2bytes(metromoney_1k_keys[i].a, sizeof(MfClassicKey), keys.key_a[i].data);
101+
bit_lib_num_to_bytes_be(
102+
metromoney_1k_keys[i].a, sizeof(MfClassicKey), keys.key_a[i].data);
104103
FURI_BIT_SET(keys.key_a_mask, i);
105-
nfc_util_num2bytes(metromoney_1k_keys[i].b, sizeof(MfClassicKey), keys.key_b[i].data);
104+
bit_lib_num_to_bytes_be(
105+
metromoney_1k_keys[i].b, sizeof(MfClassicKey), keys.key_b[i].data);
106106
FURI_BIT_SET(keys.key_b_mask, i);
107107
}
108108

@@ -137,7 +137,8 @@ static bool metromoney_parse(const NfcDevice* device, FuriString* parsed_data) {
137137
const MfClassicSectorTrailer* sec_tr =
138138
mf_classic_get_sector_trailer_by_sector(data, ticket_sector_number);
139139

140-
const uint64_t key = nfc_util_bytes2num(sec_tr->key_a.data, COUNT_OF(sec_tr->key_a.data));
140+
const uint64_t key =
141+
bit_lib_bytes_to_num_be(sec_tr->key_a.data, COUNT_OF(sec_tr->key_a.data));
141142
if(key != metromoney_1k_keys[ticket_sector_number].a) break;
142143

143144
// Parse data
@@ -147,14 +148,14 @@ static bool metromoney_parse(const NfcDevice* device, FuriString* parsed_data) {
147148
const uint8_t* block_start_ptr =
148149
&data->block[start_block_num + ticket_block_number].data[0];
149150

150-
uint32_t balance = nfc_util_bytes2num_little_endian(block_start_ptr, 4) - 100;
151+
uint32_t balance = bit_lib_bytes_to_num_le(block_start_ptr, 4) - 100;
151152

152153
uint32_t balance_lari = balance / 100;
153154
uint8_t balance_tetri = balance % 100;
154155

155156
size_t uid_len = 0;
156157
const uint8_t* uid = mf_classic_get_uid(data, &uid_len);
157-
uint32_t card_number = nfc_util_bytes2num_little_endian(uid, 4);
158+
uint32_t card_number = bit_lib_bytes_to_num_le(uid, 4);
158159

159160
furi_string_printf(
160161
parsed_data,

‎applications/main/nfc/plugins/supported_cards/microel.c

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
#include "nfc_supported_card_plugin.h"
2-
#include <flipper_application/flipper_application.h>
3-
#include <nfc/nfc_device.h>
4-
#include <bit_lib/bit_lib.h>
2+
#include <flipper_application.h>
3+
54
#include <nfc/protocols/mf_classic/mf_classic_poller_sync.h>
65

6+
#include <bit_lib.h>
7+
78
#define TAG "Microel"
89
#define KEY_LENGTH 6
910
#define UID_LENGTH 4

‎applications/main/nfc/plugins/supported_cards/mizip.c

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
#include "nfc_supported_card_plugin.h"
2-
#include <flipper_application/flipper_application.h>
3-
#include <nfc/nfc_device.h>
4-
#include <bit_lib/bit_lib.h>
2+
#include <flipper_application.h>
3+
54
#include <nfc/protocols/mf_classic/mf_classic_poller_sync.h>
65

6+
#include <bit_lib.h>
7+
78
#define TAG "MiZIP"
89
#define KEY_LENGTH 6
910
#define MIZIP_KEY_TO_GEN 5

‎applications/main/nfc/plugins/supported_cards/mykey.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#include "nfc_supported_card_plugin.h"
2+
#include <flipper_application.h>
23

3-
#include <flipper_application/flipper_application.h>
44
#include <machine/endian.h>
55
#include <nfc/protocols/st25tb/st25tb.h>
66

‎applications/main/nfc/plugins/supported_cards/myki.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
* Reference: https://github.com/metrodroid/metrodroid/wiki/Myki
66
*/
77
#include "nfc_supported_card_plugin.h"
8+
#include <flipper_application.h>
89

9-
#include <flipper_application/flipper_application.h>
1010
#include <lib/nfc/protocols/mf_desfire/mf_desfire.h>
1111

1212
static const MfDesfireApplicationId myki_app_id = {.data = {0x00, 0x11, 0xf2}};

0 commit comments

Comments
 (0)