Commit graph

3687 commits

Author SHA1 Message Date
Antiklesys
03adc544df Update util.c 2024-07-20 01:42:47 +08:00
Antiklesys
66b030290a Update iclass.c
Changed more variables to lowercase
2024-07-19 18:42:37 +08:00
Antiklesys
27cbdd3031 Update on variables and comments
Added missing definition of picopass block size in util.c
Changed some variables to full lowercase
Added comment explanation on correlation between macs and decimal values
2024-07-19 18:34:36 +08:00
Antiklesys
a127a38cb6 Updated some as per iceman's comments
Made multiple changes as per iceman's comments.
Removed redundant/unused function i forgot into cmdhficlass.c
Moved conversion functions in util.c for now but haven't yet check if it's possible to reuse the current fuctions already there. Will do that in a moment.
2024-07-19 18:27:36 +08:00
Antiklesys
1832997ccb Iclass Legacy Raw Key Recovery Function
Based on the work described in Dismantling iClass whitepaper.
hf iclass legbrute is tested working
hf iclass legrec is partially working: logic of operations and sequence seems to be in order and was tested on simulated data to be effective. The privilege escalation part is still not successful, but the logic should be correct.
2024-07-19 14:47:13 +08:00
Dani
a8ac0f3053
Update lf_em4100emul.c
Rename fucntions (to avoid conflictinf with other standalone modes), print what ID is emulating and allow exit emulation with button long-press 

Signed-off-by: Dani <danidrach@gmail.com>
2024-06-23 17:14:59 +02:00
iceman1001
39639c803c fix a wrong size when clearning allocated memory 2024-06-15 20:36:11 +02:00
Michael Jung
8209440a54 Fix ISO 14443-B tag simulation
See https://github.com/RfidResearchGroup/proxmark3/issues/1652

- Fix Bit Coding PICC -> PCD:  Encoding for 0 and 1 bits were reversed.
- Add a frontend delay for TR0 (No subcarrier) in TransmitFor14443b_AsTag.
- Remove unconditionally prefixing the encoded data with two '1' bits.
- Improve the Type B PICC State Machine implementation.

With these improvements my PCD can read the ISO 14443-B tag emulated by a
Proxmark3 Easy.

Signed-off-by: Michael Jung <michael.jung@secore.ly>
2024-06-11 19:05:08 +02:00
iceman1001
7329dcd3bf Revert "Release v4.18589 - Aurora"
This reverts commit aceed281e8.
2024-05-28 10:36:32 +02:00
iceman1001
aceed281e8 Release v4.18589 - Aurora 2024-05-28 10:36:32 +02:00
iceman1001
6bdfe11c1a minor fixes 2024-05-28 10:00:11 +02:00
iceman1001
369db7c9d7 style 2024-05-27 20:29:02 +02:00
iceman1001
b9a583cdb5 swapped out to use bigbuff memory allocation and also show an empty message 2024-05-21 18:31:51 +02:00
iceman1001
00407383fe hitag2 crack1,2 fixes. The error response I never seen, the fct to hex2bin prone to overflows. This should make both attack vectors more stable 2024-05-20 14:22:55 +02:00
iceman1001
7dfcc47975 Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 2024-05-16 22:51:06 +02:00
iceman1001
d9ec99f903 found the bug in a call to hex2binarray() fct which overwrote first 16 bytes of keystream. Fixed loops. Crack2 now generates same data as RFIDLer impl. 2024-05-16 22:49:24 +02:00
mifa-om
12f9ac5275 fixed em4x50_sim_read_bit 2024-05-15 11:34:44 +02:00
iceman1001
498af46fbf fix #2384 the use of free() is completely wrong as we use bigbuff allocations. Converted the old style to new and removed the dynamic allocation. 2024-05-15 09:36:31 +02:00
Iceman
2b276cae1a
Merge pull request #2385 from henrygab/em4x70_add_tests
add `lf em 4x70 calc` and self-tests
2024-05-15 09:19:41 +02:00
Henry Gabryjelski
b7fff95b7c Improve editor folding (some editors use indentation as cue) 2024-05-14 19:16:37 -07:00
Henry Gabryjelski
d27c084819 Internal code cleanup.
Reduce ambiguity in function and parameter names.
2024-05-14 19:16:05 -07:00
iceman1001
cacc1c1445 unused 2024-05-14 16:12:42 +02:00
iceman1001
b696c498b7 scope, const 2024-05-14 14:37:08 +02:00
iceman1001
5fd4d7e774 fix const param, bitwiseboolean 2024-05-14 14:29:30 +02:00
iceman1001
bae6f5196f fix fct name mismatch 2024-05-14 12:42:08 +02:00
iceman1001
9535bd5a11 fix fct name mismatch 2024-05-14 12:41:22 +02:00
iceman1001
6f23b7f3eb fix fct name mismatch, const params, 2024-05-14 12:40:26 +02:00
iceman1001
f63ba3f31a fix fct name mismatch 2024-05-14 12:32:57 +02:00
iceman1001
0096672d38 fix fct names and consts and bad if statement 2024-05-14 11:57:47 +02:00
iceman1001
3430e20459 fix const params, lessen variable scope and fixing func arguments names 2024-05-14 11:10:12 +02:00
iceman1001
cb937a3f57 fix overwriting return value in one case 2024-05-14 10:59:10 +02:00
iceman1001
e3ceb2ffe4 const param 2024-05-14 10:10:44 +02:00
iceman1001
42f0699c78 style 2024-05-14 10:04:28 +02:00
Henry Gabryjelski
483b192d40 rename parameter for em4x70_receive
Avoid generic "length" parameters, as they are often ambiguous.

