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

11079 commits

Author SHA1 Message Date
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
Oleg Moiseenko fdfe8869ae
Update cmdhfmf.c 
Signed-off-by: Oleg Moiseenko <807634+merlokk@users.noreply.github.com>
 2023-11-09 01:35:26 +02:00
iceman1001 c1ec770a69 changed "hf 14a info" to also give a hint for NTAG424 tags 2023-11-07 21:41:42 +01:00
iceman1001 7adadde5f5 added support to verify UL AES signatures. This tag supports of randomizing UID and mixing with AES keys, making a generic signature algo a bit harder. But for the non mixed signature check it should work. Also added Ul AES version for it to be correct identified. 2023-11-07 21:22:25 +01:00
iceman1001 c60503560c more defines and fix termux compilation 2023-11-07 15:44:12 +01:00
iceman1001 c3543c4610 adapting cmakefile to the client cmakefile. 2023-11-07 13:59:54 +01:00
iceman1001 01aaad7866 text 2023-11-07 13:55:39 +01:00
iceman1001 5dd144b193 reworked autopwn to allow for user to supply multiple keys in command line. All is merged with default array and dictionary if suppolied when doing dictionary attack 2023-11-06 23:52:05 +01:00
iceman1001 6653bffe00 coverity fixes 2023-11-06 22:58:14 +01:00
iceman1001 be63138016 fix wrong types 2023-11-06 17:07:16 +01:00
Oleg Moiseenko 73f5270fa2
Update cmdhfmf.c 
Signed-off-by: Oleg Moiseenko <807634+merlokk@users.noreply.github.com>
 2023-11-06 16:01:56 +02:00
merlokk f2110c11ae fix text 2023-11-06 15:56:51 +02:00
merlokk 70e39ec0c4 check return code 2023-11-06 15:52:54 +02:00
merlokk 6606225686 add change password command 2023-11-06 15:48:18 +02:00
merlokk e32ca56084 gen4 commands refactoring 2023-11-06 14:22:21 +02:00
Oleg Moiseenko 7692f09760
Merge pull request #2162 from merlokk/ginfo_add 
Ginfo add some additional info
 2023-11-06 14:04:32 +02:00
merlokk f617cac993 fix password parameter in the command 2023-11-06 13:55:49 +02:00
merlokk c215752b6e add some hints on the ginfo config values and double-check correctness 2023-11-06 13:51:56 +02: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
merlokk b44c214009 fix 2023-11-06 10:28:37 +02:00
merlokk 0a22fd8f66 uid len details 2023-11-06 10:25:13 +02:00
merlokk c6bf1cefe3 fix format 2023-11-06 00:45:14 +02:00
merlokk 4c828f4424 view format 2023-11-06 00:35:48 +02:00
merlokk 2077ea7da5 decode config 2023-11-06 00:30:13 +02:00
merlokk 7afaaf8535 style 2023-11-06 00:29:42 +02:00
merlokk 910c4d8c92 make style 2023-11-06 00:29:28 +02:00
merlokk ac970064d3 add timeout error 2023-11-06 00:19:45 +02:00
merlokk 89c19fce9c ad test data decoding 2023-11-05 23:51:52 +02:00
merlokk 6ae1bae8c0 ginfo command works and shows raw data 2023-11-05 23:43:05 +02:00
merlokk 70eb1b1391 add low level g4 info commands 2023-11-05 22:09:30 +02:00
merlokk e6e757865e add gen4 commands 2023-11-05 21:58:50 +02:00
merlokk 282d22c3cc add ginfo comamnd 2023-11-05 21:11:55 +02:00
iceman1001 7026fd69fb pedantic fix 2023-11-05 15:40:36 +01:00
iceman1001 c9bee6d3b8 pointer to buffer. Zero sized array not allowed when pedantic 2023-11-05 15:38:21 +01:00
iceman1001 8f7d7a2dd4 fix mem leak and add new pacs style decoding when reading block 7 2023-11-05 15:30:25 +01:00
iceman1001 eb8c2d1b6a move file operations to fileutils.c 2023-11-05 11:52:12 +01:00
iceman1001 fdacd67626 pedantic fix 2023-11-05 11:26:39 +01:00
iceman1001 9dba9f275c fix missing return 2023-11-05 02:17:52 +01:00
iceman1001 a69eed7950 fix missing loaded counter 2023-11-05 02:11:24 +01:00
iceman1001 2ccf84f40a use a local str_nlen fct instead of hinting to POSIX 2023-11-05 02:08:30 +01:00
iceman1001 9c1644cd73 support loading of flipper zero .picopass files. Also adapted to naive detect if PACS w variable length encoded is present 2023-11-05 01:50:32 +01:00
iceman1001 4df28b88d3 fix 2023-11-03 15:47:45 +01:00
iceman1001 83b9057473 fix 2023-11-03 15:44:28 +01:00
iceman1001 f58b4603ba fix 2023-11-03 15:42:13 +01:00
iceman1001 dfdaa41987 wrong string formatter 2023-11-03 15:41:07 +01:00
iceman1001 b09c3ac67c default type of ENUM in C is INT. the tagtype enum broke it. Converted to DEFINES since you cant change type of an ENUM 2023-11-03 15:39:28 +01:00
iceman1001 b7028bb798 init fixes 2023-11-03 12:55:23 +01:00
iceman1001 c793363b4f pedantic fixes 2023-11-03 12:52:01 +01:00
iceman1001 ea249d7b17 fixes 2023-11-03 12:20:30 +01:00
iceman1001 a2fcd47017 Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 2023-11-03 11:49:16 +01:00
iceman1001 ffb6f4ddbb remove default build to add debugging info 2023-11-03 11:48:47 +01:00
Iceman b405706fb8
Merge pull request #2153 from Antiklesys/master 
Update cmdhficlass.c
 2023-11-03 11:39:08 +01:00
