MX
05457b41e4
Merge remote-tracking branch 'OFW/astra/3746-mfp-detect' into nfc_mfplus
2024-06-06 01:12:34 +03:00
MX
bde889c338
Reapply "Merge remote-tracking branch 'OFW/astra/3746-mfp-detect' into dev"
...
This reverts commit 6bfa383cea
.
2024-06-06 00:55:29 +03:00
MX
373f61459a
Merge remote-tracking branch 'RebornedBrain/reborned/ultralight_write' into dev
2024-06-06 00:48:46 +03:00
MX
17dbb4105d
Merge remote-tracking branch 'OFW/dev' into dev
2024-06-06 00:35:40 +03:00
Astra
6db3c0c6bc
Merge branch 'dev' into astra/3746-mfp-detect
2024-06-05 18:55:41 +09:00
RebornedBrain
78f8835cac
Merge branch 'dev' into reborned/ultralight_write
2024-06-03 19:38:15 +03:00
hedger
03196fa110
cleanup of various warnings from clangd ( #3682 )
...
* cleanup of various warnings from clangs
* lfrfid_debug: cast fixes
* subghz: binraw: round->roundf
* furi: thread: updated internal stack size variable to size_t
* github: fail faster on unsuccessful build
* unit_tests: double trouble
2024-06-03 14:43:23 +01:00
RebornedBrain
3d41590090
Added new function which returns end block for write operation
2024-06-03 16:25:58 +03:00
gornekich
03f242618c
mf plus: assert -> check in public API funxtion
2024-05-30 13:55:59 +01:00
gornekich
fd90567f0e
mf plus: handle load and save errors
2024-05-30 13:49:27 +01:00
gornekich
5f7a139cff
mf plus: fix return error codes
2024-05-30 12:54:05 +01:00
gornekich
bf41cc43a1
mf plus: fix read fail event handling
2024-05-29 18:23:34 +01:00
gornekich
ba0051967c
mf plus: remove unused code
2024-05-29 17:01:14 +01:00
gornekich
6ccbc16e74
mf plus: code clean up
2024-05-29 16:53:12 +01:00
Astra
060a488ae9
ATQA byte swap fix
2024-05-22 19:55:12 +09:00
Astra
d3d483e60f
Fix incorrect comparison
2024-05-22 19:10:26 +09:00
Astra
514fd244fa
Fix atqa detection
2024-05-22 18:29:57 +09:00
Astra
c8a779da3f
Review changes and extra logging
2024-05-21 19:30:05 +09:00
Astra
68eb196645
Merge branch 'astra/3746-mfp-detect' of https://github.com/flipperdevices/flipperzero-firmware into astra/3746-mfp-detect
2024-05-20 19:19:22 +09:00
Astra
2929955a3c
Remove stray reminder comment
2024-05-20 19:19:11 +09:00
Astra
915304b986
Merge branch 'dev' into astra/3746-mfp-detect
2024-05-20 19:14:30 +09:00
Astra
cf9b09042e
Remove leftover logging
2024-05-20 19:12:18 +09:00
Astra
54f63e06ec
Fixes from code review
2024-05-20 19:08:54 +09:00
MX
51bb9c0a0a
Merge remote-tracking branch 'OFW/dev' into dev
2024-05-17 17:15:48 +03:00
gornekich
217bfac2fc
NFC: add Slix capabilities ( #3652 )
...
* iso15693 listener: fix inventory cmd and buffer overflow
* iso15 listener: fix read multiple blocks command
* slix: print password
* slix: add capabilities field
* slix listener: skip password validation for special capability
* slix: fix capability name
* slix: add capabilities handler to verify and reset
* nfc test: introduce slix tests
* fbt: change toolchain back to 33 version
* slix: fix saving capablities comment
* unit tests: add slix files to resources
* slix: fix set passwrd signature
* nfc tests: add set correct password test
* nfc test: complete slix password tests
* nfc test: add slix file test
* nfc test: handle errors in worker callback
* iso15693_3: code clean up
* iso15693_listener: fix incorrect afi handling
* slix: chage capabilities format to one word camel case
* unit tests: update nfc files with new slix format
Co-authored-by: あく <alleteam@gmail.com>
2024-05-17 12:58:32 +01:00
MX
1afa3f7ef3
Merge remote-tracking branch 'OFW/dev' into dev
2024-05-15 18:22:54 +03:00
gornekich
988b9cf155
Merge branch 'dev' into astra/3746-mfp-detect
2024-05-14 17:12:37 +01:00
gornekich
5f9b300ab2
NFC: Mf Desfire fix reading big files ( #3616 )
...
* mf desfire: fix incorrect long files reading
* nfc app: trim record size for mf desfire render
* mf desfire: rework reading long record files
* mf desfire: more robust size check
Co-authored-by: あく <alleteam@gmail.com>
2024-05-14 13:34:27 +01:00
MX
6bfa383cea
Revert "Merge remote-tracking branch 'OFW/astra/3746-mfp-detect' into dev"
...
This reverts commit 9b377e6f80
, reversing
changes made to 1736a8a7c2
.
2024-05-03 14:50:58 +03:00
MX
9b377e6f80
Merge remote-tracking branch 'OFW/astra/3746-mfp-detect' into dev
2024-05-01 16:49:53 +03:00
MX
c157ca9879
Merge remote-tracking branch 'OFW/gornek/desfire_long_files' into dev
2024-04-27 15:09:21 +03:00
gornekich
0e3cbb4911
mf desfire: rework reading long record files
2024-04-25 20:01:32 +01:00
gornekich
e5f9af3b43
mf desfire: fix incorrect long files reading
2024-04-25 18:13:52 +01:00
Astra
2987a46322
Alloc takes no arguments
2024-04-23 11:00:37 +09:00
Astra
85fc0a2dd3
Merge branch 'dev' into astra/3746-mfp-detect
2024-04-23 10:39:34 +09:00
Astra
83ff6fb8bf
Mifare Plus detection done
2024-04-22 21:09:06 +09:00
MX
f88a916ccc
Merge remote-tracking branch 'OFW/dev' into dev [ci skip]
2024-04-21 11:42:57 +03:00
Leopold
286fd796e7
add support for S(WTX) request in iso14443_4a_poller ( #3590 )
...
Co-authored-by: gornekich <n.gorbadey@gmail.com>
Co-authored-by: あく <alleteam@gmail.com>
2024-04-19 21:11:22 +09:00
Astra
9042009b0b
Proper detection (WIP)
2024-04-19 20:43:18 +09:00
Astra
7189026335
Initial MFPlus draft
2024-04-17 11:00:51 +09:00
MX
b079b46681
Merge remote-tracking branch 'OFW/dev' into dev
2024-04-16 22:46:32 +03:00
gornekich
1a40fae003
[FL-3750] Mf Desfire multiple file rights support ( #3576 )
...
* mf desfire: remove unused type
* mf desfire: continue reading after failed get free mem cmd
* mf desfire: fix processing read master key settings command
* mf desfire: don't read applications if they are auth protected
* mf desfire: handle multiple rights
* mf desfire: fix PVS warnings
* mf desfire: fix print format
* mf desfire: fix logs
* mf classic: add send frame functions to poller
* unit tests: add test from mfc crypto frame exchange
* mf classic: add documentation
* mf classic: fix incorrect name
* target: fix api version
2024-04-16 14:55:24 +09:00
MX
b3151c563f
Merge remote-tracking branch 'OFW/dev' into dev
2024-04-10 15:18:09 +03:00
RebornedBrain
fb9728d570
[FL-3772] Felica poller ( #3570 )
...
* New types for felica poller
* New functions for felica data transmissions
* Felica memory map extended with new fields
* Init/deinit of mbedtls context added for felica encryption
* Functions for session key and mac calculations added
* Raw felica_poller implementation added
* Removed MAC type parameter from check_mac function
* Replaced all data fields needed for auth with context structure
* Clean up felica_poller.c
* Now RC block is filled with random numbers
* New parameter for counting well-read blocks
* Some cleanups
* Felica file save and load logic added
* Now we use card key from context for session key calculation
* Copying card key to card block from auth context when both authentications succeeded, otherwise decrement blocks count by 1
* New felica poller event added
* Moved some data structions to public namespace
* FelicaAuthenticationContext struct moved to felica.h
* Field type and name changed for better ones
* Helper functions for felica_auth added to the app
* New scene for felica card key input added
* Logic for felica key input added
* Auth context request processing added
* Added block index definitions and replaced all index numbers with them
* More macro defines
* Replace nesting with do while block
* New function for write operations mac calculation added
* Replace nesting with do while block
* Make functions static for now because they are used internally
* Wrote some comments
* Raw felica render implementation
* New felica scenes
* Adjusted felica dump rendering according design requirements
* New felica scene added
* Helper for switching scene during unlock added
* Added warning scene and transfer to it
* Moved unlock scene logic to separate files
* Magic number changed
* New felica render logic
* Felica scenes adjusted according to design requirements
* Felica poller cleanups
* Some asserts added and some fixed
* Replcaed asserts to checks in public api
* Fixed pvs warnings in felica_poller
* New event for felica_poller added for incomplete read actions
* Handling of new poller event added
* Update SConscript with felica files
* Update api_symbols.csv with felica functions
* Sync API versions
Co-authored-by: あく <alleteam@gmail.com>
2024-04-10 18:51:36 +09:00
MX
c9909467f9
Merge remote-tracking branch 'OFW/dev' into dev
2024-04-09 03:24:16 +03:00
Astra
27e61eb808
Move crypto1 to helpers, add it to the public API ( #3567 )
...
* Move crypto1 to helpers, add it to the public API
* F18 API version bump
Co-authored-by: あく <alleteam@gmail.com>
2024-04-07 23:47:48 +09:00
MX
45e7913435
after merge fixes
...
add void
2024-04-04 22:55:39 +03:00
MX
e436ea275a
Merge remote-tracking branch 'OFW/dev' into dev
2024-03-29 14:05:07 +03:00
gornekich
74cda02368
[FL-3803] NFC: Fix mf desfire detect ( #3548 )
2024-03-29 10:32:15 +09:00
MX
7c0939ad52
Merge remote-tracking branch 'OFW/dev' into dev
2024-03-25 14:23:44 +03:00