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
17897 commits 3 branches 14 tags 86 MiB
Commit graph

11204 commits

Author SHA1 Message Date
Iceman 1abb3ecf97
Merge pull request #2227 from bettse/hf_search_iclass_hint 
Add hint for iClass in `hf search`
 2024-01-01 21:05:51 +01:00
Eric Betts aa0ea47289 Add hint for iClass in hf search 2024-01-01 09:18:58 -08:00
iceman1001 1dee6c07d2 fixed the correct identification of used communications channel and made sure its only called once 2024-01-01 12:15:35 -05:00
nvx d156e48a83 hf 14a apdu now uses the FWI and SGFI values from the ATS to determine an appropriate timeout. 
This fixes issues when using the command against cards that indicate really slow times, such as card emulation by hf_cardhopper.
 2024-01-01 21:14:32 +10:00
iceman1001 e9972bd060 minimize output when READLINE lib is used then there is no need for user to manually reconnect. Increased sleep, gives more time for OS to do other things 2024-01-01 12:05:20 +01:00
iceman1001 0dedfe9ee8 missing some old output for NVX running on proxspace/mingw. Might need even more spaces for all escape codes. the best would be a escape code to clear the line 2024-01-01 10:07:49 +01:00
Iceman 722b5cc66d
Merge pull request #2225 from wh201906/reconnect 
Some fixes for the reconnect feature
 2024-01-01 10:03:24 +01:00
wh201906 b414081e3e
Add throttling in reconnecting thread 2024-01-01 16:09:24 +08:00
wh201906 47376c84ea
Disable print when reconnect 2024-01-01 15:55:54 +08:00
Iceman d99fbfcaef
Merge pull request #2210 from unknown10777/master 
fix usart btfactory for HC series module
 2024-01-01 08:53:04 +01:00
iceman1001 1eff30ccc1 fix number of duplicates... 2024-01-01 08:51:51 +01:00
iceman1001 7749d22e69 maur keys from @PommyGit. Will need to be verifed that its no diversifed keys 2024-01-01 08:48:01 +01:00
s00se 9e039980a7
Update mfc_default_keys.dic 
Signed-off-by: s00se <95649696+s00se@users.noreply.github.com>
 2023-12-31 10:00:23 -07:00
iceman1001 c250fc1200 hf mf info - now detects more versions of Fudan 2023-12-31 15:26:24 +01:00
iceman1001 20eddd8250 added a thread that starts when a device is detected to be offline. It runs until it finds a device and reconnects to it. Signals the READLINE hook event and the prompt is updated to match current status. This removes the need to type "hw connect" on clients that has been compiled with READLINE lib. 2023-12-31 15:25:58 +01:00
iceman1001 e9996d081c the offline detection printing of the prompt looks better now 2023-12-31 11:00:41 +01:00
iceman1001 08f3a105c8 fix string formatter warning 2023-12-31 10:44:57 +01:00
iceman1001 91fad1dfa1 damn.... thanks @NVX 2023-12-31 10:08:33 +01:00
iceman1001 379baea093 zero padding please 2023-12-31 10:07:13 +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 ade6770ecb forgot header 2023-12-30 23:58:08 +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
iceman1001 68f63ec739 using the same hiding of debug logging when performing the magic tests 2023-12-30 21:02:16 +01:00
iceman1001 c448205732 spelling 2023-12-30 20:11:38 +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
iceman1001 32b846dbea textual 2023-12-29 22:08:45 +01:00
ikarus cc5df3447c Fix communication timing (delay) after PM3 detection. 2023-12-29 21:20:47 +01:00
iceman1001 9163e26e59 wrong size, need to verify its history 2023-12-28 10:34:31 +01:00
wh201906 e5dd9952d7
Misc 
Change style of if block with single statement
Reset rx_empty_counter in uart_open()
 2023-12-27 22:22:19 +08:00
wh201906 3aab9a4d04
Update CLI prompt after switching connection type 2023-12-27 22:21:50 +08:00
Iceman abdaf57cd9
Merge pull request #2218 from wh201906/net_simplify 
Clean up the code for network connection
 2023-12-27 13:56:50 +01:00
hazardousvoltage c09f3ca8cd
Merge branch 'RfidResearchGroup:master' into work 2023-12-27 00:05:43 -05:00
Anonymous 117aa46e9e cmdflashmemspiffs.c: allow dump from SPIFFS to trace buffer without saving to local fs 2023-12-27 00:00:01 -05:00
unknown10777 c22778d219 detect if module said OK 2023-12-26 21:37:46 +08:00
wh201906 3fb4515893
Check TCP connection state 2023-12-26 21:23:43 +08:00
wh201906 39866f9ed2
Reuse code for TCP and UDP connection 
Put prefix length validation before memcmp() to avoid overflow
 2023-12-26 17:58:41 +08:00