iceman1001 4708940c69 wrong struct when pasting 2023-11-03 01:46:42 +01:00
iceman1001 5471d326b7 macOS complains about memory alignment when type casting. memcpy should sort it 2023-11-03 01:41:22 +01:00
iceman1001 85fafb5906 type confusing 2023-11-02 17:19:42 +01:00
iceman1001 bae03ec792 type confusing 2023-11-02 17:14:37 +01:00
iceman1001 3d91806b5b use correct define 2023-11-01 23:40:33 +01:00
iceman1001 e5d2fc3fa7 some color to MFU dump output 2023-11-01 23:40:10 +01:00
iceman1001 b17f5ef45c fix nfc MFC dump file loading 2023-11-01 23:39:42 +01:00
Jean-Michel Picod c08e26ca26 Add alternative chip ID 2023-11-01 10:40:53 +01:00
iceman1001 6423a0ec76 file extension needed? 2023-11-01 07:57:45 +01:00
iceman1001 9f439fde4e fix some ndef decoding 2023-11-01 07:57:13 +01:00
iceman1001 98b7bd75d6 seems nfc mifare classic dumps used "blocks" instead... 2023-11-01 03:17:48 +01:00
iceman1001 a92e712cfe fix bad comparisions 2023-11-01 03:06:10 +01:00
iceman1001 ae6ba395b4 added support for loading flipper MFC/MFU dump files.\nFixed NFC DECODE to identify and handle MFU dump files properly 2023-11-01 02:43:10 +01:00
Daniel Karling 5a750da4ef Removed wrapper for desfire_print_signature 
Not needed now when the unused parameter is gone.
 2023-10-31 08:19:17 +01:00
Daniel Karling ee3a223e37 Implemented 'info' command for NTAG424 2023-10-31 08:16:07 +01:00
Henry Gabryjelski 939d3d4a93 Remove incorrect message (my own regression) 2023-10-30 17:26:07 -07:00
iceman1001 17844afe9d more verbose output for failues when loading json files 2023-10-31 01:07:19 +01:00
iceman1001 c48f305483 more verbose output for failues when loading json files 2023-10-31 00:58:50 +01:00
iceman1001 f523d2917b fix string formatters 2023-10-31 00:43:44 +01:00
iceman1001 9835543a2f apply fix for v3 2023-10-31 00:03:53 +01:00
Iceman b50b405128
Merge pull request #2155 from henrygab/mf_dump_fix 
Fix mf file loading error
 2023-10-30 23:59:17 +01:00
