Commit Graph

13606 Commits

Author SHA1 Message Date
klks b5bcf1654d Fix code formatting, added a few more bounds checks and warnings 2026-05-25 12:45:12 +08:00
klks 1ef2053675 Removed m-dashes and code formatting 2026-05-25 10:57:39 +08:00
klks b3936ff61b Merge branch 'master' of https://github.com/klks/proxmark3 2026-05-25 06:46:39 +08:00
klks ed5d7d2b0c Add FMCOS TID card support 2026-05-25 06:46:29 +08:00
Iceman fb19d4c758 Merge pull request #3323 from shuffle2/py
python fixes
2026-05-24 16:51:09 +02:00
kormax cc73796d5a Add new AID entries related to Calypso 2026-05-24 16:41:54 +03:00
klks cec95558df Merge branch 'master' of https://github.com/klks/proxmark3 2026-05-24 19:12:26 +08:00
klks e1152fc98a Add native fmcos support to pm3 2026-05-24 19:12:12 +08:00
Iceman 54fa865d2b Merge pull request #3324 from kormax/calypso-dump-rework
Rework `hf calypso dump` command
2026-05-23 14:42:25 +02:00
kormax 4081cc8b79 Rework 'hf calypso dump' command 2026-05-23 14:50:00 +03:00
Shawn Hoffman 148e5ed2d1 python fixes
now, one can do "script run mything.py" multiple times without
crashing, and exit codes are correct.

Pm3PyRun_SimpleFileNoExit:
* use XDECREF instead of DECREF (handles possible nullptr).
* don't double-free "er".
* print exit status correctly.

CmdScriptRun:
* allow invoking scripts multiple times.
* fix memleak of argtable contents if help path not triggered.
* configure_c_stdio should be 0 or 1, not < 0.
* py_conf: don't explicitly set options to their default values, it's confusing.
* Call Py_Finalize only when exiting pm3.

main_loop:
* cleanup cmdscript from main_loop. Important to call
  Py_Finalize from here in case Qt is used (in which case
  main_loop is on Qt thread).

