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

3602 commits

Author SHA1 Message Date
iceman1001 398803d930 adapt size of return messages in 14b 2024-01-07 22:34:08 +01:00
iceman1001 0c4a1066c1 text 2024-01-05 19:27:38 +01:00
iceman1001 b1a1ca8827 Revert "Release v4.17768 - Steamboat Willie" 
This reverts commit 57eeb712fd.
 2024-01-03 01:59:39 +01:00
iceman1001 57eeb712fd Release v4.17768 - Steamboat Willie 2024-01-03 01:59:39 +01:00
iceman1001 238572c337 style 2024-01-01 21:52:05 +01:00
iceman1001 21e54ba9b1 adjust 14b apdu which seems to trigger memory corruption device side 2024-01-01 21:49:32 +01:00
iceman1001 c54f6af925 code style, remove unneeded UID array allocations since we just dont use the UID later in those functions 2023-12-31 09:56:46 +01:00
iceman1001 3df5fb6d40 cleaned up style 2023-12-31 09:43:45 +01:00
iceman1001 873c1e57a3 cleaned up and reduced number of arrays used 2023-12-31 09:36:25 +01:00
iceman1001 f840dc810b made keytype instead of fixed keyB. would help in situations keyB is readable... 2023-12-31 09:35:42 +01:00
iceman1001 1f4f5febae adapt magic detection and textual output. Hf mf info - now uses found keys to send for magic detection 2023-12-30 23:08:58 +01:00
nvx 8f577ad963 Improved magic detection 
Magic detection no longer stops when a single type is found as cards may support multiple types of magic, so all detected types will be reported now.
GDM/USCUID chips are now detected when GDM magic auth is disabled but magic WUP (40 or 20) is enabled.
Gen2/CUID/DirectWrite is now detected when default keys and ACLs are used by attempting to write to block 0 but aborting before actually completing the write.
 2023-12-30 19:53:23 +10:00
nvx 33eaaa535f Changed hf_cardhopper standalone mode to allow running over the internal Proxmark3 USB-CDC serial port. 
This functionality can be enabled by adding the following to your Makefile.platform:
STANDALONE_PLATFORM_DEFS+=-DCARDHOPPER_USB
 2023-12-29 22:06:57 +10:00
iceman1001 0eea4e31c4 fiddling with thinfilm, which suffers in simulation 2023-12-18 22:18:21 +01:00
iceman1001 f8f135a3b7 style 2023-12-18 10:11:11 +01:00
iceman1001 1c8b2110bb reduce stack usage 2023-12-15 16:39:42 +01:00
iceman1001 20d95fa3ea remove some more parity arrays 2023-12-15 09:33:02 +01:00
iceman1001 30c7ce1335 wait until timeout 2023-12-15 09:22:35 +01:00
iceman1001 c210b370fe remove par 2023-12-15 09:13:20 +01:00
iceman1001 70520af03b style 2023-12-14 23:38:04 +01:00
iceman1001 6b9963b12a forgot to free the allocated memory 2023-12-14 23:37:37 +01:00
iceman1001 ab0ee92f57 the par[] array allocation was the root cause for the stack smashing. Making one static array to be reused across 14a functions took care of the issue.\nalso made the command allocation for ISO14 APDU sending a bigbuf allocation instead. Since nothing in the APDU has to do with EMULATOR memory etc. The trace log grows from start of bigbuff, allocations grows from end of bigbuff 2023-12-14 23:35:30 +01:00
iceman1001 95d1d5646f an attempt to reduce some stack memory. No need for the debug printing to be 512 bytes. Now limited to 200 chars 2023-12-14 23:29:43 +01:00
iceman1001 f4f832e121 style 2023-12-14 00:33:02 +01:00
iceman1001 ee1534103b make sure to turn off the antenna if entering this state 2023-12-14 00:31:09 +01:00
iceman1001 17ab86c52c make sure limit match up with the multiple of 4 bytes alignment 2023-12-14 00:30:15 +01:00
merlokk 2517e8b345 make style 2023-12-12 01:11:10 +02:00
merlokk 91892bc1bf add static encrypted nonce detection 2023-12-11 21:24:26 +02:00
merlokk ebe9d72cc2 set debug log level 2023-12-11 18:46:25 +02:00
iceman1001 97e2d7f026 changed "data num" to accept -r -i parameters where it will reverse or inverse the values.\nrenamed some util functions 2023-12-07 16:44:31 +01:00
iceman1001 89bcdcddbc style 2023-12-06 22:42:16 +01:00
iceman1001 fdc1c9d864 text 2023-12-06 22:16:53 +01:00
Anonymous cdafe764f1 Merge branch 'unisniff' of https://github.com/hazardousvoltage/proxmark3 into unisniff 2023-12-03 08:46:26 -05:00
Anonymous 9b752c6ecb hf_unisniff: rename "ask" to "user" to avoid confusion with "ASK" sniffing 2023-12-03 08:44:06 -05:00
Iceman 56d957a689
Merge pull request #2192 from hazardousvoltage/unisniff 
Implement hf_unisniff, 14a/14b/15 sniffer with runtime selection and more save options
 2023-12-03 07:10:06 +01:00
