Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FL-3772] Felica poller #3570

Merged
merged 56 commits into from
Apr 10, 2024
Merged

[FL-3772] Felica poller #3570

Changes from 1 commit
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
c996d37
New types for felica poller
RebornedBrain Mar 6, 2024
1bc7dd2
New functions for felica data transmissions
RebornedBrain Mar 6, 2024
4cd06ba
Felica memory map extended with new fields
RebornedBrain Mar 6, 2024
da65c61
Init/deinit of mbedtls context added for felica encryption
RebornedBrain Mar 6, 2024
24b610f
Functions for session key and mac calculations added
RebornedBrain Mar 13, 2024
a87e5ee
Raw felica_poller implementation added
RebornedBrain Mar 13, 2024
5439e47
Removed MAC type parameter from check_mac function
RebornedBrain Mar 13, 2024
3a7b15b
Replaced all data fields needed for auth with context structure
RebornedBrain Mar 13, 2024
0d1feaa
Clean up felica_poller.c
RebornedBrain Mar 13, 2024
bfb1c36
Now RC block is filled with random numbers
RebornedBrain Mar 14, 2024
ea67ae8
New parameter for counting well-read blocks
RebornedBrain Mar 14, 2024
086edf3
Some cleanups
RebornedBrain Mar 14, 2024
7deafef
Felica file save and load logic added
RebornedBrain Mar 21, 2024
ee09661
Now we use card key from context for session key calculation
RebornedBrain Mar 21, 2024
d3c3ac8
Copying card key to card block from auth context when both authentica…
RebornedBrain Mar 21, 2024
69faee8
New felica poller event added
RebornedBrain Mar 21, 2024
d4c778d
Moved some data structions to public namespace
RebornedBrain Mar 21, 2024
69264bb
FelicaAuthenticationContext struct moved to felica.h
RebornedBrain Mar 21, 2024
1c7ae8e
Field type and name changed for better ones
RebornedBrain Mar 21, 2024
504f2eb
Helper functions for felica_auth added to the app
RebornedBrain Mar 21, 2024
e188a53
New scene for felica card key input added
RebornedBrain Mar 21, 2024
d830aab
Logic for felica key input added
RebornedBrain Mar 21, 2024
20f1c88
Auth context request processing added
RebornedBrain Mar 21, 2024
37a9fa1
Added block index definitions and replaced all index numbers with them
RebornedBrain Mar 21, 2024
6d193e9
More macro defines
RebornedBrain Mar 21, 2024
1ba4a6b
Replace nesting with do while block
RebornedBrain Mar 21, 2024
73693f5
New function for write operations mac calculation added
RebornedBrain Mar 21, 2024
ad8a0ac
Replace nesting with do while block
RebornedBrain Mar 21, 2024
2f246f4
Make functions static for now because they are used internally
RebornedBrain Mar 22, 2024
e4a65bf
Wrote some comments
RebornedBrain Mar 22, 2024
c367de1
Raw felica render implementation
RebornedBrain Mar 25, 2024
5dc07dc
New felica scenes
RebornedBrain Mar 29, 2024
3d38bfc
Adjusted felica dump rendering according design requirements
RebornedBrain Mar 29, 2024
559a1de
New felica scene added
RebornedBrain Apr 2, 2024
75b7016
Helper for switching scene during unlock added
RebornedBrain Apr 2, 2024
ad3392f
Added warning scene and transfer to it
RebornedBrain Apr 3, 2024
526badf
Moved unlock scene logic to separate files
RebornedBrain Apr 3, 2024
0ad7aec
Magic number changed
RebornedBrain Apr 3, 2024
6b01895
New felica render logic
RebornedBrain Apr 3, 2024
6fac089
Felica scenes adjusted according to design requirements
RebornedBrain Apr 3, 2024
82f49c6
Merge branch 'dev'
RebornedBrain Apr 4, 2024
da0f818
Felica poller cleanups
RebornedBrain Apr 5, 2024
517aec8
Merge branch 'dev'
RebornedBrain Apr 5, 2024
fec8dcf
Merge branch 'dev' into reborned/felica_poller
skotopes Apr 7, 2024
534e902
Some asserts added and some fixed
RebornedBrain Apr 8, 2024
c37245f
Merge branch 'dev' into reborned/felica_poller
skotopes Apr 9, 2024
a8f743c
Replcaed asserts to checks in public api
RebornedBrain Apr 9, 2024
96d5d33
Merge branch 'dev' into reborned/felica_poller
skotopes Apr 9, 2024
bed5a8e
Fixed pvs warnings in felica_poller
RebornedBrain Apr 9, 2024
a61de97
Merge branch 'reborned/felica_poller' of git@github.com:RebornedBrain…
RebornedBrain Apr 9, 2024
b61abb9
Merge branch 'dev' into reborned/felica_poller
skotopes Apr 9, 2024
759cc82
New event for felica_poller added for incomplete read actions
RebornedBrain Apr 9, 2024
4ec511a
Handling of new poller event added
RebornedBrain Apr 9, 2024
b65a76a
Update SConscript with felica files
RebornedBrain Apr 9, 2024
4145bcb
Update api_symbols.csv with felica functions
RebornedBrain Apr 9, 2024
7b26ab1
Sync API versions
skotopes Apr 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'dev' 
Conflicts:
	applications/main/nfc/helpers/protocol_support/mf_ultralight/mf_ultralight.c
	applications/main/nfc/nfc_app_i.h
  • Loading branch information
@RebornedBrain
RebornedBrain committed Apr 4, 2024
commit 82f49c643c1feea52e35c5ecbe75581f367d3426
1 change: 1 addition & 0 deletions applications/main/nfc/nfc_app_i.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
#include "helpers/mf_classic_key_cache.h"
#include "helpers/nfc_supported_cards.h"
#include "helpers/felica_auth.h"
#include "helpers/slix_unlock.h"

#include <dialogs/dialogs.h>
#include <storage/storage.h>
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.