Commit Graph

43 Commits

Author SHA1 Message Date
Willy-JL bed4164750 Remove duplicates 2024-12-10 04:18:50 +00:00
Willy-JL 661a467ff7 Merge remote-tracking branch 'ofw/dev' into mntm-dev 2024-12-10 04:07:07 +00:00
Ondřej Nový 7d5358b9d3 Replace mf_classic_dict.nfc with Proxmark3 version (#4013)
Co-authored-by: あく <alleteam@gmail.com>
2024-12-03 15:30:25 +09:00
Willy-JL c9ea421a3c NFC: New MFC keys, 100 from RRG pm3, 17 from MCT --nobuild 2024-11-10 02:56:43 +00:00
Willy-JL 2f6faa1b7b Merge remote-tracking branch 'ul/dev' into mntm-dev 2024-10-16 00:56:19 +01:00
Willy-JL 97d58c500f Merge remote-tracking branch 'ofw/dev' into mntm-dev 2024-10-15 23:49:41 +01:00
MX 7415873449 add new nfc key [ci skip] 2024-10-16 01:30:19 +03:00
MX 7de26fb99b Merge remote-tracking branch 'OFW/dev' into dev 2024-10-16 01:06:19 +03:00
Zinong Li dc9548d0dc New Static Keys for Mifare Classic Dictionary (#3947)
Co-authored-by: あく <alleteam@gmail.com>
2024-10-15 18:17:33 +01:00
Mihai 425a97fe95 NFC: Added 6 new Mifare Classic keys from Bulgaria Hotel (#216)
* Update mf_classic_dict.nfc

Added 6 new keys from Bulgaria Hotel
Keys are not duplicated!

* Add section delimiter

* No LF at EOF

* Update changelog

---------

Co-authored-by: Willy-JL <49810075+Willy-JL@users.noreply.github.com>
2024-09-18 00:24:21 +02:00
Willy-JL c6a3e684b6 Fix MFC dict timestamp 2024-08-24 02:56:50 +02:00
Willy-JL 8f7562718c Cleanup and update MFC dict
+5 from RRG proxmark3 repo
+2 from Mifare Classic Tool repo
+26 from Stepzor11 repo
-2000 of abandoned unverified pm3 bmp_sorted and icbmp_sorted
2024-08-23 00:44:43 +02:00
MX 365159c11a update mf classic keys dict
from
https://github.com/RfidResearchGroup/proxmark3/blob/810f085aae40b414abc56b2c62085f61b9524476/client/dictionaries/mfc_default_keys.dic

and

https://github.com/UberGuidoZ/Flipper/blob/2a623b4ff3bd78af9708e980e59568411879affa/NFC/mf_classic_dict/mf_classic_dict_user.nfc
2024-07-15 04:31:32 +03:00
Willy-JL 826aa4ba3d Update MFC dict, 135 new keys from RRG pm3 repo and UberGuidoZ dump 2024-07-11 22:12:49 +01:00
Astra cf8c82c451 [FL-3746] Mifare Plus detection support (#3607)
* Initial MFPlus draft
* Proper detection (WIP)
* Mifare Plus detection done
* Bump F18 API
* Alloc takes no arguments
* Fixes from code review
* Remove leftover logging
* Remove stray reminder comment
* Review changes and extra logging
* Fix atqa detection
* Fix incorrect comparison
* ATQA byte swap fix
* mf plus: code clean up
* mf plus: remove unused code
* mf plus: fix read fail event handling
* mf plus: fix return error codes
* mf plus: handle load and save errors
* mf plus: assert -> check in public API funxtion
* Bump API Symbols version
* Fix wrong feature mask
* Skylanders plugin separation
* Fix navigation
* Fix info box size

Co-authored-by: gornekich <n.gorbadey@gmail.com>
Co-authored-by: あく <alleteam@gmail.com>
2024-06-10 20:36:46 +01:00
Willy-JL aa3db97e9d Merge branch 'dev' of https://github.com/DarkFlippers/unleashed-firmware into mntm-dev 2024-06-06 02:19:54 +01:00
MX 05457b41e4 Merge remote-tracking branch 'OFW/astra/3746-mfp-detect' into nfc_mfplus 2024-06-06 01:12:34 +03:00
Astra 4357a1e9d2 Skylanders plugin separation 2024-06-05 18:11:57 +09:00
Mr. Proxy 62126152f9 Ight didnt know 2024-03-01 15:03:11 +01:00
Mr. Proxy 3eabdadee9 Fixed link 2024-03-01 14:52:18 +01:00
MX 1a02152d03 Update ndef parser, apply mf classic dict changes
by @Willy-JL

https://github.com/Flipper-XFW/Xtreme-Firmware/blob/dev/applications/main/nfc/plugins/supported_cards/ndef.c
https://github.com/Flipper-XFW/Xtreme-Firmware/blob/dev/applications/main/nfc/resources/nfc/assets/mf_classic_dict.nfc
2024-02-10 14:46:46 +03:00
Willy-JL 134e74dda3 Upd MFC keys: added 41 from RRG pm3 2024-02-08 23:46:10 +00:00
Willy-JL b5c39481d1 Remove MFC dupes and move script 2023-12-30 00:37:47 +01:00
Willy-JL 8872cd8f9d Merge branch 'dev' of https://github.com/DarkFlippers/unleashed-firmware into dev --nobuild 2023-12-30 00:24:26 +01:00
MX e5ceef3422 Merge branch 'ofw_dev' into dev 2023-12-29 16:57:23 +03:00
ry4000 f6a38352e8 Update mf_classic_dict.nfc (#3314)
This Commit proposes the addition of the 33 Bandai Namco Passport / Sega Aime Card static access keys that has been available to Members of the Flipper Devices Discord Server; for convenience, they are listed in Sector Key A/B order.

Sector 0 Key B has two possible access keys;
019761AA8082 [current Bandai Namco Passports]
574343467632 [Sega Aime Cards / early-edition Bandai Namco Passports]

Co-authored-by: あく <alleteam@gmail.com>
2023-12-28 14:12:13 +09:00
Willy-JL b7d265e1a6 Remove wrong length key from pm3 (?) 2023-12-18 02:56:07 +00:00
Willy-JL 24607269fa Fully rework+update MFC dict, 90 new keys 2023-12-18 02:55:57 +00:00
Willy-JL a7d0f7e347 Move standard MFC keys to top
Spotted by Cybergibbons
2023-12-18 00:00:25 +00:00
Willy-JL 5653ae52c3 Merge branch 'dev' of https://github.com/DarkFlippers/unleashed-firmware into dev --nobuild 2023-12-16 01:06:37 +00:00
MX 364b334654 fix dict remove dupes 2023-12-16 02:33:00 +03:00
MX db57ff947b Merge branch 'ofw_dev' into dev 2023-12-16 02:16:46 +03:00
Willy-JL cd3ab082c8 Merge branch 'dev' of https://github.com/flipperdevices/flipperzero-firmware into dev 2023-12-15 01:24:57 +00:00
Leptopt1los 0af74fb755 Umarsh transport cards parser (#3277)
* Umarsh transport card parser added
* Volna transport cards keys added

Co-authored-by: あく <alleteam@gmail.com>
2023-12-14 14:02:40 +00:00
Willy-JL e943533323 Add Mf Classic keys by @icemirr0r #482 --nobuild 2023-12-13 01:49:10 +00:00
Mihai 55f142cf5d Update mf_classic_dict.nfc
Corrected last commit as it was added by CaitSith2 not me (Z3r0L1nk) can't take credit for it :-P
2023-12-09 11:45:52 +02:00
Willy-JL 399f35dc8a Merge branch 'dev' of https://github.com/DarkFlippers/unleashed-firmware into dev --nobuild 2023-12-05 08:53:38 +00:00
CaitSith2 41bfa2979c Update mf_classic_dict.nfc
Add keys for Bubble Land Play Card
2023-12-04 11:01:00 -08:00
Cory Parker 05479103a6 Update mf_classic_dict.nfc
Added in new mf classic keys
2023-11-29 21:41:10 -10:00
Mihai f2f2035bf7 Update mf_classic_dict.nfc
Re-added STB Public transport keys and also new Metrorex Subway keys
2023-11-13 09:08:30 +02:00
Willy-JL 418f44fef1 Merge branch 'dev' of https://github.com/flipperdevices/flipperzero-firmware into xfw-dev 2023-11-12 02:56:30 +00:00
MX bee48f483c Merge branch 'ofw_dev' into nfcrefactoring 2023-11-01 21:07:33 +03:00
hedger 917410a0a8 [FL-3629] fbt: reworked assets & resources handling (#3160)
* fbt: reworking targets & assets handling WIP
* fbt: dist fixes
* fbt: moved SD card resources to owning apps
* unit_tests: moved resources to app folder
* github: updated unit_tests paths
* github: packaging fixes
* unit_tests: fixes
* fbt: assets: internal cleanup
* fbt: reworked assets handling
* github: unit_tests: reintroducing fixes
* minor cleanup
* fbt: naming changes to reflect private nature of scons tools
* fbt: resources: fixed dist archive paths
* docs: updated paths
* docs: updated more paths
* docs: included "resources" parameter in app manifest docs; updated assets readme
* updated gitignore for assets
* github: updated action versions
* unit_tests: restored timeout; scripts: assets: logging changes
* gh: don't upload desktop animations for unit test run

Co-authored-by: あく <alleteam@gmail.com>
2023-10-31 00:17:30 +09:00