Commit Graph

88 Commits

Author SHA1 Message Date
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
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
g3gg0
01137a5b6e added pulse_reader for DMA based NFC signal reading
updated nfcv to use pulse_reader instead of bitbanging
2022-11-19 02:45:33 +01:00
g3gg0
971e0093c4 cleaned up SLIX code
fixed byte order mixup
read larger cards
2022-11-17 21:49:29 +01:00
g3gg0
b4802247df always save file even when tag was not locked 2022-11-17 01:45:22 +01:00
g3gg0
75f5e6604b separate ISO15693 basic and SLIX extensions a bit more
changed save format to reflect this
executing emulation from browser now also works
2022-11-17 01:35:39 +01:00
g3gg0
bcd33ca125 added NfcV emulation 2022-11-14 21:12:18 +01:00
RogueMaster
2ce7b4bdcc Merge branch 'ofwdev' into 420 2022-11-10 11:44:55 -05:00
Astra
e7c4b40dbe Force card types in extra actions (#1961)
* Mifare Classic forced read
* Add all the needed card types
* nfc: remove unused scene
* nfc: remove unused worker state
* nfc: fix read card type scene state usage
* nfc: move NfcReadMode to NfcDevData struct
* nfc: fix bank card reading and scene navigation
* nfc magic: fix magic deactifate function

Co-authored-by: gornekich <n.gorbadey@gmail.com>
Co-authored-by: あく <alleteam@gmail.com>
2022-11-11 01:29:57 +09:00
g3gg0
fe216b4ddd implemented unlock, read, save sequence 2022-11-09 22:59:09 +01:00
RogueMaster
1c23a2e0ea Merge branch 'ofwdev' into 420 2022-11-09 15:49:35 -05:00
g3gg0
fa74fc9541 fix naming ReadAuth->Unlock 2022-11-09 21:19:12 +01:00
gornekich
3985b456c3 NFC: fix crash on MFC read (#1993)
* nfc: fix nfc_worker_stop logic
* nfc: fix stop order

Co-authored-by: あく <alleteam@gmail.com>
2022-11-10 03:12:55 +09:00
g3gg0
c840e9ad49 added ISO15693 reading, saving and revealing from privacy mode (unlock) 2022-11-09 14:10:05 +01:00
RogueMaster
2cc4dadf19 Merge branch 'pr/401' into 420 2022-11-04 13:18:52 -04:00
RogueMaster
3c085436b8 Merge branch 'UNLEASHED' into 420 2022-10-29 12:04:49 -04:00
MX
8e4595e4f7 fix nfc worker merge issues 2022-10-29 17:21:30 +03: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
a629a39017 MRTD Reference MrtdData from MrtdApplication 2022-10-28 11:48:09 +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
c3d7417c25 MRTD show auth failure message 2022-10-25 10:33:36 +02:00
Chris van Marle
fe2b5fa21e MRTD recognize MRTDs properly 2022-10-25 10:05:59 +02:00
RogueMaster
e5c35e6b26 Merge pull request #376 from qistoph/mrtd
MRTD Support NFC-B documents
2022-10-24 02:43:25 -04:00
Chris van Marle
49ab1f99d1 MRTD Support NFC-B documents 2022-10-21 11:23:11 +02:00
RogueMaster
39f8fd50c1 Merge branch 'pr/371' into 420 2022-10-18 02:52:53 -04:00
RogueMaster
4d350eda4e Merge pull request #369 from qistoph/mrtd
Mrtd TEST PR
2022-10-18 02:32:57 -04:00
Zeus Ricote
a7c897a09f nfc related changes 2022-10-18 05:46:20 +02:00
RogueMaster
8e3e72288c Merge branch 'UNLEASHED' into 420 2022-10-13 13:44:38 -04:00
Astra
55f8beef9f [FL-2876] MFC Improvements Part 2/2 (#1868)
* Remove keys incorrectly added by the key cache
* Improve responsiveness while checking for re-used keys and fix skipping keys when card is removed
* Actually check if the card is completely read
* Discard incorrect keys on a lower level
* nfc: clean up

Co-authored-by: gornekich <n.gorbadey@gmail.com>
2022-10-14 01:23:29 +09:00