Henry Gabryjelski f2ed7d1299 Fix mf file loading error 
Code was incorrectly checking if loop variable
`i` was greater than maximum data length,
rather than checking current buffer pointer.
 2023-10-30 15:46:37 -07:00
iceman1001 5b7486553f remove unused param in desfire_print_signature 2023-10-30 22:53:41 +01:00
iceman1001 75a70cbf53 updating json format for mfc 2023-10-30 22:22:22 +01:00
iceman1001 5ca29246e9 fix GH code alert 2023-10-30 16:08:42 +01:00
iceman1001 f47fb2f74d adapt data bmap to handle calls without -m. 2023-10-30 16:07:13 +01:00
iceman1001 b9dcd143d5 style 2023-10-30 13:11:52 +01:00
iceman1001 2763ead13b fix the free ctx calls 2023-10-30 13:05:46 +01:00
iceman1001 b0ee6ae67b fixes ntag424 2023-10-30 12:55:23 +01:00
Antiklesys 7cbadad163 Update cmdhficlass.c 
Updated to use arraylen as suggested by iceman, but to do so without facing other issues /buggy behaviors I had to perform additional code changes.
 2023-10-30 18:34:11 +08:00
Antiklesys 9fb17c78c3 Update cmdhficlass.c 
Fixed ranges for configcards generation
 2023-10-30 11:32:36 +08:00
Iceman c3abea803b
Merge branch 'master' into master 
Signed-off-by: Iceman <iceman@iuse.se>
 2023-10-29 21:13:08 +01:00
Daniel Karling d4f8c42d3c Added additional command examples 2023-10-29 17:13:27 +01:00
Daniel Karling 912c126266 Added encrypted comms to ReadData and WriteData commands 
This allows reading and writing to the "proprietary" file (number 3),
or file 2 if it's set to "full" communications mode.
 2023-10-29 16:49:11 +01:00
Daniel Karling 6d290f1bae Less magic numbers, more refactoring 2023-10-29 13:50:31 +01:00
Daniel Karling 1eaf8d0e80 Fixed incorrect order of sdm access rights in command help 2023-10-28 10:33:30 +02:00
Daniel Karling 05a2302466 Implemented style 2023-10-27 18:09:38 +02:00
Daniel Karling ad875a8c01 Refactored communication encryption 2023-10-27 17:25:48 +02:00
Daniel Karling eb29e1a17e Cleanup 
* Added some comments
 * Changed name of offsets to sdm_data since this is more apt. Not all
   of them are describing offsets
 * Fixed dumb bug in MAC refactor
 2023-10-27 07:45:40 +02:00
Antiklesys 81b116c23f Fixed keyroll mode for hf ic configcard 
Was able to compare the output of nfc-iclass and I identified two bugs in the generation of blocks 0x0D (was being overwritten with FF, it seems this was an original bug in the original pm3 code?)
Fixed the porting for block 15 generation.
 2023-10-27 13:21:49 +08:00
Daniel Karling 011d1f6a44 Refactored MAC and IV calculations 2023-10-27 06:52:30 +02:00
Daniel Karling 70422937f2 Partial implementation of NTAG424 commands 
Noteworthy stuff that's missing:
* Encrypted read/write to file.
* Handling of CC and Proprietary file

Stuff that works:
* Read/write file
* Get/change file settings
* Change auth keys
* Configuring SDM/SUN feature
 2023-10-26 22:10:00 +02:00
wh201906 de7b6f35bc
Clean up the code for timeout 
Rename UART_TCP_CLIENT_RX_TIMEOUT_MS to UART_NET_CLIENT_RX_TIMEOUT_MS
Add UART_UDP_LOCAL_CLIENT_RX_TIMEOUT_MS for shorter timeout
Check if the target address is local in uart_open()
 2023-10-25 23:45:23 +08:00
