RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2024-09-23 00:37:14 +08:00
Code Issues Packages Projects Releases Wiki Activity
17287 commits 3 branches 14 tags 86 MiB
Commit graph

10817 commits

Author SHA1 Message Date
iceman1001 115e85e5d4 missing defines 2023-10-02 21:01:08 +02:00
iceman1001 89db5d3875 text 2023-10-02 20:59:01 +02:00
iceman1001 fb23d2047f reworked the JSON format for 14a, 14b, 15, cryptorf, lto, NDEF.\nDeprecated EML format. Pm3 client do not save EML files any more.nPm3 client will continue to load EML files. 2023-10-02 20:11:23 +02:00
iceman1001 bb5d61dca7 added some helper functions 2023-10-01 13:05:08 +02:00
iceman1001 7320f0dd16 thanks @gentilkiwi for pointing it out 2023-09-29 21:41:27 +02:00
iceman1001 278a179308 fixed sim fw 2023-09-29 20:50:39 +02:00
iceman1001 59d67b3606 fix newline in output 2023-09-28 08:54:32 +02:00
iceman1001 1234b08132 adapt to new sim module firmware version 2023-09-28 08:46:04 +02:00
iceman1001 f9f42337c3 Sim Module FW4.42 build from GentilKiwis C impl. 2023-09-28 08:35:48 +02:00
iceman1001 44fe3ec38f smart raw --timeout parameter 2023-09-27 22:09:01 +02:00
iceman1001 b0ec0ee60b maur 2023-09-19 16:36:39 +02:00
iceman1001 b6e1344e1c added a custom timeout parameter to the smart raw command 2023-09-16 18:38:53 +02:00
iceman1001 3ff659fd98 fix newline issue 2023-09-16 09:31:42 +02:00
iceman1001 ec0d27685c adapt script to handle SE SAM again 2023-09-16 09:22:45 +02:00
iceman1001 d7f306084a colors for kiwi 2023-09-15 21:48:57 +02:00
iceman1001 ce76e4e351 update ATR list 2023-09-15 21:44:02 +02:00
iceman1001 25ab507137 length var is set in the preamble check... 2023-09-14 05:15:38 +02:00
iceman1001 ddfbd7f549 allow for t55xx detection to search for 0xE039 (Silicon Craft technology) 2023-09-13 21:12:09 +02:00
spandox2 5baba1fd43
Update cmdhfmf.c 
Signed-off-by: spandox2 <31641448+spandox2@users.noreply.github.com>
 2023-09-11 13:48:09 -04:00
spandox2 7a832e175e
Update cmdhfmf.c 
Signed-off-by: spandox2 <31641448+spandox2@users.noreply.github.com>
 2023-09-11 13:43:41 -04:00
spandox2 b9efd8ce48
Update cmdhfmf.c 
text change

Signed-off-by: spandox2 <31641448+spandox2@users.noreply.github.com>
 2023-09-11 13:24:54 -04:00
spandox2 67bfddde57
Update cmdhfmf.c 
Changed ERR to HINT

Signed-off-by: spandox2 <31641448+spandox2@users.noreply.github.com>
 2023-09-11 13:18:56 -04:00
spandox2 5584410bbc
Update cmdhfmf.c 
Problem: "hf mf autopwn" gave no response if no card was detected, leaving user confused.
Solution: Change a DEBUG message to an ERR and give a hint that the card may be poorly positioned.

Signed-off-by: spandox2 <31641448+spandox2@users.noreply.github.com>
 2023-09-11 11:56:45 -04:00
spandox2 cf92d8edc0
Update cmdhfmf.c 
Changed line 2510 to change DEBUG to ERR

Signed-off-by: spandox2 <31641448+spandox2@users.noreply.github.com>
 2023-09-11 11:43:04 -04:00
iceman1001 4632e15dab maur... 2023-09-10 19:51:21 +02:00
Iceman b9bb72ce8e
Merge pull request #2107 from Antiklesys/master 
Update hf_mf_ultimatecard.lua
 2023-09-10 17:14:52 +02:00