wh201906 81780bd164
Add uart_parse_address_port() 2023-12-26 17:58:22 +08:00
wh201906 ecec001fdd
Put uart_bind() into uart_common.c 2023-12-26 17:56:14 +08:00
iceman1001 5e06656580 fixed some overflows when debug printing client side when emrtd dump/info 2023-12-25 15:25:05 +01:00
unknown10777 ecce0e6502 some not match original code spacing 2023-12-25 01:31:18 +08:00
unknown10777 f13970ef74 typo 2023-12-24 22:24:18 +08:00
unknown10777 a2da1c4a9a fix usart btfactory not working for HC-04 2023-12-24 22:18:31 +08:00
iceman1001 417abcbb4c use appropriate return code 2023-12-24 10:44:46 +01:00
iceman1001 eb673d27b7 hf mfp dump - still a skeleton command. Need some more love. Fix #2212 2023-12-24 10:41:53 +01:00
iceman1001 2c20c0c647 more debug messages 2023-12-18 22:16:51 +01:00
iceman1001 0c675df40d use MIX 2023-12-18 22:16:13 +01:00
iceman1001 0a820bbb67 added some easy test for saflok key generation 2023-12-18 22:15:54 +01:00
iceman1001 8bb74815b7 adapted some output 2023-12-18 22:14:51 +01:00
iceman1001 2bfc31a7b6 changed "data dectectclock" to try all clocks when not called with any params. Adapted the "lf search -1u" - with text and it should be more intuitive 2023-12-18 22:12:26 +01:00
iceman1001 bdbfa26f9a fix lf config --reset where the resetet value got overwritten. testing some rounding and textual changes to lf search -1uc 2023-12-18 14:52:56 +01:00
iceman1001 f8f135a3b7 style 2023-12-18 10:11:11 +01:00
iceman1001 7fa09a556a improved the autocorreleate detection. lf search -1uc got some more textual improvements 2023-12-18 10:04:19 +01:00
iceman1001 586acf0933 modified the autocorrelate part in lf search -1u command. It should be a more informative output and better bytes length reporting 2023-12-17 21:42:54 +01:00
iceman1001 04769f3183 fudan command is never 512 bytes. Converted to use MIX instead 2023-12-14 23:44:07 +01:00
iceman1001 4a303afecc in hf 14a raw the check for the datalength to be less than 512 bytes wasnt enforced. I might have gotten this wrong. But now we can use MIX instead. Same for APDUs. So sending 488 bytes to device is possible. I can only think of one person ever doing such a thing and I am sure I will hear about this 2023-12-14 23:42:51 +01:00
iceman1001 2709882312 untested/unused code but in the process of removing all OLD, will need to verify its never larger than 488 bytes 2023-12-14 23:40:30 +01:00
iceman1001 7fe12d4d1b payload should not be larger than 488 bytes, so we can use MIX instead 2023-12-14 23:39:21 +01:00
iceman1001 f47d05df8a the old isn't needed 2023-12-14 00:40:03 +01:00
iceman1001 c3bebd350d fix some helptext showing wrong dates compared to what the instructions said 2023-12-14 00:38:01 +01:00
iceman1001 0c3d487c15 maur 2023-12-14 00:36:33 +01:00
iceman1001 a2327cfe20 typo 2023-12-13 22:33:09 +01:00
Iceman 599b4f6e73
Merge pull request #2208 from wh201906/bootloader 
Add hw bootloader
 2023-12-13 17:55:30 +01:00
wh201906 81888e01a2
Add hw bootloader 
Reboot to the bootloader mode in the client
 2023-12-13 21:41:17 +08:00
wh201906 c82bc2aea5
Fix docs 
Add new PLATFORM_EXTRAS options in 4_Advanced-compilation-parameters.md
Fix some help text
 2023-12-13 21:00:17 +08:00
iceman1001 20ca44c8b2 fix partial found keys 2023-12-12 11:48:10 +01:00
Oleg Moiseenko 7f8291f7f4
Merge pull request #2203 from merlokk/mkstyle 
make style
 2023-12-12 01:12:38 +02:00
