Commit Graph

57 Commits

Author SHA1 Message Date
VerstreuteSeele
280b83c32d Add Mifare Mini, fix char type & fix sector reads in edge-cases 2023-01-16 03:09:40 +01:00
VerstreuteSeele
fbd162c4e3 Merge branch 'dev' of https://github.com/flipperdevices/flipperzero-firmware into dev 2023-01-07 02:30:14 +01: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
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
g3gg0
d116b3fac1 fix emulation by using latest sources
fixed file saving
2022-12-10 22:54:46 +01: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
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
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
68f51411a1 fmt 2022-11-26 02:23:03 -05:00
RogueMaster
a15ee2ea7d Revert "Revert "Merge branch 'pr/446' into 420""
This reverts commit 28cc99ad2d.
2022-11-25 21:41:55 -05: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
d1caca1894 Merge pull request #442 from mh-/dev
NFC: Accept non-parsed apps in Mifare DESFire
2022-11-25 01:24:02 -05:00
Michael Huebler
bf54016553 NFC: Accept non-parsed apps in Mifare DESFire.
Fixes #2040
Minor editorial changes
2022-11-24 12:06:27 +01:00
Michael Huebler
fa135c3249 NFC: Accept non-parsed apps in Mifare DESFire.
Fixes #2040
2022-11-22 14:08:45 +01:00
g3gg0
d6903a4a06 some more comments
updated API file
2022-11-17 21:58:17 +01:00
g3gg0
971e0093c4 cleaned up SLIX code
fixed byte order mixup
read larger cards
2022-11-17 21:49:29 +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
MX
930b369812 Merge branch 'fz-dev' into dev 2022-11-10 21:38:03 +03:00
RogueMaster
2ce7b4bdcc Merge branch 'ofwdev' into 420 2022-11-10 11:44:55 -05:00
Astra
820afd2aec NFC Unit tests part 1.1 (#1927)
* Mifare Classic 1/4K, 4/7b uid, NFC-A: NFC-A is not complete yet, as there are no 4b uid tests. Also, Mifare Classic tests don't cover the key cache yet.
* NFC unit tests require access to the NFC app
* Made nfc_device_save accept full path as an argument
* Move from cstrs to furi strings and fix logic
* nfc tests: fix memory leak
* nfc: add mf_classic_get_total_blocks() to API
* nfc tests: simplify nfc tests
* nfc: fix memory leak in shadow file saving
* nfc: fix set uid scene
* nfc: fix saving files
* nfc: fix preload nfc file path
* nfc: remove comments

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-11-11 01:20:35 +09:00
g3gg0
c840e9ad49 added ISO15693 reading, saving and revealing from privacy mode (unlock) 2022-11-09 14:10:05 +01: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
RogueMaster
b7e039c6f3 Merge branch 'UNLEASHED' into 420 2022-10-21 15:22:11 -04:00
MX
12bbe3e68e return saving of emv 2022-10-21 21:58:59 +03:00
Zeus Ricote
a7c897a09f nfc related changes 2022-10-18 05:46:20 +02: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
MX
aa9f958f07 Merge branch 'fz-dev' into dev 2022-10-12 04:37:59 +03:00
gornekich
2552278a3d [FL-2883] NFC: bank card rework reading (#1858)
* nfc: remove bank card save option
* nfc: remove bank card save from nfc device
* nfc: remove unused function in emv
* nfc: try several times to start emv application
* nfc: add AID display fallback for bank cards

Co-authored-by: あく <alleteam@gmail.com>
2022-10-12 02:13:12 +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
60242cd7c4 fix nfc device typo, doesn’t affect resulting keys 2022-09-26 19:46:12 +03:00