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

4928 commits

Author SHA1 Message Date
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
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 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 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 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
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
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 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