Commit graph

19810 commits

Author SHA1 Message Date
Iceman
ecea5db50b
Merge pull request #2728 from shuffle2/master
fix bigbuf allocators (tracing + malloc) overwriting each other
2025-01-25 01:11:49 +01:00
Shawn Hoffman
aa286b4a16 fix bigbuf allocators (tracing + malloc) overwriting each other
* BigBuf.c: use s_ prefix for statics
* BigBuf_Clear_ext already calls clear_trace, so remove extra calls
* add some sanity checking of allocator args
* dont compare PDC_RNCR to false
2025-01-24 15:56:45 -08:00
Iceman
dc5d456db5
Merge pull request #2726 from n-hutton/emv_sim_cleanup_squash
Cleanup PR to emv contactless to contact bridge
2025-01-22 15:53:25 +01:00
n-hutton
8dbe1c7b06 more 2025-01-21 23:52:33 +00:00
n-hutton
acb7de9d8d more cleanup noticed just now 2025-01-21 23:51:26 +00:00
n-hutton
3eb0238481 appears to work - using normal mifare sim init
working demo

works

seems to work so far

more cleanup and works

working copy

working, clean one more pass

cleanup continues

back in buisness babyyy

final cleanup before PR I hope
2025-01-21 23:39:25 +00:00
Philippe Teuwen
32f06db2e8 fix workflow yaml 2025-01-18 18:24:33 +01:00
Iceman
2f2f3d9a6d
Merge pull request #2723 from ry4000/master
R&Y: Added Payment/Transport AIDs and Updated AIDs in `aid_desfire.json`
2025-01-18 05:25:29 +01:00
ry4000
4ef545487d
R&Y: Added PT / PS AIDs and Updated PT AIDs
Signed-off-by: ry4000 <154689120+ry4000@users.noreply.github.com>
2025-01-18 11:45:22 +11:00
Philippe Teuwen
9c05f2c729 hf mfu info: fix strong mod bit parsing
"2" was probably referring to bit 2 == 0x04
I checked the following datasheets and STRG_MOD_EN is always at 0x04:
- UL EV1
- NTAG 213/215/216
- NTAG 213_F/216_F
2025-01-16 22:44:01 +01:00
Iceman
22c7ac0c49
Merge pull request #2722 from kitsunehunter/iceman-typo
fix typo
2025-01-15 23:42:58 +01:00
Iceman
b467eb5c59
Merge pull request #2721 from henrygab/codeQL_fixes2
Fix printf() mismatch
2025-01-15 23:42:40 +01:00
Xavier
f72436a5f9
fix typo
Signed-off-by: Xavier <90627943+kitsunehunter@users.noreply.github.com>
2025-01-15 16:20:12 -05:00
Henry Gabryjelski
740cfad457 Fix printf() mismatch 2025-01-15 13:11:41 -08:00
Iceman
7082302a02
Merge pull request #2720 from henrygab/codeQL_fixes2
CodeQL -- Actual fixes
2025-01-15 19:02:17 +01:00
Henry Gabryjelski
1e95dadde9 Remove static assertions 2025-01-15 09:25:21 -08:00
Henry Gabryjelski
715e876c62 Per explicit request of iceman1001 2025-01-15 09:22:18 -08:00
Henry Gabryjelski
dc0e6f4f91 Fix regression
Found by iceman1001's code review ... THANK YOU!
2025-01-15 09:18:39 -08:00
iceman1001
cb7109e751 fix hf mf cload - now it allows for proper GDM ic to load mfc ev1 signature data. On uscuid ic which are more locked down it will failed with a message. Dont forget to enable signature for the gdm ic. 2025-01-15 16:07:13 +01:00
Henry Gabryjelski
6613ff7334 Workaround old GCC on Windows builds
This is supported for GCC >= version 13