wh201906 bb529a9077
Fix corrupted data caused by CMD_WTX 
No need to wait for 2.5s (1s + FPGA_LOAD_WAIT_TIME) if the real-time
sampling stops.
Make sure the LF bitstream is loaded before real-time sampling so the
response of CMD_WTX won't appear.
 2023-12-02 17:04:03 +08:00
Anonymous 322411c44f Implement hf_unisniff, 14a/14b/15 sniffer with runtime selection and more save options 2023-12-01 22:39:46 -05:00
iceman1001 a913b2c662 style 2023-12-01 10:59:18 +01:00
Iceman 17a93a3b1b
Merge pull request #2173 from wh201906/lf_sniff_clean 
Real-time LF sampling
 2023-12-01 10:54:10 +01:00
nvx 7b0ca43695 Fix iClass dump truncating the AA2 area and improve dump reliability by fixing cmd retry delays. 2023-11-26 19:04:54 +10:00
wh201906 3ee13c9ba6
Apply suggestions from @henrygab 
Check if memory allocation fails
Fix memory leak
Initialize struct in declaration
Add/Fix some notes
Remove unlikely() in favor of readability
Remove a hard-coded magic number
 2023-11-15 18:04:52 +08:00
Henry Gabryjelski 627cf6e3d5
Slow clock speed message update 
Signed-off-by: Henry Gabryjelski <henrygab@users.noreply.github.com>
 2023-11-14 01:52:02 -08:00
wh201906 ab9f49f86e
Some minor fixes 
Use longer timeout in WaitForRawDataTimeout() to handle CMD_WTX
Fix a wrong type
Apply changes to other similar part
Remove unused instructions
 2023-11-14 10:46:45 +08:00
wh201906 b4cc7c02cd
Real-time LF sampling mode on armsrc 2023-11-14 01:43:20 +08:00
wh201906 9e8b1ceda7
Reduce duplicate payload structure for lf read/sniff 2023-11-14 01:05:27 +08:00
Philippe Teuwen 4f9016814e Revert "Release v4.17511 - Faraday" 
This reverts commit 6e9df18de6.
 2023-11-13 10:19:09 +01:00
Philippe Teuwen 6e9df18de6 Release v4.17511 - Faraday 2023-11-13 10:19:09 +01:00
Philippe Teuwen 73db5cb912 style: missing include of own header 2023-11-11 18:24:34 +01:00
iceman1001 d137b74de7 missing 2023-11-06 23:19:46 +01:00
iceman1001 6653bffe00 coverity fixes 2023-11-06 22:58:14 +01:00
iceman1001 bf6f5518ac fix overflow (@wh201906) 2023-11-06 17:12:03 +01:00
wh201906 2d48e33a99
Some small fix 2023-11-06 18:45:10 +08:00
wh201906 85e38ddc38
Add --ms option in hw status 
To specify the timeout of connection speed test
 2023-11-06 16:35:43 +08:00