ProxGuiQT::MainLoop:
* reduce timer delay to 0 - there isn't a need to wait here.
2026-05-22 16:38:59 -07:00
Philippe Teuwen 65de25c67e Avoid false buffer overflow warning in GCC 11
GCC 11 can’t prove PRIu64 won’t expand beyond two digits, so we switch this formatter to bounded unsigned int fields (%02u) after clamping logic.
2026-05-22 19:06:48 +02:00
Philippe Teuwen 20aaf4c292 mfulc_counterfeit_recovery.py: add --get_frequent_chal and --unlock 2026-05-22 18:52:02 +02:00
Iceman 62aa2ad892 Merge pull request #3322 from kormax/felica-new-services
Add new FeliCa services, move FeliCa resource into a subdirectory
2026-05-22 18:51:11 +02:00
kormax 9489614412 Move FeliCa resources under a dedicated subdirectory 2026-05-22 19:24:47 +03:00
kormax fbf8833486 Add new known FeliCa services 2026-05-22 19:19:09 +03:00
Philippe Teuwen c5e35b26a6 Add --force to mfulc_counterfeit_recovery.py 2026-05-22 11:12:17 +02:00
Philippe Teuwen ea3343156e mfulc_counterfeit_recovery.py: add --cuda to call the CUDA implementation of mfulc_des_brute 2026-05-22 00:26:22 +02:00
Connor Milligan 590edbcc3f Native client support for mfulc desbrute 2026-05-22 00:19:07 +02:00
Philippe Teuwen 16706aeeac pm3_help2json.py: fix deprecation warning 2026-05-21 21:00:58 +02:00
Philippe Teuwen d078e8a62b make style 2026-05-21 20:54:44 +02:00
kormax 9ff1183740 Add data-based SELECT command annotation for calypso 2026-05-21 17:10:42 +03:00
Connor Milligan cc7b235a5b Native client support for FM11RF08S SEN recovery 2026-05-21 01:19:15 +02:00
kormax 548358faa4 Add new Calypso LID nodes from MOBIB 2026-05-20 18:00:11 +03:00
kormax aa3c2bcb0d Move known Calypso LID nodes to a JSON resource 2026-05-20 18:00:11 +03:00
kormax 4b95f58511 Add new EF LID values for use in 'hf calypso dump' 2026-05-19 20:59:16 +03:00
Iceman 84d2810738 Merge pull request #3294 from YoungJules/legic_improvements
add native LEGIC clone workflow
2026-05-19 17:11:16 +02:00
Philippe Teuwen 729a8748d9 Fix vec dep with cmake 2026-05-19 09:36:32 +02:00
YoungJules 1072aa3097 Apply same percent-s formatting to PrintAndLogEx calls for hdr1. Not strictly needed from a security standpoint but makes the code prettier and next developer will not be left left wondering why hdr0 is handled differently to hdr1 2026-05-19 09:24:54 +02:00
Philippe Teuwen fe82cae1df Add vec in cliuent deps 2026-05-19 00:37:37 +02:00
Philippe Teuwen d8c7f84598 Add Makefile PLATFORM_FILE variable to specify another Makefile.platform file 2026-05-19 00:10:17 +02:00
kormax cfa144a3e3 Annotate known IDM prefixes in 'hf felica info' 2026-05-18 18:06:59 +03:00
iceman1001 266cee1f31 added more non-zero key tests to desfire self tests 2026-05-18 06:09:41 +02:00
iceman1001 4984db4191 fix #3316 , wrong input to context generates wrong sessionkeys on Ev2. Added test with non-zero key to capture it 2026-05-18 06:01:14 +02:00
kormax b66946c704 Implement 'hf calypso probecmdcompat' command 2026-05-17 13:01:09 +03:00
kormax 74c09abad9 Add new entries to 'aid_desfire.json' 2026-05-16 17:42:09 +03:00
kormax 400dad8e59 Add new entries related to DESFire Lite to 'aidlist.json' 2026-05-16 17:41:31 +03:00
Iceman 6ecb18c10f Merge pull request #3309 from kormax/aidlist-desfire-improvements
DESFire-related improvements to `aidlist.json`
2026-05-15 18:23:32 +02:00
kormax 4479f2e921 Add DESFire ISOFID to extras in 'aidlist.json' 2026-05-15 17:50:39 +03:00
kormax 6b397b67be Add DESFire AID to extras in 'aidlist.json' 2026-05-15 17:50:29 +03:00
kormax 58f82357ac Add new entries to 'aidlist.json' 2026-05-15 17:50:13 +03:00
Iceman 537f844ce4 Merge pull request #3301 from suut/desfire-ev3c-support__create-mapping
Desfire EV3C Support: create MFC mapping
2026-05-14 18:50:53 +02:00
suut 5c376032ed hf mfdes createmfcmapping: review comments 2026-05-14 18:39:12 +02:00
kormax 551b3bae28 Introduce protocol-scoped 'Extras' field to 'aidlist.json' 2026-05-14 09:10:22 +03:00
kormax 462592f713 Attempt shorter Calypso AID values first for 'info' and 'dump' 2026-05-14 08:30:05 +03:00
kormax 7ff2d017a4 Update AID name matching priority for Calypso 2026-05-14 08:23:36 +03:00
Iceman e95b1060a4 Merge pull request #3306 from kormax/calypso-aid-values
Add more Calypso-related AID entries to 'aidlist.json'
2026-05-13 20:28:36 +02:00
kormax 8eacb30ed2 Add more Calypso-related AID entries to 'aidlist.json' 2026-05-13 21:21:45 +03:00
Sanduuz 2d1fbc12c0 Add prime.c containing mifare_prime_get_version_str symbol to experimental client lib CMakeLists.txt 2026-05-13 15:43:52 +03:00
Iceman d9ed0b310f Merge pull request #3302 from kormax/calypso-improvements
Calypso improvements
2026-05-12 21:53:17 +02:00