Commit Graph

414 Commits

Author SHA1 Message Date
Willy-JL 4eaad9fd56 Merge branch 'dev' of https://github.com/DarkFlippers/unleashed-firmware into dev --nobuild 2023-12-08 13:32:25 +00:00
Willy-JL fe3f0c08e2 Merge branch 'dev' of https://github.com/flipperdevices/flipperzero-firmware into dev 2023-12-08 13:29:47 +00:00
Methodius 2e7bb26eef Merge branch 'dev' into nfc-parsers 2023-12-07 22:22:29 +09:00
Methodius 5d28939c28 social_moscow parser verification collisions fix 2023-12-07 21:59:27 +09:00
MX 15a29e1483 format 2023-12-07 08:21:32 +03:00
MX c22b3b57bd Merge branch 'nfc-parsers' into dev 2023-12-07 08:03:43 +03:00
MX 1daa2fa377 Merge branch 'ofw_dev' into dev 2023-12-07 08:03:18 +03:00
Methodius 1b45b8a17d Kazan parser: adult social tariff added 2023-12-06 18:25:47 +09:00
Methodius e94beff204 Kazan parser: basic tariffs parsing added 2023-12-06 18:08:20 +09:00
gornekich 82baf1e923 [FL-3701] NFC fixes (#3264)
* nfc app: fix unlock with manual password crash
* nfc app: preserve card detected state
* nfc app: fix mf keys scene switch
* nfc app: fix multiple protocol tag detect notification
* nfc plugin: fix retrun in function body in aime parser
* iso14443-3b poller: rework ATTRIB response check
* nfc app: fix navigation after file load failur
* iso14443-3b poller: fix PVS warning
* mfc listener: add crutch in mfc emulation
2023-12-05 22:40:06 +09: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
MMX 2308a54ada Merge pull request #662 from noproto/dev
Add Saflok and MyKey KDFs
2023-12-05 03:33:37 +03:00
MMX 0ed6738a5b Merge pull request #660 from hnlcory/dev
Add keys to mf_classic_dict.nfc
2023-12-05 03:33:03 +03:00
noproto dc25bfb831 Add Saflok and MyKey KDFs 2023-12-04 16:03:32 -05:00
CaitSith2 41bfa2979c Update mf_classic_dict.nfc
Add keys for Bubble Land Play Card
2023-12-04 11:01:00 -08:00
Willy-JL 1726ad4b94 Merge branch 'dev' of https://github.com/DarkFlippers/unleashed-firmware into dev 2023-12-04 17:48:40 +00:00
Willy-JL 4c401cacc4 Format 2023-12-04 17:34:09 +00:00
Willy-JL 26f9476ce3 Revert "Added mykey (#467)"
This reverts commit 3ae1eee4c8, reversing
changes made to 4f8e80b0a4.
2023-12-04 17:30:47 +00:00
noproto c3e52ad4bd Add Saflok and MyKey KDFs 2023-12-04 12:07:58 -05:00
MX d6fcb04aa8 Merge branch 'ofw_dev' into dev 2023-12-03 18:42:11 +03:00
Honghao Zeng c477d1321a nfc: m1k-based Aime (non-AIC) card support (#3241)
Co-authored-by: gornekich <n.gorbadey@gmail.com>
2023-12-03 20:00:46 +09:00
MX 06a58ebd53 Merge branch 'ofw_dev' into dev [ci skip] 2023-12-02 23:19:43 +03:00
Willy-JL 4bb0984b46 Merge branch 'dev' of https://github.com/DarkFlippers/unleashed-firmware into dev 2023-12-02 06:10:19 +00:00
Willy-JL 05ae0dbf14 Merge branch 'dev' of https://github.com/flipperdevices/flipperzero-firmware into dev 2023-12-02 06:09:01 +00:00
RebornedBrain 6a5d63803a [FL-3675] Ntag21x write (#3246)
* New scenes for ultralight poller write mode
* Added new button and transition logic for write operation
   For now write is only possible for NTAG21x cards with default password and no AUTHLIM set
* Poller states extended
* Enums and datatypes extended for new poller mode
* Added mode field to poller instance datatype
* New states for poller added in order to implement write mode
* Added new event type for locked cards in order to simplify state flow
* New logic for poller write commands
* Scenes adjustments
* Scenes renamed
* New field added to poller instance
* Now we write in 'page per call' mode
* Now function takes callback return value into account
* Callback will be called only in write mode
* Event type added
* Log adjusted and start page to write set
* Logs added and check in now false at start, then it moves to true
* Now mf_ultralight_poller_handler_request_write_data halts card in case of check failure and stops poller
* All fail events now returns NfcCommandStop callback
* In case of fail we move back properly
* Remove garbage

Co-authored-by: gornekich <n.gorbadey@gmail.com>
Co-authored-by: あく <alleteam@gmail.com>
2023-12-02 13:45:47 +09:00
MX 99d657fcfb merge fixes 2023-12-01 20:33:14 +03:00
MX 00ceb2cd5d Merge branch 'ofw_dev' into dev 2023-12-01 20:29:16 +03:00
Augusto Zanellato c1e0d02afc ST25TB poller refining + write support (#3239)
* nfc: st25tb: rework async poller
* nfc: st25tb: introduce sync poller
* nfc: st25tb: add write support
* nfc: st25tb: rewrite poller to use better states
* nfc: st25tb: move to mode request state after success
* nfc: st25tb: minor bug fixes
* type wasn't properly set on ready event
* sending NfcCustomEventPollerFailure on St25tbPollerEventTypeFailure caused poller to being freed and ultimately resulted in a thread crash

Co-authored-by: Aleksandr Kutuzov <alleteam@gmail.com>
2023-12-01 18:42:00 +09:00
hedger 890c9e87ce [FL-3690] Libraries cleanup; u2f crypto rework to use mbedtls (#3234)
* examples: plugins: utilize fal_embedded
* libs: removed fnv1a_hash
* furi: added FURI_PACKED; apps, libs: changed to use FURI_PACKED
* lib: mbedtls: using custom config
* lib: toolbox: removed md5, switched to mbedtls
* targets: f18: link fix
* lib: added mbedtls_cfg.h
* apps: nfc: explicit dependency on libmbedtls
* u2f: reworking to mbedtls
* u2f: replaced sha256 & hmac with mbedtls
* u2f: functional rework using mbedtls
* libs: dropped micro-ecc
* u2f: dropped old implementation
* toolbox: removed sha256 impl
* mcheck() for mbedtls
* libs: removed libmisc; split into smaller libs
* apps: debug: fixed display_test
* apps: include cleanups
* fbt: fixed VERSIONCOMSTR
* furi: added FURI_CHECK_RETURN
* lib: removed qrcode
* cleanup
* fbt: lint_py+format_py: fixed excessive command length
* api: Removed bzero from f7
* api: Removed bzero from f18
* Bump API Symbols

Co-authored-by: Aleksandr Kutuzov <alleteam@gmail.com>
2023-12-01 18:16:48 +09:00
Cory Parker 05479103a6 Update mf_classic_dict.nfc
Added in new mf classic keys
2023-11-29 21:41:10 -10:00
Willy-JL 32f54632ea Refactor sonicare check --nobuild 2023-11-28 20:40:38 +00:00
Sil333033 2dc9e1b873 i forgor --nobuild 2023-11-28 21:09:58 +01:00
Sil333033 707d87aadc Add NFC Philips Sonicare parser --nobuild
uwu :3
2023-11-28 21:02:23 +01:00
Willy-JL 721a3f9975 Format 2023-11-28 00:30:14 +00:00
47LeCoste 2340efe7e9 Add files via upload 2023-11-27 15:20:56 +01:00
Willy-JL af00cc4e0a Merge branch 'dev' of https://github.com/DarkFlippers/unleashed-firmware into xfw-dev 2023-11-26 18:49:04 +00:00
Willy-JL 2606df668a Merge branch 'dev' of https://github.com/flipperdevices/flipperzero-firmware into xfw-dev 2023-11-26 18:48:44 +00:00
MX a7b2427007 Merge branch 'ofw_dev' into dev 2023-11-26 19:58:48 +03:00
RebornedBrain 1c3cbec661 [FL-3640] NFC: Felica UID emulation (#3190)
* Added basic template of Felica listener
* Raw nfc felica listener functions
* Added functions to setup chip for felica listener
* Cleanup function templates from unnecessary parts
* Removed todo comment
* Updated api versions
* Adjusted chip config for felica
* Set proper chip passive target mode for felica
* Added felica function to unit tests
* Update furi_hal_nfc_felica.c
* Removed duplication

Co-authored-by: gornekich <n.gorbadey@gmail.com>
2023-11-26 17:10:33 +09:00
MX cea423742b Merge remote-tracking branch 'origin/nfc-parsers' into dev 2023-11-24 02:56:39 +03:00
Methodius 8c5f28d6a0 Kazan parser: Type: abonnement fix 2023-11-23 23:59:06 +09:00
Methodius 6c2e332638 Kazan transport cards parser added 2023-11-23 22:19:26 +09:00
Methodius 5f18532a59 Umarsh code cleanup 2023-11-23 22:11:12 +09:00
Methodius 63f072a819 Umarsh header check rework reworked. Thanks J for idea! 2023-11-22 17:26:10 +09:00
Methodius df1d6503c0 Umarsh header check rework 2023-11-22 16:15:53 +09:00
Willy-JL b34e04d236 Format 2023-11-22 02:59:36 +00:00
Willy-JL 086d4bddf6 Merge branch 'dev' of https://github.com/DarkFlippers/unleashed-firmware into dev --nobuild 2023-11-22 01:32:55 +00:00
MMX 972054b377 Merge pull request #655 from DarkFlippers/nfc-parsers
Nfc parsers
2023-11-22 01:50:54 +03:00
assasinfil c145cad653 Verify card bugfix 2023-11-21 22:34:29 +03:00
Methodius 4261063c99 Metromoney transport card parser added 2023-11-22 00:39:23 +09:00