Commit Graph

384 Commits

Author SHA1 Message Date
MX
66d31b3a0e Merge branch 'fz-dev' into dev 2022-12-28 21:01:36 +03:00
g3gg0.de
4adba941bf added support for ISO15693 (NfcV) emulation, added support for reading SLIX tags 2022-12-28 18:52:12 +01:00
Astra
d58b9f3fe8 Fix MFC bruteforce progress bar (#2203)
Co-authored-by: あく <alleteam@gmail.com>
2022-12-29 00:09:33 +09:00
nullableVoidPtr
8fecca3575 NFC: bump API version and format FeliCa scene code 2022-12-28 17:24:48 +08:00
nullableVoidPtr
94558df627 Merge branch 'dev' into nfcf 2022-12-28 17:23:43 +08: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
nullableVoidPtr
95f91b529e Merge branch 'dev' into nfcf 2022-12-25 18:03:54 +08: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
nullableVoidPtr
82387bfb01 Merge remote-tracking branch 'origin/dev' into nfcf 2022-12-11 11:46:44 +11:00
nullableVoidPtr
b53690a4d8 Add headers to submenu 2022-12-11 11:11:41 +11: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
nullableVoidPtr
eaf72348a6 Merge branch 'dev' into nfcf 2022-12-10 12:21:54 +11:00
nullableVoidPtr
6c7cd0960c NFC: Add Felica info scenes and properly clear felica_data 2022-12-10 12:15:09 +11:00
MX
1fc67f76a2 Merge branch 'fz-dev' into dev 2022-12-08 08:58:39 +03:00
RogueMaster
9261e3cdcf Merge branch 'ofwdev' into 420 2022-12-07 19:16:33 -05:00
gornekich
c535b8f4ce [FL-3017], [FL-3018] Change NFC emulation screens (#2102)
* nfc: fix emulate uid view
* archive: hide dot files in apps
* nfc: fix other emulation scenes view
2022-12-08 01:47:55 +09:00
nullableVoidPtr
68b3cc233b NFC: add specific FeliCa type read option 2022-12-06 03:02:36 +08:00
nullableVoidPtr
eaa2dea075 NFC: initial support for NFC-F (FeliCa) 2022-12-06 02:31:25 +08:00
RogueMaster
7a5596358a Merge branch 'UNLEASHED' into 420 2022-12-02 17:00:08 -05:00
MX
196fc562d8 Merge branch 'fz-dev' into dev 2022-12-02 23:05:30 +03:00
gornekich
e40376bc63 NFC: fix NTAG203 info scene #2078 2022-12-02 21:41:34 +09:00
MX
eec21b073b Merge branch 'fz-dev' into dev 2022-11-29 16:11:13 +03:00
Никита Тимофеев
b70395eba9 Allow "Detect reader" for unsaved card (#2045)
* Allow "Detect reader" for unsaved card
* Add missed detect reader deed

Co-authored-by: あく <alleteam@gmail.com>
2022-11-29 22:10:02 +09:00
RogueMaster
d0a29e2544 fmt 2022-11-29 01:01:12 -05:00
RogueMaster
aa8e7d93ff Merge branch 'pr/456' into 420 2022-11-29 00:56:39 -05: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
RogueMaster
a486cc898a Merge branch 'ofwdev' into 420 2022-11-28 12:12:22 -05:00
Stephen Kent
a82c3ccc22 NFC: Fix MIFARE DESfire info action to open app menu (#2058)
When examining a MIFARE DESfire card, selecting "More >" currently leads
to the file menu for a single application even if the scanned card
contains multiple applications.

On examining the source code, a MIFARE DESfire application selection
menu is present as `NfcSceneMfDesfireData`. This change updates the
MIFARE DESfire Info "More >" action to open the application selection
menu. That menu may then be used to open the file selection menu for any
application in the read MIFARE DESfire card data.

Tested interactively with
c4cbdcd947/nfc/Desfire.nfc

Co-authored-by: あく <alleteam@gmail.com>
2022-11-29 02:05:24 +09:00
RogueMaster
50cb45cc29 Merge branch 'pr/454' into 420 2022-11-26 22:14:27 -05:00
RogueMaster
68f51411a1 fmt 2022-11-26 02:23:03 -05:00
RogueMaster
41e9c09fba Merge branch 'pr/448' into 420 2022-11-25 21:43:35 -05:00
RogueMaster
a15ee2ea7d Revert "Revert "Merge branch 'pr/446' into 420""
This reverts commit 28cc99ad2d.
2022-11-25 21:41:55 -05:00
g3gg0
c1b5394b0f further mergability updates 2022-11-25 11:42:29 +01:00
RogueMaster
28cc99ad2d Revert "Merge branch 'pr/446' into 420"
This reverts commit 761dc48b3e, reversing
changes made to 91f037c63f.
2022-11-25 03:08:53 -05:00
RogueMaster
761dc48b3e Merge branch 'pr/446' into 420 2022-11-25 01:40:03 -05:00
RogueMaster
23dd7a20b7 Merge pull request #443 from niki-timofe/mf-unsaved-detect-reader
Mf unsaved detect reader
2022-11-25 01:25:52 -05:00