See GCC bug 85487:
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=85487
2025-01-14 20:35:45 -08:00
Henry Gabryjelski
99e8de3687 fix build break on some compilers 2025-01-14 18:01:09 -08:00
Henry Gabryjelski
05319463fb improve comment 2025-01-14 18:01:09 -08:00
Henry Gabryjelski
1c3f84503a Quiet a spurious warning
The compiler warning is incorrect.
Since `calloc()` zero's memory, can
remove redundant line setting value
to zero, giving quieter builds.
2025-01-14 18:01:09 -08:00
Henry Gabryjelski
18f6604eb0 Prevent potential stack corruption 2025-01-14 18:01:09 -08:00
Henry Gabryjelski
1c75690b1a Various codeQL fixes
Code was previously performing arithmetic in
various loop check conditions.  Integer promotion rules could cause unintended comparisons.

`spiffs` defined `fs->block_count` as `uint32_t`, but defined `spiffs_page_ix` as `uint16_t`.  Various overflow checks detected by CodeQL and fixed by checking for those conditions before looping.
2025-01-14 18:01:09 -08:00
Henry Gabryjelski
91be146ecb CodeQL fixes for "Comparison between A of type TypeA and B of wider type TypeB" 2025-01-14 17:54:58 -08:00
Henry Gabryjelski
20c4756f2a no-op 2025-01-14 17:52:51 -08:00
Henry Gabryjelski
4d67f56656 Mismatched format string specifier (need to deref size pointer) 2025-01-14 17:52:51 -08:00
iceman1001
f0bdcf3838 viewing a MFC ev1 now prints the two special sectors 2025-01-15 00:01:44 +01:00
iceman1001
16a776e79f fix hf mf view to load MFC ev1 sized dumps 2025-01-14 23:22:55 +01:00
iceman1001
16c3433bfe fix hf mf mad to read mfc ev1 dumps 2025-01-14 23:20:18 +01:00
Philippe Teuwen
70389e55b1 quick fix for nfc decode to handle ev1 dumps, untested 2025-01-14 23:17:11 +01:00
iceman1001
f13c0740ec Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 2025-01-14 23:01:39 +01:00
iceman1001
e59385a44b added -1k+ param to allow for gdm and the extra sectors dump to be loaded 2025-01-14 23:01:17 +01:00
Philippe Teuwen
cd2f9ced83 pm3_load_dump: honor maxdumplen, this fixes hf mf cload on EV1 dump 2025-01-14 22:58:21 +01:00
iceman1001
00f9403537 guard the smarttonfc command 2025-01-14 21:48:26 +01:00
iceman1001
fc06cafc2f moving emvsim.c since it needs smartcard functions 2025-01-14 21:40:14 +01:00
iceman1001
91f816a641 fix codeQL warning #309 2025-01-14 19:26:05 +01:00
iceman1001
c32ef83812 style 2025-01-14 18:20:55 +01:00
iceman1001
560f0f106b add a possible early detection of a unknown 75pF UL Ev1 AES 2025-01-14 18:19:49 +01:00
iceman1001
bff0df5dcf looking if thinfilm sim works better now 2025-01-14 18:19:10 +01:00
iceman1001
1040fa8a86 style 2025-01-14 18:18:07 +01:00
iceman1001
6af2df51bf style 2025-01-14 16:40:22 +01:00
iceman1001
9ecd3dc3ce text 2025-01-14 16:40:01 +01:00
iceman1001
1cc9254f69 fix #2714 hf mfu info now identifies 50 pF UL Ev1 AES properly. Thanks @pc-coholic 2025-01-14 16:39:07 +01:00
Iceman
6367b2dcd9
Merge pull request #2717 from Eltrick/ev1-autopwn-dump
Possible fix for MFC EV1 signature dumping in 'hf mf autopwn'
2025-01-14 16:28:43 +01:00
Iceman
d5e80c1caf
Merge pull request #2652 from n-hutton/cherry_pick_emv
Cherry pick POC of emv simulation
2025-01-14 16:27:16 +01:00
Iceman
76ad5a5b51
Merge branch 'master' into cherry_pick_emv
Signed-off-by: Iceman <iceman@iuse.se>
2025-01-14 16:26:35 +01:00
Iceman
d100dcc847
Merge pull request #2711 from emilyastranova/master
Fix incorrect header length
2025-01-14 16:24:36 +01:00
Iceman
e505365a30
Merge branch 'master' into master
Signed-off-by: Iceman <iceman@iuse.se>
2025-01-14 16:24:23 +01:00