Commit Graph

118 Commits

Author SHA1 Message Date
Willy-JL
4c5a37b34e Merge branch 'nfcf' of https://github.com/nullableVoidPtr/flipperzero-firmware into xfw-dev 2023-03-28 22:16:01 +01:00
Willy-JL
7c0875b54c Merge branch 'ISO15693' of https://github.com/g3gg0/flipperzero-firmware into xfw-dev 2023-03-28 21:49:19 +01:00
Willy-JL
6ebbbcc306 Reset NFC stuff 2023-03-28 21:32:00 +01:00
Willy-JL
906f2d324b Merge branch 'ul-dev' into xfw-dev 2023-03-24 18:56:42 +00:00
Astra
5391b694d1 Additional checks before invalidating the key 2023-03-24 21:32:07 +03:00
nullableVoidPtr
c1cb656be3 Merge branch 'dev' into nfcf 2023-03-24 18:55:58 +11:00
Willy-JL
09bc580497 Merge branch 'ul-dev' into xfw-dev 2023-03-17 23:52:05 +00:00
Astra
e90042368f [FL-3156] Mark keys as not found when they couldn't auth successfully (#2476)
* Mark keys as not found when they couldn't auth successfully
* Improve logging and fix the reading bug

Co-authored-by: あく <alleteam@gmail.com>
2023-03-16 17:58:07 +09:00
Willy-JL
f53b962722 Merge branch 'dev' of https://github.com/DarkFlippers/unleashed-firmware into xfw-dev 2023-03-08 22:16:39 +00:00
AloneLiberty
eb5dae1cda NFC: Support reading Mifare Classic key B from sector trailer, reading sector with B key where A key can't read block, Nfc Magic app not using NFC folder by default (in file select) (#2437)
* NFC: Support reading Mifare Classic key B from sector trailer and reusing it for other sectors
* NFC: Fix my pointer typo
* NFC: Fix reading sector with B key where A key can't read block (fixes #2413) and fix Nfc Magic app not using NFC folder by default (in file select)
* NFC: Fix strange bug

Co-authored-by: Aleksandr Kutuzov <alleteam@gmail.com>
2023-03-08 03:33:59 +09:00
Willy-JL
d3f3bf1e11 Merge branch 'dev' of https://github.com/DarkFlippers/unleashed-firmware into xfw-dev 2023-02-24 01:05:31 +00:00
Astra
b15c4afea1 [FL-3122] Re-init NFC when starting the worker (#2399)
* Re-init NFC when starting the worker
* FuriHal: cleanup nfc init/deinit sequence
* FuriHal: a little bit more defensive nfc init

Co-authored-by: あく <alleteam@gmail.com>
2023-02-20 23:44:03 +09:00
g3gg0.de
02e3a30f06 added "Listen NfcV Reader" to sniff traffic from reader to card 2023-01-21 01:04:02 +01:00
VerstreuteSeele
49dabee42f Revert NFC u2f 2023-01-14 09:00:41 +01:00
VerstreuteSeele
905bb23fdf Formatting & New updated IR 2023-01-14 08:44:32 +01:00
jbohack
ea0b5488ad u2f over nfc
https://github.com/flipperdevices/flipperzero-firmware/pull/1755
from @devsnek

may need more testing
2023-01-11 19:15:06 -05:00
g3gg0.de
76afbf2356 ISO15693: reduce latency on state machine reset 2022-12-30 16:17:41 +01:00
g3gg0.de
38c6b52518 Merge branch 'DigitalSequence_PulseReader' into ISO15693 2022-12-30 12:50:36 +01:00
g3gg0.de
5013692288 ISO15693: further cleanup 2022-12-30 02:17:29 +01:00
nullableVoidPtr
d0e3bfd2e5 Merge branch 'dev' into nfcf 2022-12-29 16:15:33 +08:00
Thomas Roth
26e5527a93 Mifare dictionary attack performance improvements. (#2173)
* NFC dictionary attack performance improvements.
* Remove unnecessary assignment
2022-12-29 14:20:01 +09:00
g3gg0.de
4adba941bf added support for ISO15693 (NfcV) emulation, added support for reading SLIX tags 2022-12-28 18:52:12 +01: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
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
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
e8ffe6d78a FMT changes 2022-12-22 12:19:11 -05:00
Thomas Roth
7b635af730 NFC dictionary attack performance improvements. 2022-12-21 14:29:59 -05:00
Mekare
2871759877 use FuriHalNfcADevData instead of using each of its fields in function calls 2022-12-07 22:24:44 +01: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
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
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
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
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
0cb784aadd undo NfcA changes which might have looked better, but brought no reliability improvement 2022-11-25 12:08:36 +01:00
g3gg0
27b99e15a4 further cleanups towards a proper merge
SLIX-L accepts all passwords when password is zero
2022-11-25 11:31:19 +01:00
g3gg0
4b554c5f9e code cleanup for ISO15693
added logging code for ISO15693
2022-11-25 10:31:17 +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
g3gg0
013e88154f implement ISO14433-A fully in software for pointless experimenting reasons and improving the DigitalReader / SignalSequence code in performance 2022-11-25 02:46:49 +01:00
RogueMaster
4a8c814daf Merge branch 'UNLEASHED' into 420 2022-11-23 15:28:31 -05: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
g3gg0
f2457b6ee5 switch to scalable timebase for digital reader to prevent overflows
added yielding to emulation loop
2022-11-19 17:03:55 +01:00