merlokk 2517e8b345 make style 2023-12-12 01:11:10 +02:00
iceman1001 1d3129972f typo 2023-12-11 23:56:50 +01:00
iceman1001 c533d3aba8 adapt text out for hf mf info 2023-12-11 23:37:05 +01:00
merlokk 84cc6d6c79 add: specify key and block for nested static encrypted checks 2023-12-11 23:12:56 +02:00
merlokk 749ba504f8 text 2023-12-11 21:25:31 +02:00
merlokk 91892bc1bf add static encrypted nonce detection 2023-12-11 21:24:26 +02:00
merlokk d352f9d44e add key placeholder 2023-12-11 19:21:25 +02:00
merlokk edd004adc5 move rng info and add static encrypted nonce detect placeholder 2023-12-11 19:17:03 +02:00
merlokk 784e11021e Remove debug messages from the info command 2023-12-11 19:00:09 +02:00
merlokk ebe9d72cc2 set debug log level 2023-12-11 18:46:25 +02:00
merlokk af0e25b519 read block0 and check keys 2023-12-11 15:44:43 +02:00
merlokk fb51bf4fa1 add backdoor info and check keys for sector 0 2023-12-11 14:23:26 +02:00
merlokk 6066e7e924 rearrange some keys and add one from the bottom 2023-12-11 14:22:19 +02:00
merlokk ea467414f4 add magic card detect 2023-12-11 00:58:48 +02:00
merlokk b11b797abe info command draft 2023-12-11 00:48:28 +02:00
iceman1001 191525768d maur 2023-12-09 20:24:18 +01:00
iceman1001 c72d4a188d fix string formatter 2023-12-09 11:21:42 +01:00
iceman1001 9075984c7f modified lf fdx demod, different text style and raw now shows all bytes not just crc bytes 2023-12-09 10:18:44 +01:00
iceman1001 8419b9c690 Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 2023-12-08 19:34:14 +01:00
iceman1001 bf1160988c style 2023-12-08 19:34:06 +01:00
iceman1001 62c926e0dd style 2023-12-08 19:29:55 +01:00
iceman1001 843fa33d09 modified to print number of samples. Also added a isnoise check, in order to fast get feedback instead of forcing user to look at the plot window 2023-12-08 19:20:39 +01:00
iceman1001 367ff755a2 move lock 2023-12-07 19:57:18 +01:00
iceman1001 3c6734c63b style 2023-12-07 19:56:41 +01: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 7c749267e6 maur 2023-12-07 12:15:35 +01:00
iceman1001 89bcdcddbc style 2023-12-06 22:42:16 +01:00
iceman1001 d230b770b3 text 2023-12-06 22:18:47 +01:00
iceman1001 fdc1c9d864 text 2023-12-06 22:16:53 +01:00
datatags cc73449c40
Interactive reader attack sim now returns 2023-12-06 10:19:22 -08:00
Anonymous 6b8a269671 cmdtrace.c: fix segfault when trying to list trace after loading fails, part deux 2023-12-06 02:52:15 -05:00
Anonymous 8345aa5ad5 Merge branch 'unisniff' of https://github.com/hazardousvoltage/proxmark3 into unisniff 2023-12-06 02:37:45 -05:00
Anonymous 7ef5fe14bb cmdtrace.c: fix segfault when trying to list trace after loading fails 2023-12-06 02:36:14 -05:00
iceman1001 75d0601318 fix decrypted output 2023-12-05 12:08:09 +01:00
team-orangeBlue b82857f892
Compilation workaround 
May be reverted if fails

Signed-off-by: team-orangeBlue <63470411+team-orangeBlue@users.noreply.github.com>
 2023-12-03 12:05:15 +03:00
team-orangeBlue da984783a8
Merge branch 'RfidResearchGroup:master' into PlusPlus 2023-12-03 11:28:48 +03:00
team-orangeBlue 29773e92ca
Fix typo, correct data 
2 new keys (SL3 sector switch; SL1SL3Mix sector switch).
"instead of than" - removed the than.

Signed-off-by: team-orangeBlue <63470411+team-orangeBlue@users.noreply.github.com>
 2023-12-03 11:24:38 +03:00
team-orangeBlue 046237500b
Proper block data for Mifare Plus 
All blocks are NOT data blocks
Some are now config/management keys/sector keys/...

Signed-off-by: team-orangeBlue <63470411+team-orangeBlue@users.noreply.github.com>
 2023-12-03 10:28:32 +03: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
team-orangeBlue ce99e86997
New arguments 
Won't compile otherwise

Signed-off-by: team-orangeBlue <63470411+team-orangeBlue@users.noreply.github.com>
 2023-12-01 23:49:19 +03:00
team-orangeBlue 91f574ab19
More arguments 
Add support for writing special blocks
Add custom command bytes

Signed-off-by: team-orangeBlue <63470411+team-orangeBlue@users.noreply.github.com>
 2023-12-01 23:48:45 +03:00
team-orangeBlue a523c1e062
New crypto 
Add encryption
Add key updating
Add config updating

Signed-off-by: team-orangeBlue <63470411+team-orangeBlue@users.noreply.github.com>
 2023-12-01 23:47:45 +03:00