iceman1001 82e7830e5b style 2023-10-30 22:20:55 +01:00
yah01 9d07ee497c Improve lf sampling performance 
Signed-off-by: yah01 <yah2er0ne@outlook.com>
 2023-10-27 13:47:26 +08:00
iceman1001 5ae919d8ee since we split the image for iclass, every time we swap back to hf / mf commands there is a penalty for swapping fpga image. this fix some allow for fast simulation part 2023-10-18 20:43:52 +02:00
iceman1001 1f3cf80898 style 2023-10-18 20:34:35 +02:00
iceman1001 185da09e62 we use calloc 2023-10-18 20:20:55 +02:00
iceman1001 efac735bad added support for HID SAM picopass communications. Nasty array copying but does the trick. Will need refactoring. 2023-10-18 19:59:34 +02:00
iceman1001 14a0e0bc72 fix old length for sim module 2023-10-18 15:18:58 +02:00
Jean-Michel Picod 8cc7022604 Remove compilation error. 
Function is already declared (non-static) in armsrc.
Compiler was complaining about re-defining a non-static func by a static
one.
 2023-10-17 19:33:59 +02:00
PhaseLoop 4003ad72fe update 2023-10-16 19:19:30 +00:00
iceman1001 026cd7d53d style 2023-10-15 13:21:16 +02:00
iceman1001 0f9f5f116c text 2023-10-15 10:11:27 +02:00
iceman1001 0ff41fa652 style 2023-10-12 14:53:26 +02:00
iceman1001 ef348a2aa0 adapt a bit 2023-10-12 14:51:18 +02:00
iceman1001 7cec258349 minor adjustments to texts 2023-10-09 20:09:22 +02:00
iceman1001 4986959706 fix logic for epurse updates 2023-10-09 15:48:01 +02:00
iceman1001 7b3e84c0d6 better fix for the PAGEMAP issue 2023-10-09 15:14:53 +02:00
iceman1001 d41f0c394e hf iclass wrbl - the pagemap bit maps isnt the best to handle all four cases. This atleast fixes one issue with them 2023-10-09 15:04:49 +02:00
iceman1001 60ff2351ba text 2023-10-09 12:47:00 +02:00
iceman1001 4f96d3eb46 style 2023-10-03 17:10:39 +02:00
iceman1001 010668ebb1 clean up 2023-10-02 21:39:15 +02:00
iceman1001 bb5d61dca7 added some helper functions 2023-10-01 13:05:08 +02:00
iceman1001 bb47bdd979 revert back to old timings 2023-09-28 08:34:29 +02:00
iceman1001 bf7ac0b8ce in prep for new firmware, no old v3xxx supported anymore 2023-09-27 21:34:51 +02:00
iceman1001 d8817f2cb2 style, length checks for getversion, bit comparision 2023-09-27 21:31:48 +02:00
iceman1001 3d92b44047 reduced time out for SCL 2023-09-27 21:30:30 +02:00
iceman1001 6ddf283272 adapt wait after ATR down to 1200 ms, and retries ten times now 2023-09-22 23:32:50 +02:00
iceman1001 78adf186d3 style 2023-09-17 17:41:58 +02:00
iceman1001 b6e1344e1c added a custom timeout parameter to the smart raw command 2023-09-16 18:38:53 +02:00
nvx 186308cb4a Add hf iclass creditepurse command to allow crediting the epurse debit value. 2023-09-10 23:00:23 +10: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 5c1b802e71 standalone doc 2023-09-08 20:45:44 +02:00
Philippe Teuwen 032e4b832e spurious exec mode on .c file 2023-09-08 20:32:23 +02:00
Philippe Teuwen 27edaa6d0c forgot fct declaration 2023-09-07 22:48:55 +02:00
Philippe Teuwen 3aeb5c493f fix a few cppcheck warnings 2023-09-07 22:28:37 +02:00
Philippe Teuwen d74e264250 style 2023-09-07 20:13:18 +02:00
iceman1001 5abae85eda legic sim should work now.... 2023-09-07 12:54:46 +02:00
iceman1001 276bd29da9 cleanup and fix shadowing var 2023-09-03 14:43:38 +02:00
iceman1001 3e034e146a remove unneeded line 2023-09-03 12:36:30 +02:00
Thomas Pedley e3cc8a98e9 Fix MFU authentication to send PACK correctly. 2023-08-30 08:05:23 +01:00
Alex b46e1cb556 Fix BUGBUG in fpgaloader.h, realign fpga\define.v with armsrc\fpgaloader.h 2023-08-29 11:27:50 +02:00
Alex 12efd96173 Remove define for FPGA_MAJOR_MODE_HF_FSK_READER since there in no support for it in FPGA 2023-08-29 11:27:32 +02:00
iceman1001 70bd5b80b5 limit clearing the bigbuff for 14b raw commands only to clear_trace flag 2023-08-28 17:59:48 +02:00
iceman1001 c8cfd4a517 text 2023-08-28 15:36:29 +02:00
iceman1001 114dda1582 After testing and verification its found that the SHALLOW MODULATION in HF is not working well in RDV4. Swapping from PWR_OE4 to PWR_OE1 makes it much better. Thanks to @d18c7db for solution and @gentlekiwi for testing and never giving up on finding the bug 2023-08-28 12:00:44 +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
startrekdude 0d442d7f19 Add hf_cardhopper standalone mode 
Adds the hf_cardhopper standalone mode, as one component of my (Sam Haskins) and
Trevor Stevado's long-range relay attack on ISO 14443-4 Type A protocols, as
presented at DEF CON 31.
 2023-08-22 01:10:21 -04:00
