Commit Graph

230 Commits

Author SHA1 Message Date
VerstreuteSeele
89d67705a4 Merge branch '420' of https://github.com/RogueMaster/flipperzero-firmware-wPlugins into dev 2022-12-27 20:22:31 +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
VerstreuteSeele
47706d20e7 Merge branch '420' of https://github.com/RogueMaster/flipperzero-firmware-wPlugins into dev 2022-12-27 11:11:02 +01: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
VerstreuteSeele
005733b8af Merge branch '420' of https://github.com/RogueMaster/flipperzero-firmware-wPlugins into Dev 2022-12-23 00:59:47 +01:00
RogueMaster
e8ffe6d78a FMT changes 2022-12-22 12:19:11 -05:00
VerstreuteSeele
09fa4795dd Merge branch '420' of https://github.com/RogueMaster/flipperzero-firmware-wPlugins into Dev 2022-12-22 02:06:56 +01:00
VerstreuteSeele
4d0a986dfd New Files for everyone 2022-12-21 22:03:12 +01:00
Thomas Roth
7b635af730 NFC dictionary attack performance improvements. 2022-12-21 14:29:59 -05:00
VerstreuteSeele
6d265d164b NFC - Part 2 2022-12-19 21:58:32 +01:00
RogueMaster
cea79f6610 Update mrtd.h 2022-12-19 15:55:36 -05:00
RogueMaster
84c2161a6a Merge branch 'flipperdevices:dev' into 420 2022-12-19 15:50:52 -05:00
MX
842ba616ee Merge branch 'fz-dev' into dev 2022-12-19 23:34:35 +03:00
Astra
fa87216a1e [FL-2970] Untangle NFC_APP_FOLDER from nfc_device (#2124)
* Untangle NFC_APP_FOLDER from nfc_device
* Make the folder an internal part of the nfc device struct
* Move the NFC folder definition to the nfc allocator
* Move the NFC folder definition to the allocator in the nfc magic FAP
* Replace furi_string_printf with furi_string_set for folder allocation and handle the cases when folder has no slashes
* Build and allocation fixes

Co-authored-by: あく <alleteam@gmail.com>
2022-12-20 04:57:48 +09:00
RogueMaster
98494f62d8 Merge pull request #464 from g3gg0/RM420_ISO15693_fix
fix ISO15693 emulation
2022-12-10 17:21:34 -05:00
g3gg0
d116b3fac1 fix emulation by using latest sources
fixed file saving
2022-12-10 22:54:46 +01: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
MX
1fc67f76a2 Merge branch 'fz-dev' into dev 2022-12-08 08:58:39 +03:00
RogueMaster
1e3eb7a429 fmt changes 2022-12-07 23:32:34 -05:00
RogueMaster
9261e3cdcf Merge branch 'ofwdev' into 420 2022-12-07 19:16:33 -05:00
Nikolay Minaylov
2daf39018b [FL-3001] File browser base folder (#2091)
* File browser base folder
* Format sources
* FuriHal: bump api version

Co-authored-by: Aleksandr Kutuzov <alleteam@gmail.com>
2022-12-07 23:17:41 +09:00
gornekich
9a21dae29c [FL-3008], [FL-2734], [FL-2766], [FL-2898] NFC bug fixes (#2098)
* nfc: rework mf classic update
* nfc: rename cache folder to .cache
* nfc: fix ATQA order bytes in nfc files
* file browser: add hide dot files option
* nfc: fix iso-14443-4 uid cards emulation
* nfc: fix unit tests

Co-authored-by: あく <alleteam@gmail.com>
2022-12-07 19:52:44 +09:00
RogueMaster
4414b6451a Merge branch 'pr/462' into 420 2022-12-06 19:38:40 -05:00
gornekich
79140829b3 file browser: add hide dot files option 2022-12-06 15:22:03 +04:00
gornekich
c08f23ef07 nfc: fix ATQA order bytes in nfc files 2022-12-06 14:14:37 +04:00
gornekich
95d02923de nfc: rename cache folder to .cache 2022-12-06 13:16:01 +04:00
gornekich
4cfcdff57c nfc: rework mf classic update 2022-12-05 23:00:12 +04:00
RogueMaster
d0a29e2544 fmt 2022-11-29 01:01:12 -05:00
RogueMaster
557ed1ca8c Update nfcv.c 2022-11-29 00:59:25 -05:00
RogueMaster
aa8e7d93ff Merge branch 'pr/456' into 420 2022-11-29 00:56:39 -05:00
g3gg0
1489e3e676 better layer separation for ISO15693 2022-11-29 02:15:20 +01:00
g3gg0
1b6b4b6522 cleaned up SLIX code
added callbacks for card-specific ISO15693-3 handling
2022-11-29 01:00:41 +01:00
MX
3d36105142 Merge branch 'fz-dev' into dev 2022-11-28 23:12:17 +03:00
RogueMaster
72bd6bc865 Merge branch 'ofwdev' into 420 2022-11-28 13:26:36 -05:00
Yukai Li
6b47bc1af4 Nfc: NTAG password auto capture (and other password-related changes) (#1843)
* nfc: MFUL minor cleanup
* nfc: Add mechanism to pass event data
* nfc: Add NTAG authentication event to emulation
* nfc: Rename enum member to align with existing convention
* nfc: Add function to determine whether MFUL is fully captured
* nfc: Fix emulation of incompletely-read password-protected MFUL
* nfc: Add reader password capture scene
* nfc: Set default MFUL password input to 0xFFFFFFFF
* nfc: Fix MFUL auth counter loading
* nfc: Be explicit about using manual auth method when using auto unlock
* nfc: Fill in MFUL has_auth when loading file
* nfc: Fix MFUL auth success usage, remove unused variable
* nfc: Display PWD and PACK in MFUL info if available
* nfc: Remove unnecessary include
* nfc: Add unlock options to loaded MFUL menu
* nfc: Move set default MFUL password. This way it can be edited if needed instead of reentered
* nfc: Fix unlock menu not maintaining selection index
* nfc: Move captured MFUL auth data from worker to device data
* nfc: Attempt to authenticate with default PWD when possible when reading NTAG
* nfc: Don't try to auth NTAG on read if we already authed
* nfc: Add title for all pages read but failed auth for NTAG auth
* nfc: Add faster auth callback patch
* lib: Remove scons submodule from index
* nfc: Revise MFUL unlock UI flow
* nfc: Disallow MFUL unlock with reader if card not read yet. Trying to read first results in either needing to make a new scene or badly jury rigging other scenes, so let's just not do that
* f7: Bump API symbols
* Format code

Co-authored-by: gornekich <n.gorbadey@gmail.com>
Co-authored-by: あく <alleteam@gmail.com>
2022-11-29 03:16:22 +09:00
Michael Huebler
1b3156521c NFC: Accept non-parsed apps in Mifare DESFire. (#2041)
* NFC: Accept non-parsed apps in Mifare DESFire. Fixes #2040

Co-authored-by: gornekich <n.gorbadey@gmail.com>
Co-authored-by: あく <alleteam@gmail.com>
2022-11-29 02:14:13 +09:00
RogueMaster
ce26d9eae5 Update mifare_ultralight.h 2022-11-26 22:15:53 -05:00
RogueMaster
569a6fe6c3 fmt 2022-11-26 17:11:53 -05:00
RogueMaster
eb5ad7fb49 Update nfcv.c 2022-11-26 17:10:16 -05:00
RogueMaster
16a037fc4e Revert "Revert "Merge branch 'pr/450' into 420""
This reverts commit 076b11e872.
2022-11-26 17:05:26 -05:00
RogueMaster
076b11e872 Revert "Merge branch 'pr/450' into 420"
This reverts commit 17ba83f20e, reversing
changes made to 7484e573d0.
2022-11-26 17:02:32 -05:00
RogueMaster
17ba83f20e Merge branch 'pr/450' into 420 2022-11-26 17:00:36 -05:00
g3gg0
67f8f5a014 added NfcVSendFlags to choose fields to send 2022-11-26 16:54:32 +01:00
g3gg0
4b18370dfa fix SLIX/SLIX2 type indicator bits 2022-11-26 16:31:32 +01:00