iceman1001 f3a9629895 style 2023-12-01 15:25:09 +01:00
wh201906 f8605311f7
Use real-time sampling with high sample size 2023-12-01 19:58:00 +08:00
iceman1001 a913b2c662 style 2023-12-01 10:59:18 +01:00
iceman1001 bcbe76064d Changed modulation max bit length from 512 to 4096, since we now can get much longer traces 2023-12-01 10:58:33 +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
Adam Jon Foster 8dea0d3203
Create hf_mf_uid_downgrade.lua 
Adding hf_mf_uid_downgrade, which allows you to add a fc and cn to a UID of a Mifare Classic. 

Signed-off-by: Adam Jon Foster <me@evildaemond.com>
 2023-11-30 21:40:14 +08:00
wh201906 45df618b7c
Fix segmentation fault 2023-11-30 18:42:30 +08:00
iceman1001 e026c712c1 hf 14a info now tries to read QL88 sigantures and verify them 2023-11-28 11:08:17 +01:00
iceman1001 fbdb268445 QL88 signature Public Key was identified as Manufacture Mifare Classic before. Now added tests and checks.\nnext step is to use the S17/B key to read the signature 2023-11-28 11:00:48 +01:00
Iceman d8da2902fb
Merge pull request #2178 from hamptonmoore/avigilon-56 
Implement Avigilon 56bit format
 2023-11-27 14:55:33 +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
Hampton Moore 345303de37 Implement Avigilon 56 format 2023-11-25 21:48:33 -05:00
wh201906 10ab013f5b
Use defined return value 2023-11-25 11:09:16 +08:00
Iceman 56b5bde713
Merge pull request #2186 from wh201906/fix_emv_reader 
Fix `ExchangeAPDUSC()` in `cmdsmartcard.c`
 2023-11-25 03:34:15 +01:00
wh201906 493383c995
Fix ExchangeAPDUSC() in cmdsmartcard.c 
It doesn't return 1 if the retry fails, which is different from the
behavior of the first try.
 2023-11-24 22:20:26 +08:00
wh201906 ee64e71f69
Fix client build with Python 3.12 
Caused by upstream bug
https://github.com/python/cpython/issues/106560
The fix is like this
bbdf6d4653
 2023-11-24 13:12:07 +08:00
wh201906 e82fb8b67f
Use calloc() instead of malloc() 
Suggested by @iceman1001
Mainly for 8b6a274e28
Replaced the malloc() in getSamplesFromBufEx()
Added memory allocation result check for getSamplesFromBufEx(),
lf_read_internal(), and lf_sniff()
 2023-11-17 12:38:20 +08:00
Iceman 7fb5a5a743
Merge pull request #2179 from JohnELester/patch-1 
Update mfc_default_keys.dic
 2023-11-17 04:31:18 +01:00
wh201906 0b9f11a249
Add a slider in the plot window for navigation 2023-11-17 10:59:14 +08:00
Pathfinder cee46928ca
Update mfc_default_keys.dic 
Signed-off-by: Pathfinder <john.e.lester@gmail.com>
 2023-11-16 09:37:38 -05: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
wh201906 835b7a9150
Add support for trigger threshold 2023-11-14 13:12:35 +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 8b6a274e28
Bigger graph buffer 
1280000 samples -> 10.24s for 125kHz 8bit sampling

Allocate graph related memory on heap
 2023-11-14 10:05:13 +08:00
wh201906 42ab3ee1e6
Receive raw LF samples on the client 2023-11-14 09:42:44 +08:00
wh201906 8fdf04fcfb
Receive raw data on the client 2023-11-14 02:17:45 +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 e0be057f62 Get Python support of experimental_client_with_swig working again 2023-11-13 10:13:14 +01:00
Philippe Teuwen 97f2770982 Ignore mbedtls header sitch-enum warnings 2023-11-13 09:25:41 +01:00
Grayson Martin e65263c73b
run make style 2023-11-11 14:32:09 -06:00
Grayson Martin db3c86958a
implement smartcard daemon relay for iso14b cards 2023-11-11 14:30:31 -06:00
Grayson Martin 4e346e8ca2
Merge branch 'master' into smartcard-relay 2023-11-11 13:05:11 -06:00
Philippe Teuwen a42cb6dea1 experimental_lib/example_c port as arg 2023-11-11 18:24:34 +01:00
Philippe Teuwen 9f8c02bf96 fix CWE-562: Return of Stack Variable Address 2023-11-11 18:24:34 +01:00
Philippe Teuwen ba8e90edfd make style 2023-11-11 18:24:34 +01:00
iceman1001 169d31cc8e fix coverity 265059 2023-11-11 16:53:06 +01:00
iceman1001 8e2e1d4cb4 fix coverity 420049 2023-11-11 16:50:23 +01:00
iceman1001 2401a0e27b fix coverity 420050 2023-11-11 16:47:45 +01:00
iceman1001 0924cb30bb fix coverity 421621 2023-11-11 16:46:32 +01:00
iceman1001 7f2bc916d4 use local fct instead 2023-11-10 00:32:10 +01:00