Prefer `byte_count`, `element_count`, `bit_count` or more explicit names to reduce misunderstandings and thus reduce bugs.
2024-05-13 10:19:00 -07:00
iceman1001
bbbe985111 when changing to 50 loops on device side, the felica reader code on client side timedout and it wasnt handled good enough so the return code was PM3_SUCCESS giving a false positive. Increase timeout, decrease loops to 25, and better loop handling of return value 2024-05-12 20:17:50 +02:00
Henry Gabryjelski
18cbc7259c prevent sending corrupt data to em4x70 tags 2024-05-05 16:00:16 -07:00
Henry Gabryjelski
569d57719d Fix firmware return value for em4x70 to always be of type PM3_* 2024-05-05 15:54:00 -07:00
iceman1001
2bc7c50302 changed fct names 2024-04-26 22:52:49 +02:00
iceman1001
097dfba5c8 simplified loop 2024-04-26 16:25:40 +02:00
iceman1001
dee84b5b6f added "lf hitag crack2" to support the second attack vector against Hitag2, based on all work from @kevsecurity Kev Sheldrake in the RFIDler repo. This is WIP, not working at the moment 2024-04-26 15:38:06 +02:00
iceman1001
eac3774189 changed to 50 polls, not sure if its good. Maybe looking at timeout 1060ms value instead? also cleaned out debug statements 2024-04-26 12:15:38 +02:00
Iceman
8550cf0e85
Merge pull request #2364 from xueliu/delete-duplicate-header-file
Delete a duplicate header file fpga.h in armsrc/appmain.c
2024-04-23 21:12:39 +02:00
Xue Liu
4216900694 - delete a duplicate header file in armsrc/appmain.c
Signed-off-by: Xue Liu <liuxuenetmail@gmail.com>
2024-04-23 16:34:26 +02:00
iceman1001
5f65b5a19e fix order 2024-04-22 17:30:52 +02:00
iceman1001
cad63e7162 fix missing crc calcs 2024-04-22 16:55:54 +02:00
iceman1001
3f6ea0f0fc style 2024-04-22 16:35:22 +02:00
iceman1001
c8849af5e0 This is the major changes made to the HITAG2 commands. Its heavly based on RFIDLers implementation and its been converted to work with Proxmark3. Special thanks to @kevsecurity for his amazing implementations of the Gone in 360 Seconds paper by Roel, Flavio & Balasch. Thanks to @adamlaurie for his RFIDler project. It wouldnt been doable without it. 2024-04-22 16:20:24 +02:00
iceman1001
fc2a3dd2c5 Updated the command according to @whywilson's findings. and fixed the wrong byte aswell 2024-04-22 15:41:59 +02:00
iceman1001
4304372858 tweaking felica timings to see if it gets better results 2024-04-22 10:41:28 +02:00
iceman1001
47262433e8 missing header 2024-04-22 09:27:54 +02:00