Commit Graph

56 Commits

Author SHA1 Message Date
VerstreuteSeele
cb2d92ec6c Merge branch 'dev' of https://github.com/flipperdevices/flipperzero-firmware into dev 2023-02-03 11:35:09 +01:00
AloneLiberty
46fb86265c NFC: fix creating MF Classic tags from "Add Manually" menu (BCC calulation and ATQA/SAK writing) (#2342)
* NFC: fix creating MF Classic cards from "Add Manually" menu (BCC calculation and AQTA/SAK writing)
* NFC: Fix BCC/SAK/ATQA in unit_tests and SAK in nfc_generate_mf_classic

Co-authored-by: gornekich <n.gorbadey@gmail.com>
2023-02-02 22:18:39 +07:00
Giacomo Ferretti
eee5c35400 NFC: add MIFARE MINI support (#2307)
* NFC: add MIFARE MINI support
* Move new value to end of enum
* nfc: added missing unit test

Co-authored-by: gornekich <n.gorbadey@gmail.com>
Co-authored-by: あく <alleteam@gmail.com>
2023-01-27 12:51:47 +07:00
VerstreuteSeele
0f6068837b Merge branch 'dev' of https://github.com/flipperdevices/flipperzero-firmware into dev 2023-01-26 20:31:49 +01:00
Krzysztof Haładyn (krzys_h)
5134f44c09 nfc: Fix crash when using debug PCAP trace (#2338) 2023-01-26 15:28:36 +07:00
VerstreuteSeele
280b83c32d Add Mifare Mini, fix char type & fix sector reads in edge-cases 2023-01-16 03:09:40 +01:00
RogueMaster
ed74859225 Merge branch 'UNLEASHED' into 420 2022-12-27 09:31:33 -05:00
MX
473f9c0e44 Merge branch 'fz-dev' into dev 2022-12-27 16:06:27 +03:00
Astra
ded7e727d0 [FL-3060] New MFC Bruteforce animation (#2190)
* Change the wording in the headers
* Add support for text in the progress bar
* New MFC key bruteforce screen
* Typo fix
* nfc: rename Flipper Dict to System Dict
* elements: fix types
* Display the correct key attack sector

Co-authored-by: gornekich <n.gorbadey@gmail.com>
Co-authored-by: Aleksandr Kutuzov <alleteam@gmail.com>
2022-12-27 18:14:03 +09:00
RogueMaster
c361305a10 Merge branch 'UNLEASHED' into 420 2022-12-26 16:14:07 -05:00
MX
6d368c3e3a Merge branch 'fz-dev' into dev 2022-12-26 22:42:21 +03:00
Georgii Surkov
8582670a34 [FL-2811] Fix PVS-Studio warnings (#2142)
Co-authored-by: あく <alleteam@gmail.com>
Co-authored-by: gornekich <n.gorbadey@gmail.com>
2022-12-26 21:13:30 +09:00
RogueMaster
5adfd734e3 Merge branch 'UNLEASHED' into 420 2022-12-10 16:18:41 -05:00
MX
35a4eef3fc Merge branch 'fz-dev' into dev 2022-12-10 19:30:20 +03:00
Astra
7fb1af07b8 [FL- 3014] Untangle NFC from Unit Tests (#2106)
* Untangle NFC from Unit Tests
* nfc tests: add log error

Co-authored-by: Sergey Gavrilov <who.just.the.doctor@gmail.com>
Co-authored-by: gornekich <n.gorbadey@gmail.com>
Co-authored-by: あく <alleteam@gmail.com>
2022-12-10 22:02:34 +09:00
RogueMaster
4a8c814daf Merge branch 'UNLEASHED' into 420 2022-11-23 15:28:31 -05:00
MX
7829428455 Merge branch 'fz-dev' into dev 2022-11-23 19:21:50 +03:00
Sergey Gavrilov
c511c67e71 Core: thread allocation shortcut (#2007)
* Core: thread alloc+set shortcut
* Apps: use thread allocation shortcut
* Mark some service threads as services
* Init BT as soon as possible

Co-authored-by: あく <alleteam@gmail.com>
2022-11-23 21:49:17 +09:00
RogueMaster
4b9f353c78 fmt 2022-11-12 08:37:29 -05:00
RogueMaster
17db1286a8 fix issue? 2022-11-04 13:37:07 -04:00
RogueMaster
2cc4dadf19 Merge branch 'pr/401' into 420 2022-11-04 13:18:52 -04:00
RogueMaster
5c219ee7e9 fmt 2022-10-28 23:06:17 -04:00
RogueMaster
f18e7725b4 Merge branch 'UNLEASHED' into 420 2022-10-28 13:09:03 -04:00
MX
4da3f9cf15 Merge branch 'fz-dev' into dev 2022-10-28 19:43:22 +03:00
gornekich
93a6e17ce5 [FL-2933] Mf Classic initial write, update, detect reader (#1941)
* nfc: introduce nfc write
* nfc: add write logic
* nfc worker: add write state
* nfc: add mfc update logic
* nfc: add update success logic
* nfc: add custom card for detect reader
* nfc: update write logic
* nfc: add halt command, add notifications
* nfc: add write fail scene
* nfc: fixes and clean up
* nfc: fix navigation ad notifications
* nfc: fix detect reader nfc data setter

Co-authored-by: あく <alleteam@gmail.com>
2022-10-29 01:10:16 +09:00
Chris van Marle
bd5b0da361 MRTD Move MrtdData to helper .h 2022-10-28 11:30:14 +02:00
Chris van Marle
ab3c74bbf0 Merge remote-tracking branch 'upstream/dev' into mrtd 2022-10-27 15:54:40 +02:00
Chris van Marle
7778904a39 MRTD move mrtd_helpers to nfc/helpers/ 2022-10-27 15:33:11 +02:00
RogueMaster
4d350eda4e Merge pull request #369 from qistoph/mrtd
Mrtd TEST PR
2022-10-18 02:32:57 -04:00
MX
4f7ca617cc Merge branch 'fz-dev' into dev 2022-10-17 21:20:28 +03:00
gornekich
dfbe21e720 NFC fixes part 3 (#1885)
* nfc: fix read next key
* nfc: verify new line ending in user dictionary file
* nfc: fix cache save
* nfc: add unit test for dict load
* nfc: fix total key count in dictionary

Co-authored-by: あく <alleteam@gmail.com>
2022-10-18 02:10:41 +09:00
Chris van Marle
5d0025dae3 Merge remote-tracking branch 'upstream/dev' into mrtd 2022-10-11 22:14:40 +02:00
Chris van Marle
00d674f222 Fix indention 2022-10-11 22:13:33 +02:00
Chris van Marle
69ff30e86a MRTD TLV parsing (and select) 2022-10-11 22:13:32 +02:00
Chris van Marle
59efc2701d Merge branch 'dev' into mrtd 2022-10-11 22:13:13 +02:00
Chris van Marle
b412843566 MRTD BAC support and some other improvements 2022-10-11 22:13:10 +02:00
Chris van Marle
66a507ba53 Add ISO7816 tester 2022-10-11 22:13:08 +02:00
MX
184b467f62 add nfc feature back, bug seems to be fixed 2022-10-08 00:03:06 +03:00
MX
bdd052937b Merge branch 'fz-dev' into dev 2022-10-07 17:24:20 +03:00
Sergey Gavrilov
4000f0cac5 [FL-2870] Printf function attributes (#1841)
* Furi strings: printf attribute
* Logs: printf attribute
* Plugins: adapt
* Plugins: accommodate
* Unit tests: accommodate

Co-authored-by: あく <alleteam@gmail.com>
2022-10-07 22:35:15 +09:00
Sergey Gavrilov
38a82a1907 [FL-2839] Furi stream buffer (#1834)
* Core: stream buffer
* stream buffer: API and usage
* stream buffer: documentation
* stream buffer: more documentation
* Furi: fix spelling

Co-authored-by: Aleksandr Kutuzov <alleteam@gmail.com>
2022-10-07 21:27:11 +09:00
MX
515e6db69c Merge branch 'fz-dev' into dev 2022-10-07 00:35:01 +03:00
Astra
6dde5586af [FL-2803] Mifare Classic read improvements Part 1 (#1822)
* Reuse found keys when reading a card
* Fix keys not being read if no newline at the end of the file
* Actually read all keys from the dictionary
* Support for furi_string
* Check only for re-used key after the current sector
* Declare the key attack function as static
* nfc: change logs, check worker state

Co-authored-by: gornekich <n.gorbadey@gmail.com>
Co-authored-by: あく <alleteam@gmail.com>
2022-10-07 02:07:56 +09:00
gornekich
5de2c32c81 [FL-2864] NFC update detect reader (#1820)
* nfc: update detect reader view
* nfc: make detect reader more interractive
* nfc: update icons
* nfc: fix detect reader gui
* nfc: fix gui, fix worker events
* nfc: fix notifications
* nfc: add nfc_worker NULL assert

Co-authored-by: あく <alleteam@gmail.com>
2022-10-07 01:58:17 +09:00
MX
c60bfbf271 oh no 2022-10-05 21:27:13 +03:00
MX
0796263e81 Merge branch 'fz-dev' into dev 2022-10-05 19:27:46 +03:00
Sergey Gavrilov
4bf29827f8 M*LIB: non-inlined strings, FuriString primitive (#1795)
* Quicksave 1
* Header stage complete
* Source stage complete
* Lint & merge fixes
* Includes
* Documentation step 1
* FBT: output free size considering BT STACK
* Documentation step 2
* py lint
* Fix music player plugin
* unit test stage 1: string allocator, mem, getters, setters, appends, compare, search.
* unit test: string equality
* unit test: string replace
* unit test: string start_with, end_with
* unit test: string trim
* unit test: utf-8
* Rename
* Revert fw_size changes
* Simplify CLI backspace handling
* Simplify CLI character insert
* Merge fixes
* Furi: correct filenaming and spelling
* Bt: remove furi string include

Co-authored-by: Aleksandr Kutuzov <alleteam@gmail.com>
2022-10-06 00:15:23 +09:00
MX
4141483147 NFC update detect reader
OFW PR 1820 by gornekich
2022-10-04 18:23:11 +03:00
MX
e8bb45496d Merge branch 'fz-dev' into dev 2022-09-22 21:45:26 +03:00
Andrea Sacchi
3846852f2b NFC Fix Mifare Classic (#1769)
* Fix Mifare Classic key str to int conversion: Wrong cast lead to unexpected behavior converting key from str to int.
* Nfc: fix type cast in mf_classic_dict and add basic unit tests

Co-authored-by: Aleksandr Kutuzov <alleteam@gmail.com>
2022-09-23 02:35:28 +09:00