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

17749 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Iceman 540683b59e
Merge pull request #2224 from s00se/patch-1 
Update mfc_default_keys.dic
 2024-01-01 08:43:17 +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 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 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
Iceman 27b92591aa
Merge pull request #2223 from nvx/feature/gdm_magic_wakeup_detection 
Improved magic detection
 2023-12-30 11:07:54 +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
Iceman ac73219628
Merge pull request #2222 from ikarus23/master 
Fix communication timing (delay) after PM3 detection.
 2023-12-29 21:23:40 +01:00
ikarus cc5df3447c Fix communication timing (delay) after PM3 detection. 2023-12-29 21:20:47 +01:00
Iceman faedd3e19e
Merge pull request #2220 from nvx/feature/cardhopper_usb_cdc 
Changed hf_cardhopper standalone mode to allow running over the internal PM3 USB-CDC serial port.
 2023-12-29 19:37:24 +01: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
Iceman 56c3187852
Merge pull request #2216 from mishamyte/doc/magic-cards 
Extended documentation for magic tags
 2023-12-28 18:25:45 +01:00
iceman1001 9163e26e59 wrong size, need to verify its history 2023-12-28 10:34:31 +01:00
Iceman 78dfd84b00
Merge pull request #2219 from wh201906/hw_connect 
Update connection type in CLI prompt
 2023-12-27 15:36:01 +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
Mykhailo Shevchuk 5c69ea7524 ULtra + UL-5 2023-12-26 23:03:09 +02:00
Mykhailo Shevchuk 2cd0c04575 GDCUID 2023-12-26 22:39:52 +02:00
Iceman 18062deab1
Merge pull request #2215 from wh201906/tcp_check 
Check TCP connection state
 2023-12-26 21:24:18 +01:00
Mykhailo Shevchuk b9572d561e GDM + small refactoring 2023-12-26 22:11:04 +02:00
Mykhailo Shevchuk bc8004cf8e ZUID 2023-12-26 20:45:02 +02:00
Mykhailo Shevchuk 3a811a5872 UFUID 2023-12-26 20:23:40 +02:00
Mykhailo Shevchuk 49a319de51 FUID 2023-12-26 18:24:09 +02: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