RebornedBrain
5f4f4fcc60
FeliCa anti-collision fix ( #3889 )
...
* System code added to felica hal config functions
* Felica sensf_res setup logic adjusted with new struct
* Set api symbols version to 73.0
* Felica unit tests fix
* Furi: prevent use after free on xEventGroupSetBits call
Co-authored-by: Aleksandr Kutuzov <alleteam@gmail.com >
2024-09-09 22:11:53 +01:00
Zinong Li
78c5dd95d8
LFRFID GProxII Fix Writing and Rendering Conflict ( #3888 )
2024-09-09 18:23:18 +01:00
gornekich
9558a5fa08
Merge branch 'dev' into nestednonces
2024-09-09 13:34:47 +01:00
MX
80ad381eef
extra checks [ci skip]
2024-09-09 05:13:02 +03:00
MX
b6644d7727
merge fixes [ci skip]
2024-09-09 04:13:10 +03:00
MX
7711b2daae
Merge remote-tracking branch 'OFW/dev' into dev
2024-09-09 04:11:35 +03:00
MX
5da447a2b0
more chance to generate working remote at gangqi
2024-09-09 04:11:00 +03:00
Zinong Li
a122ee75f6
LFRFID: Guard GProxII Wiegand Check Against False Positive and Correct 36-bit Parsing ( #3868 )
...
* Update protocol_gproxii.c
* 36 bit format parsing fix
* Update protocol_gproxii.c
* wiegand checks as single function
* LfRfid: simplify gprox wiegand payload validation flow
* LfRfid: extra furi_check in gprox wiegand validation code
Co-authored-by: Aleksandr Kutuzov <alleteam@gmail.com >
2024-09-08 11:25:31 +01:00
MX
6911ba12ad
Merge remote-tracking branch 'OFW/dev' into dev
2024-09-07 22:31:11 +03:00
Silent
8672a1d94c
Replace all calls to strncpy with strlcpy, use strdup more, expose strlcat ( #3866 )
...
strlcpy doesn't zero the buffer and ensures null termination,
just like snprintf
strlcat is already used by mjs and it's a safe alternative to strcat,
so it should be OK to expose to apps
2024-09-07 17:16:56 +01:00
Aleksandr Kutuzov
9ea7a4671a
Merge remote-tracking branch 'origin/dev' into nestednonces
2024-09-07 13:47:07 +01:00
Astra
3c75356b49
Fix detection of GProx II cards and false detection of other cards ( #3869 )
...
* Fix detection of GProx II cards and false detection of other cards as GProx II
* Fix incorrect parity starting bit
Co-authored-by: あく <alleteam@gmail.com >
2024-09-07 12:12:06 +01:00
MX
ad1c9045af
use global counter
2024-09-06 12:56:35 +03:00
MX
64e231ae8d
fix logic
2024-09-06 12:47:43 +03:00
MX
910380559b
move logic
2024-09-06 12:16:34 +03:00
MX
8d731f3b1b
hay21 add 3rd button
2024-09-06 11:52:03 +03:00
MX
7333c550d2
hay21 small ui fix
2024-09-06 11:46:11 +03:00
MX
2e0cebc4f8
add hay21 dynamic protocol [ci skip]
2024-09-06 11:23:02 +03:00
MX
2762ff2def
gangqi serial validator and fix add manually
2024-09-06 10:11:43 +03:00
MX
a4eebd7ad6
Add hollarm 42bit protocol and more
...
custom button support and add manually support for new protocols
2024-09-06 00:46:29 +03:00
MX
2683f950a7
return back after merge
2024-09-05 22:14:40 +03:00
MX
56530ee61c
Merge remote-tracking branch 'OFW/dev' into dev
2024-09-05 22:10:41 +03:00
hedger
feb1b2f349
[FL-3882] Clean up of LFS traces ( #3849 )
...
* updater, storage: removed mentions of LFS from public APIs; updated corresponding strings
* rpc: updated include path
Co-authored-by: あく <alleteam@gmail.com >
2024-09-05 18:44:22 +01:00
porta
c9791a280a
[FL-3884] Proper integer parsing ( #3839 )
...
* feat: strint_to_uint32 and tests
* fix: permit explicit bases and prefixes
* feat: strint_to_{int32,uint16,int16}
* feat: strint_to_u?int64
* refactor: replace strtol, strtoul, sscanf with strint_to_*
* fix: api symbols
* docs: document parameter `end` of strint_to_uint_32
* style: apply changes requested by hedger
* refactor: fix pvs-studio diagnostic
* style: apply changes requested by CookiePLMonster
* fix: unused var
* fix: pointer type
* refactor: convert atoi to strint_to_*
* fix: strint_to_uint8 doesn't actually exist ._ .
* fix: memory leak
* style: address review comments
* Toolbox: couple small comments in the code and doxygen comment update. SubGhz, Loader: fix strint usage.
* Loader: fix incorrect cast
Co-authored-by: あく <alleteam@gmail.com >
2024-09-05 18:02:42 +01:00
MX
24325e4418
gangqi add button parsing
2024-09-05 03:54:16 +03:00
MX
2e787dea47
merge ofw pr 3868 [ci skip]
...
by zinongli
LFRFID: Fix Guard GProxII False Positive and 36-bit Parsing
2024-09-04 04:46:31 +03:00
MX
d2f0fbad45
Merge remote-tracking branch 'OFW/astra/gproxii-fix-detection' into dev
2024-09-04 03:17:29 +03:00
MX
00a0c6ee1a
Merge remote-tracking branch 'OFW/dev' into dev
2024-09-04 03:16:37 +03:00
MX
8fd8e4f3d9
Add marantec24 and gangqi protocols
...
Protocols by @xMasterX / captures for gangqi by @mishamyte
2024-09-04 03:16:30 +03:00
Nathan N
7bb33497ae
Merge branch 'flipperdevices:dev' into nestednonces
2024-09-03 15:18:23 -04:00
noproto
92122b2cdf
NFC app UI updates, MVP
2024-09-03 15:19:12 -04:00
noproto
3cb3eab118
Update TODO
2024-09-03 11:36:19 -04:00
noproto
2e0cd320c7
Static encrypted nonce collection
2024-09-03 09:26:14 -04:00
noproto
6e9fe1edd8
Don't recalibrate hard PRNG tags
2024-09-03 05:54:59 -04:00
Astra
a8482984de
Fix incorrect parity starting bit
2024-09-03 17:42:49 +09:00
Astra
14a49759ce
Fix detection of GProx II cards and false detection of other cards as GProx II
2024-09-03 17:20:49 +09:00
noproto
2cb2f05ea9
Backdoor nested calibration
2024-09-02 22:34:44 -04:00
noproto
9c7120ec91
Backdoor working up to calibration
2024-09-02 18:53:39 -04:00
noproto
ccc4326574
Backdoor read
2024-09-02 12:45:39 -04:00
noproto
2abeb071fd
Fix regression for regular nested attack
2024-09-02 10:28:50 -04:00
Zinong Li
5272eb7550
Publishing T5577 page 1 block count macro ( #3864 )
...
* publishing t5577 page 1 block count macro
Co-authored-by: Aleksandr Kutuzov <alleteam@gmail.com >
2024-09-02 18:03:56 +09:00
noproto
90d0c3d095
Hardnested support
2024-09-01 22:30:37 -04:00
noproto
4c14594ebb
Relocate backdoor detection
2024-08-28 09:26:59 -04:00
noproto
c0331ba2e2
Should be detecting both backdoors now
2024-08-27 19:35:33 -04:00
noproto
0b33c85b8b
Collect nonces again
2024-08-27 16:16:38 -04:00
noproto
5235592054
Only use dicts in search_dicts_for_nonce_key if we have them
2024-08-27 06:32:00 -04:00
noproto
26845cbdc5
Misc bugfixes
2024-08-21 00:50:27 -04:00
noproto
c1f01ce66a
Code cleanup
2024-08-20 18:04:07 -04:00
noproto
75a0e4bc9d
Update found keys, second attempt
2024-08-20 16:33:13 -04:00
noproto
bbc10cdfaf
Update found keys, initial attempt
2024-08-20 16:31:39 -04:00