Commit Graph
13661 Commits
Author SHA1 Message Date
Philippe Teuwen fb238015fa hf mfu sim --1a2-mirror 2026-06-04 20:19:15 +02:00
Alexandre CHAZAL 94b8ff88f5 Merge branch 'master' into mad-security-rewrite
Signed-off-by: Alexandre CHAZAL <AlxCzl@users.noreply.github.com>
2026-06-03 12:09:58 -07:00
achazal c7ac39f376 mad: harden MAD parser with typed structs and fix memory safety bugs 2026-06-03 20:22:30 +02:00
Iceman 458acf4fc6 Merge pull request #3353 from AlxCzl/fix-mad1-loop-oob
Fix MAD1 off-by-one in MADDecode: loop read Key A as 16th AID
2026-06-02 20:43:48 +02:00
Iceman b3f1913f18 Merge pull request #3354 from AlxCzl/fix-mad-cardholder-overread
Fix buffer over-read in MADCardHolderInfoDecode
2026-06-02 20:41:29 +02:00
achazal 10cd87175d Fix buffer over-read in MADCardHolderInfoDecode 2026-06-02 19:04:11 +02:00
achazal 6aa8a2f892 Fix MAD1 off-by-one in MADDecode: loop read Key A as 16th AID 2026-06-02 19:02:05 +02:00
achazal 2c27d4fc10 Fix NULL dereference in MAD print_aid_description 2026-06-02 18:56:24 +02:00
Iceman c46b72ee2b Merge pull request #3349 from AlxCzl/fix-3346
Fix MADDecode off-by-one (#3346): mad[] sized for 39 entries but 40 written when MAD2 present
2026-06-02 17:25:18 +02:00
Iceman e1228eed5d Merge pull request #3350 from AlxCzl/fix-strcat
Fix -Werror=stringop-truncation build failure in fileutils.c
2026-06-02 17:22:09 +02:00
Iceman 95b73e2605 Merge pull request #3351 from AlxCzl/fix-3347
Fix NULL dereference (#3347) in emv_pki_decode_message
2026-06-02 17:20:51 +02:00
orbisai0security 94c0fc2edd Hardening: explicitly set shell=False on all subprocess.run() calls in fm11rf08s_recovery.py.
All four call sites already pass `cmd` as a Python list, so Python's default of `shell=False` means there is no active command-injection risk. This change makes the security intent explicit, prevents accidental future regression if a call site is later changed to pass a string, and improves code clarity.

No functional behaviour is changed.
2026-06-02 17:12:31 +02:00
achazal 8465ea9cba fix NULL dereference (#3347) in emv_pki_decode_message when crypto_pk_encrypt fails 2026-06-02 17:10:57 +02:00
achazal d4c4ab30c7 fix MADDecode off-by-one (#3346): mad[] sized for 39 entries but 40 written when MAD2 present 2026-06-02 17:03:50 +02:00
achazal c29afcbe8c Fix -Werror=stringop-truncation build failure in fileutils.c 2026-06-02 16:49:47 +02:00
team-orangeBlue 0fdfb6d516 Add Mifare Plus SE post-1K keys
Used by mfp+se tags for sectors above 15; since the tags have no originality sector as such and rely on theoretically re-using the 2K chip dies, this can help recover keys for a fully custom-keyed Plus SE tag (should someone buy them as MFC1Ks for whatever reason).

Signed-off-by: team-orangeBlue <63470411+team-orangeBlue@users.noreply.github.com>
2026-06-01 21:19:43 +03:00
kormax 169b5ed9c6 Add new AID entries to 'aidlist.json' 2026-05-31 11:16:15 +03:00
kormax 485ae4ed9c Add new entries to 'ecplist.json' 2026-05-31 10:52:32 +03:00
kormax c77c7c6d39 Save startup info in 'hf calypso dump' 2026-05-30 14:20:59 +03:00
kormax 32db41914d Add updated data object extraction to 'hf calypso dump' 2026-05-30 10:28:24 +03:00
Iceman 8e5d05540f Merge pull request #3341 from kormax/ecplist-new-entries
Add new entries to 'ecplist.json'
2026-05-30 04:32:47 +02:00
kormax 9fca371bc4 Add new entries to 'ecplist.json' 2026-05-29 22:31:48 +03:00
team-orangeBlue d859b224d2 Fix 4K dumping
A missed multiplier broke dump saving

Signed-off-by: team-orangeBlue <63470411+team-orangeBlue@users.noreply.github.com>
2026-05-29 15:33:44 +03:00
team-orangeBlue ee14761c22 Fix MAC calculation
Doing non-first auth would reset counters, breaking MAC calculation and crypto as a whole

Signed-off-by: team-orangeBlue <63470411+team-orangeBlue@users.noreply.github.com>
2026-05-29 13:27:09 +03:00
team-orangeBlue 021ec18506 Add quickdump support
Mifare Plus can now be dumped quickly.
This is achieved by using a mix of READ RANGE, skipping reply MACs, requesting data in plaintext (almost) as much as possible, and also avoiding card + crypto restarts.

1K tags now require 3 seconds; 2k require just shy of 6; 4k require 8.

Previously the time for 2k tags was 9 seconds. While the improvement is pretty small, it helps out.

Signed-off-by: team-orangeBlue <63470411+team-orangeBlue@users.noreply.github.com>
2026-05-29 13:05:00 +03:00
team-orangeBlue 3c3d0e275c Compiler fix
Signed-off-by: team-orangeBlue <63470411+team-orangeBlue@users.noreply.github.com>
2026-05-29 12:49:43 +03:00
team-orangeBlue e6c29a9301 Support auth4
All commands now do AuthFirst with the ability to change to NonFirst

Signed-off-by: team-orangeBlue <63470411+team-orangeBlue@users.noreply.github.com>
2026-05-29 12:46:16 +03:00
team-orangeBlue b3fc5848b1 Add block count support
mfp_data_crypt can now work with read range

Signed-off-by: team-orangeBlue <63470411+team-orangeBlue@users.noreply.github.com>
2026-05-29 12:36:50 +03:00
team-orangeBlue 7164cea9c0 Declare function
Add support for non-first auth

Signed-off-by: team-orangeBlue <63470411+team-orangeBlue@users.noreply.github.com>
2026-05-29 12:35:42 +03:00
team-orangeBlue b9becbc817 Add non-first auth support
Overhaul of the auth function

Now a new bool can be passed if the auth coming in is meant to be a followup.
This avoids regeneration of Ti. Maybe that's faster.

Not functional for any management key.

Signed-off-by: team-orangeBlue <63470411+team-orangeBlue@users.noreply.github.com>
2026-05-29 12:32:30 +03:00
team-orangeBlue 1b19a9e3e8 Implement nonfirst
Add support for non-first mifare plus auth

Signed-off-by: team-orangeBlue <63470411+team-orangeBlue@users.noreply.github.com>
2026-05-29 12:17:02 +03:00
team-orangeBlue d4796d8d10 Increase delay for ExchangeRaw14A
This function is primarily used by Mifare Plus auths.
One problem that is present is when using keys 9002 or 9003 to upgrade a card to a new security level, the card will likely spend more time than usual adjusting all settings before it replies, as such causing a timeout.

This increase fixes that.

Signed-off-by: team-orangeBlue <63470411+team-orangeBlue@users.noreply.github.com>
2026-05-29 12:15:54 +03:00
Philippe Teuwen fa8e200c5b mfulc_counterfeit_recovery: faster vuln check 2026-05-28 23:58:09 +02:00
Philippe Teuwen f22dd43cfc mfulc_counterfeit_recovery: faster writes 2026-05-28 23:37:29 +02:00
Philippe Teuwen b13a8ce1d5 mfulc_counterfeit_recovery --cuda: dummy call to wake up the GPU ahead 2026-05-28 23:24:14 +02:00
kormax df9d89a3f4 Add new entries to 'aidlist.json' 2026-05-28 17:12:23 +03:00
kormax 624e67a90b Add new Mifare AID values to 'aidlist.json' 2026-05-27 17:26:03 +03:00
kormax bdf1ce1847 Detect MF on cards that don't return LID in FCP 2026-05-26 21:04:43 +03:00
kormax 17097254d1 Split Calypso dump filesystem LID candidate generation into presets 2026-05-26 20:15:23 +03:00
kormax f5fd7d4f77 Ensure dumped Calypso LID values are attempted in ascending order 2026-05-26 20:15:23 +03:00
iceman1001 79c210cba9 changed helptext to point to new command 2026-05-25 22:44:16 +02:00
iceman1001 9f3e911f63 change to try to identify standard keys, mad, faster for static encrypted nested cards in order to select SEN key recovery earlier 2026-05-25 22:21:07 +02:00
iceman1001 3eec567193 fix simple way to add ansi printing in output. No need for white wall of text anymore 2026-05-25 22:19:53 +02:00
Iceman e61b1c0daf Merge pull request #3335 from kormax/new-calypso-nodes
Add new calypso nodes
2026-05-25 20:00:34 +02:00
Iceman 8f68e39012 Merge pull request #3330 from C2Pwn/master
hf mf sen autopwn integration and GUI fixes
2026-05-25 18:54:50 +02:00
kormax cb2252ae36 Tag Calypso nodes by observed card type 2026-05-25 17:07:19 +03:00
kormax 9a0df28af5 Add new known Calypso nodes 2026-05-25 17:05:03 +03:00
klks ad6faf003d Make style fix 2026-05-25 20:52:51 +08:00
klks 57986fd141 fix compile issue 2026-05-25 20:40:08 +08:00
klks 6d859fac43 Update to align to pm3 coding guidelines 2026-05-25 20:33:29 +08:00