Antiklesys 77258365d4 Update hf_mf_ultimatecard.lua 
Fixed bug, should be 13 instead of 12 as there are two 12 otherwise and this is referring to the 128b one instead
 2023-09-10 23:03:53 +08:00
Iceman 9a5c262ccf
Merge pull request #2106 from nvx/feature/iclass_epurse_credit 
Add `hf iclass creditepurse` command to allow crediting the epurse debit value
 2023-09-10 15:20:11 +02:00
nvx 186308cb4a Add hf iclass creditepurse command to allow crediting the epurse debit value. 2023-09-10 23:00:23 +10:00
Antiklesys 2fb281bdc1 Update iclass_default_keys.dic 2023-09-10 19:11:21 +08:00
Antiklesys b57f90b524 Update hf_mf_uidbruteforce.lua 
Fixed issue with how the command is run, old version is invalid as it is missing the -t
 2023-09-10 19:09:18 +08:00
Antiklesys f29c409275 Merge branch 'master' of https://github.com/Antiklesys/proxmark3 2023-09-10 19:07:38 +08:00
iceman1001 b59fad842b reworked the decimal to hexadecimal converter. It now works. Thanks to @ATK for pointing out it was broken 2023-09-10 10:25:51 +02:00
iceman1001 f9877f79de Revert "Release v4.17140 - Raccoon" 
This reverts commit 6ca0ce704a.
 2023-09-09 11:00:00 +02:00
iceman1001 6ca0ce704a Release v4.17140 - Raccoon 2023-09-09 11:00:00 +02:00
Philippe Teuwen cf16e71244 Fix cmake, stringop-overflow false positives are not specific to MINGW 2023-09-07 23:44:31 +02:00
Philippe Teuwen 3aeb5c493f fix a few cppcheck warnings 2023-09-07 22:28:37 +02:00
Philippe Teuwen d97f417ee6 Fix clang warnings on increasing alignment requirements 2023-09-07 21:00:07 +02:00
Philippe Teuwen d74e264250 style 2023-09-07 20:13:18 +02:00
iceman1001 9ddbdad8cb added keys from #2019 unknown if they are static 2023-09-06 10:59:21 +02:00
Iceman 3141c6a249
Merge pull request #2102 from ernestask/wip/ernestask/vilniečio-kertelė 
dictionaries: Add keys for Vilnius public transit card
 2023-09-06 10:53:18 +02:00
Ernestas Kulik cc846216d2 dictionaries: Add keys for Vilnius public transit card 2023-09-06 09:41:34 +03:00
Harry Sintonen e5941bcf3a fix crc render position when data len is multiple of 16 2023-09-05 16:38:33 +03:00
iceman1001 32f892e512 fix 14b dump 2023-08-29 22:37:56 +02:00
iceman1001 0cbc0c2f8b fix CID #416734 2023-08-29 21:45:15 +02:00
iceman1001 4e411bec22 fixing false positives 2023-08-29 10:57:05 +02:00
iceman1001 0810f07a41 improving false positive for 14b SR tags 2023-08-28 18:00:32 +02:00
iceman1001 71961501d4 text 2023-08-28 15:36:01 +02:00
Iceman eaef707fb0
Merge pull request #2094 from kormax/master 
Remove duplicate MFP definitions. Update AIDlist
 2023-08-24 20:49:30 +02:00
kormax 15ee28c7be Add SEOS AIDs 2023-08-24 21:39:59 +03:00
Iceman aa0bd3ea17
Merge pull request #2093 from d18c7db/master 
Merged hi_reader and hi_reader_15 into one file, some minor tidy up in files
 2023-08-24 20:38:09 +02:00
Alex f47e4ed115 Move hardcoded value where it belongs 
Keep FPGA parameters together in the same place
 2023-08-24 18:22:50 +02:00
Anže Jenšterle 62da4017a0
Add Slovenian Mercator Pika keys 
Signed-off-by: Anže Jenšterle <anze@anze.dev>
 2023-08-24 15:26:48 +02:00