Henry Gabryjelski 78262139ec more const for lfsampling and lfzx 2023-08-14 23:07:19 -07:00
Henry Gabryjelski 665cf3254b more const for lfops and some commonutil 2023-08-14 23:02:09 -07:00
Henry Gabryjelski d78dae5904 more const for legicrf and the disabled LCD code 2023-08-14 22:50:25 -07:00
Henry Gabryjelski db46e2ce11 more const for iso15693 2023-08-14 22:45:48 -07:00
Henry Gabryjelski a8d84b2f13 more const for iso14443b 2023-08-14 22:16:11 -07:00
Henry Gabryjelski efce76db53 more const for iso14443a 2023-08-14 22:07:04 -07:00
Henry Gabryjelski 8af8723528 const for i2c 2023-08-14 21:45:21 -07:00
Henry Gabryjelski 6eae62edec const for hitagS 2023-08-14 20:34:13 -07:00
Iceman d6e36f8b7a
Merge pull request #2070 from henrygab/more_const 
Enable `const` in more places
 2023-08-14 15:21:17 +02:00
Alex 6947a61d98 Whitespace 2023-08-09 14:30:07 +02:00
Henry Gabryjelski 47ea4d6566 const for hitag2 2023-08-09 00:11:52 -07:00
Henry Gabryjelski 282c0904a5 visual alignment only .. no code change 2023-08-09 00:08:13 -07:00
Henry Gabryjelski 890ea0d321 const for hfops 2023-08-09 00:03:48 -07:00
Henry Gabryjelski 6f38c814a7 Note inconsistency in FPGA frame layout docs. 2023-08-08 23:59:42 -07:00
Henry Gabryjelski 6804e719e5 const for felica 2023-08-08 23:55:20 -07:00
Henry Gabryjelski 63a457c27f const and static functions for epa 2023-08-08 23:38:26 -07:00
Henry Gabryjelski 0af484fdee const for em4x70 2023-08-08 23:24:10 -07:00
Henry Gabryjelski 1a8ef489c8 const for em4x50 2023-08-08 23:03:34 -07:00
Henry Gabryjelski e973aebae6 Workaround SPIFFS lack of const 2023-08-08 22:56:51 -07:00
Henry Gabryjelski b279df2d46 more const - spiffs 2023-08-08 22:50:34 -07:00
Henry Gabryjelski 31645c56b0 more use of const 2023-08-08 21:09:31 -07:00
Henry Gabryjelski 7801abf7a5 Localize effect of unused macro 2023-08-08 21:06:17 -07:00
Henry Gabryjelski 5bd8058113 More const enabled 2023-08-08 21:03:36 -07:00
Henry Gabryjelski 5e71621c69 const improvement for BigBuf.h 2023-08-08 20:52:21 -07:00
iceman1001 007f9fcffb style 2023-08-03 13:02:42 +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 97a1f97308 style 2023-07-27 23:42:06 +02:00
iceman1001 4e6962864a fix loading mifare keys to flash memory, forgot to wipe the new area which we extended to 2023-07-27 22:53:01 +02:00
iceman1001 58f9ba0abf ugly hack to load the signature data if we are on a MFC Ev1 card. First we dont want to trigger the partial read unnecessary and secondly we dont save signature data in our MFC dump file. Need to adapt the JSON format for this 2023-07-27 22:23:33 +02:00
iceman1001 8bfb915624 adapt the leftovers 2023-07-27 19:01:46 +02:00
iceman1001 64ea48e7d0 remove fct in header file.\nreverted this decline 2023-07-27 18:57:11 +02:00
iceman1001 8ef1cdbd75 inceased waiting time.. 2023-07-27 18:56:11 +02:00
iceman1001 6ba002725f rmeoved some fct devices side regarding eml get/ set 2023-07-27 18:55:41 +02:00
iceman1001 5faf625032 adapt name to match code style 2023-07-27 18:02:53 +02:00
iceman1001 d9f2d5287e maybe the return codes are wrong in legic sim now 2023-07-27 16:46:52 +02:00
iceman1001 42700d3c51 skip sector 16 at all since it seems to always be locked down even if the keys authenticate. MFC Ev1 related and less errrors in autopwn when running against a MFC Ev1 in the dumping phase 2023-07-27 12:40:04 +02:00
iceman1001 96944aec69 reinstate less checks of data_available 2023-07-27 12:37:42 +02:00
iceman1001 123ef14667 style 2023-07-26 23:50:12 +02:00
iceman1001 fc3a518f28 There is a race condition when we go from iclass commands to mf command. Especially noticable when eload large files where we used to spam the device with usb packages.\ntry iclass eload, then mf eload, and you see the client hang. With this change we trigger a preload of the fpga image before we start uploading to the device. Current places I could trigger this bug was in eload and gsave. With this patch only the first call takes some time if fpga image must be loaded. The following goes fast.\n\n if you find that the client hangs when going between, this could be the root cause. 2023-07-26 23:47:55 +02:00
iceman1001 b696a2036f improved the eload upload times by using large chunks. Quite much faster now.\nAddapted the dots and text for eload / sim across the client 2023-07-26 23:39:27 +02:00
iceman1001 8793f1c9c5 color 2023-07-26 23:33:05 +02:00
iceman1001 fbdf50d756 minor text stuff 2023-07-26 17:49:14 +02:00
iceman1001 1cb15c84c1 adapting hf mf cget* commands to longer timeouts. Same with the quick eload used in autopwn among others.\nAlso adapted the return codes, so its more accurate in its reporting back to the client. Also added some more informative messages 2023-07-25 21:29:31 +02:00
iceman1001 514af4cf84 missing break 2023-07-23 12:51:12 +02:00
startrekdude 44b7aa2e8b Add a tagType for Seos cards to SimulateIso14443aInit 
These values were observed from a standard-keyed 4K Seos card.
 2023-07-21 16:02:46 -04:00
Philippe Teuwen 173379b999 Rewrote completely cmds & options lf hitag read/dump/wrbl/ta 
for more coherence with other pm3 cmds.
Still there remain strange things but it should be a step in the right direction...
 2023-07-21 01:08:24 +02:00
iceman1001 60cc36b398 Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 2023-07-17 19:34:43 +02:00
iceman1001 c70e5beeac changed legic sim to have a different loop and exit message. Added some colors in output and the return codes on deviceside for legisim now uses the same PM3_E* styled 2023-07-17 19:31:37 +02:00
iceman1001 134f09be5e style 2023-07-17 17:46:27 +02:00