s00se 51bea8995b
cmdscript.c: explicitly include ctype header 
https://bugzilla.redhat.com/show_bug.cgi?id=2245823

Signed-off-by: s00se <95649696+s00se@users.noreply.github.com>
 2023-10-24 16:00:22 -06:00
wh201906 fcad2127e0
Merge branch 'master' into bind 2023-10-23 13:57:18 +08:00
wh201906 56b4bda50d
Add bind option for TCP 2023-10-23 13:56:16 +08:00
wh201906 15ef4f6768
Add bind option (UDP, Windows) 2023-10-23 13:30:27 +08:00
Philippe Teuwen e20742dd04 lf_em_tearoff: oops accept absence of pwd 2023-10-22 22:39:01 +02:00
Philippe Teuwen 675c86ec98 lf_em_tearoff: better safe than sorry 2023-10-22 22:06:13 +02:00
Philippe Teuwen baecf19801 fix lf_em_tearoff 2023-10-22 21:02:10 +02:00
iceman1001 3a2b2dffae add some colors 2023-10-22 19:57:48 +02:00
wh201906 225b1894f9
Add bind option (UDP, Linux) 2023-10-23 01:48:38 +08:00
iceman1001 fd121bab4f added nosave parameter to lf em 4x05 dump 2023-10-22 18:56:19 +02:00
iceman1001 a2fdab98b5 style 2023-10-22 14:20:20 +02:00
iceman1001 b857369f7a fix some warnings 2023-10-22 14:19:01 +02:00
iceman1001 9a9d2cf621 added a new command -data bmap- it breaks down a hex value in rows of bits according to a supplied template 2023-10-22 14:08:18 +02:00
iceman1001 2fed756dd9 added desfire AID entries from the Metrodroid Project. https://github.com/metrodroid/metrodroid/wiki/DESFire-Applications-IDs 2023-10-21 17:07:47 +02:00
iceman1001 854a95db6c added MAD entries from the Metrodroid Project. https://github.com/metrodroid/metrodroid/wiki/DESFire-Applications-IDs 2023-10-21 15:45:12 +02:00
iceman1001 272cb2bbc5 added no save parameter to iclass dump. Also adjusted the text for the other places. 2023-10-20 16:54:44 +02:00
Iceman c8f5c54257
Merge pull request #2143 from Antiklesys/master 
Modified hf iclass calcnewkey
 2023-10-20 16:43:16 +02:00
Philippe Teuwen c4ff847355 typo 2023-10-20 14:49:39 +02:00
Antiklesys 2790bc0c16 Modified hf iclass calcnewkey 
Added support for a scenario in which the old key is elite and the new key is not elite.
 2023-10-20 20:30:16 +08:00
iceman1001 0dc921c6b7 added the udpv6 and also try to identify when v6 is used (tcp/udp) 2023-10-20 12:51:12 +02:00
iceman1001 a35bfbb13e modified the CLI prompt to also show if TCP/UDP is used in the communication 2023-10-20 10:38:53 +02:00
Philippe Teuwen b9ae38f888 Add timing to hw ping, reduce sleep to 1ms in WaitForResponse, no impact on CPU 2023-10-20 00:36:46 +02:00
iceman1001 31bc88f684 style 2023-10-19 21:42:01 +02:00
Antiklesys e2f7454abc Fixed command description 
Fixed command help file as it incorrectly shows -b instead of --blk
 2023-10-19 23:35:09 +08:00
iceman1001 0a42e92d11 fix compilation errors for strlen call that doesnt like uint8_t arrays 2023-10-19 14:40:48 +02:00
iceman1001 8565781f66 text 2023-10-19 14:22:13 +02:00
iceman1001 ae1504e763 fixed a boolean bug with write block, and added a hf mf encodehid which writes some simple ndef message to a empty MFC 1K card 2023-10-19 14:21:46 +02:00
iceman1001 34d8a41021 hw ping - fix output text 2023-10-19 11:08:53 +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