iceman1001 279d6486c1 stylish 2023-08-24 10:22:18 +02:00
iceman1001 9659bc85fe maur keys 2023-08-24 10:20:28 +02:00
iceman1001 424e68dff6 fixing the wrong calculations 2023-08-24 10:20:01 +02:00
nvx 8dd963d305 make style 2023-08-24 16:34:33 +10:00
nvx 42330fc5ed Misc tidyups replacing magic numbers with defines, 
better help text, and some added comments
 2023-08-24 15:08:11 +10:00
nvx a2a3142355 Improve iClass SIO and legacy credential detection to improve 
reliability. Now relies on the legacy config block for SR detection
and the end-of-SIO detection no longer partially cuts off the SIO
for any dumps I have.
 2023-08-23 09:27:05 +10:00
Iceman 4547a1beba
Merge pull request #2086 from nvx/feature/cmd_iclass_esetblk 
Adds `hf iclass esetblk`, equivalent to `hf mf esetblk`
 2023-08-22 19:22:35 +02:00
nvx bc87615008 Fix help text for hf iclass esetblk 2023-08-23 02:45:05 +10:00
Iceman 4b9b545bbf
Merge pull request #2082 from rdmitr/configure-num-cores 
Configurable number of CPU cores.
 2023-08-22 07:35:18 +02:00
nvx 210d2847ae Adds hf iclass esetblk, equivalent to hf mf esetblk 
Also some minor tweaks to make commands.json and commands.md
properly on Windows.
 2023-08-22 07:45:05 +10:00
Roman D 908b8ca0b3 Limit configurable CPU count to the number of detected CPU cores. 2023-08-21 22:24:13 +02:00
Iceman e602287839
Merge pull request #2081 from rdmitr/fix-macports-makefile 
Fix macports Makefile configuration.
 2023-08-21 07:06:47 +02:00
Adam Jon Foster 44888f6015
Update mfc_default_keys.dic 
Added 4 keys extracted from old dumps on Edith Cowan University Smart rider cards

Signed-off-by: Adam Jon Foster <me@evildaemond.com>
 2023-08-18 12:55:56 +08:00
Roman D 20f8901368 Fix macports Makefile configuration. 2023-08-17 12:43:08 +02:00
Roman D dfabad37d9 Configurable number of CPU cores. 2023-08-17 12:41:34 +02:00
coderxian 9a70bf1aec Fixes issue 2076 2023-08-15 17:17:46 -05:00
Iceman 13444d9699
Merge pull request #2079 from d18c7db/master 
Vocabulary file became appended to itself
 2023-08-15 21:11:08 +02:00
Alex 8ae97d1094 Vocabulary file became appended to itself 
Remove duplicated data
 2023-08-15 09:31:00 +02:00
Henry Gabryjelski db8f91d7e1 make logfile more unique (per client run) 2023-08-14 20:01:20 -07:00
Alex 4b1090c8c7 Rename "vocabulory" to "vocabulary" 2023-08-09 19:49:55 +02:00
Alex 6947a61d98 Whitespace 2023-08-09 14:30:07 +02:00
Alex c26583ebfd Bugfix to keyboard scrolling 
At zoom levels above x16 the left and right keys only scroll the graph buffer to the left, even if right key is pressed. Mouse wheel behaves correctly.
Enabled mouse wheel to zoom when control is pressed since that is the more standard UI convention (but left shift scrolling in place).
Minor changes to zooming, using more intuitive constants.
 2023-08-09 13:37:38 +02:00
Anton Todorov 6781dadc30
emv: display the transaction time as HH:MM:SS 
in the transaction log

Signed-off-by: Anton Todorov <ANTodorov@users.noreply.github.com>
 2023-08-06 14:27:58 +03:00
DidierA 22bc398b48 Bugfix: data atr -t was reading uninitialized data 2023-08-03 14:44:27 +02:00
iceman1001 eaf11127be since HF SEARCH triggers multiple swaps of FPGA image HF -> HF 15 -> HF FELICA , its better to have relevant checks when the correct fpga image is loaded 2023-08-03 12:55:06 +02:00
iceman1001 0e84860c2f less inline calls 2023-08-03 08:42:52 +02:00
iceman1001 24a138eeb1 fix some potential empty responses and too much inline calls 2023-08-03 08:41:11 +02:00
iceman1001 de98e4e161 fix conflit 2023-08-03 07:30:27 +02:00
Philippe Teuwen cb72897b17 mkversion.sh: now regenerates version_pm3.c (and consequently the binaries) only when needed 
and add --force to forcibly regenerate version_pm3.c

