Commit Graph

345 Commits

Author SHA1 Message Date
Willy-JL
2fcc3d1ae2 Format 2023-05-02 14:29:30 +01:00
Willy-JL
74a30f919d Merge branch 'ISO15693' of https://github.com/g3gg0/flipperzero-firmware into dev 2023-05-02 14:28:51 +01:00
Willy-JL
66b1152499 Merge branch 'nfcf' of https://github.com/nullableVoidPtr/flipperzero-firmware into xfw-dev 2023-05-02 14:06:00 +01:00
Willy-JL
58af523332 Merge branch 'ul-dev' into xfw-dev 2023-05-02 04:44:43 +01:00
MX
fe6bf3c7d6 Revert some changes 2023-05-02 02:25:52 +03:00
Tiernan Messmer
48e7c67359 fix debug print warnings 2023-05-01 13:07:33 +10:00
g3gg0.de
1d4ce4e78a scale NfcV frequency a bit, add echo mode, fix signal level at the end 2023-05-01 12:54:08 +10:00
g3gg0.de
af7d21a020 increase sniff log size 2023-05-01 12:54:08 +10:00
g3gg0.de
64badf124a also added DSFID/AFI handling and locking 2023-05-01 12:54:08 +10:00
g3gg0.de
4f4eca1dd7 added "Listen NfcV Reader" to sniff traffic from reader to card 2023-05-01 12:54:05 +10:00
g3gg0.de
f03d31b647 increased maximum memory size to match standard
added security status handling/load/save
added SELECT/QUIET handling
more fine grained allocation routines and checks
fix memset sizes
2023-05-01 12:53:14 +10:00
g3gg0.de
aa7ead724a respond with block security status when option flag is set 2023-05-01 12:53:14 +10:00
g3gg0.de
fecc686a3e further code cleanups 2023-05-01 12:52:51 +10:00
g3gg0.de
a34a186bba ISO15693: reduce latency on state machine reset 2023-05-01 12:52:50 +10:00
g3gg0.de
9f5a10a2e3 ISO15693: further cleanup 2023-05-01 12:52:37 +10:00
g3gg0.de
75d7246657 ISO15693: further optimizations of allocation and free code 2023-05-01 12:52:36 +10:00
g3gg0.de
d52432970b optimize allocation size for signals 2023-05-01 12:52:36 +10:00
g3gg0.de
423c551cf1 SLIX: fixed crash situation when an invalid password was requested 2023-05-01 12:52:35 +10:00
g3gg0.de
6a95f8010f added support for ISO15693 (NfcV) emulation, added support for reading SLIX tags 2023-05-01 12:52:32 +10:00
Willy-JL
bbddb2ac8e Merge branch 'ul-dev' into xfw-dev 2023-04-28 21:43:56 +01:00
MX
3b02dd316d Merge remote-tracking branch 'flipperdevices/astra/3284-mifare-classic-fix-read' into dev 2023-04-27 02:00:15 +03:00
Astra
102dd690b7 Fix emulating empty keys as 0s 2023-04-27 00:28:21 +03:00
Astra
0a32cd2528 I was outplayed by the C programming language 2023-04-27 00:27:57 +03:00
gornekich
7ac7b70884 [FL-3241] NFC disable EMV support (#2571)
* nfc: remove read emv from extra actions
* nfc: remove read emv

Co-authored-by: あく <alleteam@gmail.com>
2023-04-10 23:51:55 +08:00
Anton Chistyakov
4c488bd970 Fixing parsing troika number (#2536)
Co-authored-by: あく <alleteam@gmail.com>
2023-04-05 12:16:20 +08:00
Willy-JL
bba9fc4134 Merge branch 'dev' of https://github.com/DarkFlippers/unleashed-firmware into xfw-dev 2023-04-02 23:59:33 +01:00
MX
dce5bfd723 OFW PR 2536: Fixing parsing troika card number
by @achistyakov

we tested on regular cards, reading is not broken, so this pr should not break anything
2023-04-02 01:11:05 +03:00
nullableVoidPtr
b30ecb61f6 Merge remote-tracking branch 'dogtopus/nfcf' into nfcf 2023-03-29 10:34:29 +11:00
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
c2c9257999 Format 2023-03-28 22:02:15 +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
Astra
ae9659d32d [FL-3193] Additional checks before invalidating the key (#2533) 2023-03-27 16:28:13 +09:00
Willy-JL
b30109dee1 Merge branch 'dev' of https://github.com/DarkFlippers/unleashed-firmware into xfw-dev 2023-03-26 21:03:05 +01:00
MX
22406f8aca MF Classic dict - Fix key delete, now works properly 2023-03-25 07:04:28 +03: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
dogtopus
43341980cc Array use refactor
Move all arrays to allocating actual data rather than pointers to simplify construction and destruction. Also moved to M_EACH for iterating over arrays for less boilerplate code.

Also did some function renaming for extra clarity.

root_area is now a node type for simplified area traversal (coming soon).
2023-03-18 03:08:38 -03:00
Willy-JL
09bc580497 Merge branch 'ul-dev' into xfw-dev 2023-03-17 23:52:05 +00:00
MX
49378f0893 Merge branch 'fz-dev' into dev 2023-03-16 13:49:24 +03: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
MX
2a040f245f Merge branch 'fz-dev' into dev 2023-03-15 21:25:06 +03:00
hedger
d12f76dacb Nfc: fixes for latest PVS-studio 7.23 (#2490) 2023-03-15 21:01:33 +09:00
Willy-JL
39ddf75f91 Merge branch 'ul-dev' into xfw-dev 2023-03-14 01:07:01 +00:00
dogtopus
a2cd122f78 Move FeliCa IDm/PMm display to the new NFC-F info screen
The goal is to gradually split out NfcWorkerEventReadFelica into more specific decoders, and have the generic NFC-F info screen display info for tags that don't have a specific decoder, similar to how NFC-A works currently.
2023-03-09 22:12:32 -04:00
MX
68fed0e03d Merge branch 'fz-dev' into dev 2023-03-09 21:17:57 +03:00
AloneLiberty
0190a161ba NFC: Fix 0 block write possibility in Mifare Classic emulation (#2474)
Co-authored-by: あく <alleteam@gmail.com>
2023-03-10 02:50:25 +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
MX
cad2f2a065 Merge branch 'fz-dev' into dev 2023-03-08 00:46:38 +03:00