and small fixes:
* document mkversion.sh usage
* remove call to mkversion.sh in client/experimental_lib/CMakeLists.txt on release
* remove call to old `mkversion.pl` in bootrom/Makefile
* just in case, mkversion.sh takes care of atomic write of the file
 2023-08-03 01:03:24 +02:00
iceman1001 fd987ab8a2 fix string formatter 2023-08-02 23:47:25 +02:00
iceman1001 5b58e438b1 style 2023-08-02 22:41:35 +02:00
Iceman 44352ac586
Merge pull request #2063 from ZeroChaos-/master 
define proxguiqt.cpp depends to avoid parallel/shuffle build failure
 2023-08-02 21:50:32 +02:00
iceman1001 d6a0f8edac use string instead 2023-08-02 19:56:29 +02:00
iceman1001 1e26d79ddd added a new command to lookup ATR arrays 2023-08-02 19:50:47 +02:00
iceman1001 1c35f14c76 thanks @DidierA for the sharp eyes 2023-08-02 19:49:26 +02:00
Rick Farina (Zero_Chaos) 8f2b71ffc4
fix parallel build for proxguiqt.moc.cpp 
seed shuffle=2866679623 found that proxguiqt.moc.cpp also needs the same
header so just defining the header and defining it's needs should make
everyone happy
 2023-08-02 13:00:32 -04:00
iceman1001 2b3d339714 lto missing inits 2023-08-02 17:46:53 +02:00
iceman1001 602daa7fdd missing inits 2023-08-02 17:40:55 +02:00
iceman1001 4ee7b78a07 always make sure resp is initialized 2023-08-02 17:36:50 +02:00
Rick Farina (Zero_Chaos) 0b70a10145
proxguiqt.cpp also needs ui_image.h to build 
This fixes the next parallel build failure in the current shuffle seed.
 2023-08-02 11:30:18 -04:00
Rick Farina (Zero_Chaos) f451be5877
proxguiqt.cpp needs ui_overlays.h to build 
Fixes: https://github.com/RfidResearchGroup/proxmark3/issues/2062
 2023-08-02 11:28:48 -04:00
Iceman 0388682591
Merge pull request #2061 from pentoo/master 
fix -Wstringop-overread error
 2023-08-02 15:57:34 +02:00
Iceman c5dff6a55f
Merge pull request #2059 from ZeroChaos-/master 
fix lto-type-mismatch in guidummy.cpp
 2023-08-02 15:54:38 +02:00
Rick Farina (Zero_Chaos) 6b648396e7
fix -Wstringop-overread error 
We are reading this 26 bytes into a 32 byte buffer, is this even any
worse?
Fixes: https://github.com/RfidResearchGroup/proxmark3/issues/2060
 2023-07-31 23:33:36 -04:00
Rick Farina (Zero_Chaos) d522a46fca
fix lto-type-mismatch in guidummy.cpp 
link time optimization requires all functions named the same to actually
operate the same.  I am pretty sure this fixes it without breaking
anything.
Fixes: https://github.com/RfidResearchGroup/proxmark3/issues/2058

src/proxgui.h:35:6: error: type of ‘ShowPictureWindow’ does not match original declaration [-Werror=lto-type-mismatch]
   35 | void ShowPictureWindow(uint8_t *data, int len);
      |      ^
src/guidummy.cpp:33:17: note: type mismatch in parameter 2
   33 | extern "C" void ShowPictureWindow(char *fn) {
      |                 ^
src/guidummy.cpp:33:17: note: type ‘void’ should match type ‘int’
src/guidummy.cpp:33:17: note: ‘ShowPictureWindow’ was previously declared here
 2023-07-31 15:57:09 -04:00
kormax ef79fb91eb Add annotation for new DESFire command code 2023-07-31 12:48:40 +03:00
iceman1001 48b61c6438 ATR from the flipper zero seader project 2023-07-30 21:21:59 +02:00