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

10924 commits

Author SHA1 Message Date
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
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
Self Not Found 7dbdc7cf10
Add short flag -m for timeout related commands 2023-10-18 18:47:32 +08:00
Jean-Michel Picod dbe0412311 Simplify quote handling 2023-10-18 10:38:33 +02:00
Jean-Michel Picod 3b7cec365a Support double-quoted arguments in CLI 
When a quoted command argument is seen, it will take all characters
until the next double-quote (no supported escape sequence here for
simplicity).
All white spaces (space, tab, etc.) are then removed from the argument.

This means that the following command should behave the same:
```
pm3> wiegand encode --fc 101 --cn 1337
pm3> wiegand encode --fc "1 0 1" --cn "1    3    3   7"
```

Or a more useful example, when copy/pasting hex formatted values:
```
pm3> hf iclass calcnewkey --old 1122334455667788 --new 2233445566778899
pm3> hf iclass calcnewkey --old "11 22 33 44 55 66 77 88" --new "22 33 44 55 66 77 88 99"
```
 2023-10-18 10:27:12 +02:00
wh201906 5e22ed25bc
Add UDP support on Windows 2023-10-17 22:48:12 +08:00
iceman1001 78e1a84515 added the timeout to preferences, so its stored in the pref file but... there need to be adaptations to the uart_p*/uart_w* files to use the the session value.. 2023-10-17 14:54:44 +02:00
wh201906 d1f916ba25
Reduce the default communication timeout for local IPv6 address 2023-10-17 20:20:21 +08:00
wh201906 d9b5afbb92
Add IPv6 support for TCP (Windows) 2023-10-17 19:40:41 +08:00
wh201906 67d36152cc
Add IPv6 support for UDP (Linux) 2023-10-17 18:40:17 +08:00
wh201906 2e0c24c8f2
Add IPv6 support for TCP (Linux) 2023-10-17 18:32:13 +08:00
wh201906 bd34794d26
Add error handling 2023-10-16 21:12:14 +08:00
wh201906 703a2c968a
Faster uart_receive() in UDP mode 
Added some functions for writing data to the ring buffer directly
Increased the size of ring buffer
 2023-10-16 20:05:42 +08:00
iceman1001 d738f3171c maur, thanks to Randy! 2023-10-16 10:14:38 +02:00
wh201906 3df58f3a9e
Clean up 2023-10-16 02:09:22 +08:00
wh201906 5775b53078
UDP support on Linux 2023-10-16 01:56:03 +08:00
wh201906 7aef669e59
Add ringbuffer 
This is used in the UDP connection
 2023-10-16 01:52:27 +08:00
iceman1001 13f9972f39 fix coverity resource leak 2023-10-15 17:49:48 +02:00
iceman1001 ade322a410 style 2023-10-15 17:14:56 +02:00
iceman1001 12fc664870 updated commands and text 2023-10-15 17:11:36 +02:00
iceman1001 8a9c043aa6 fixing "lf hid clone --bin" param to correctly handle sentinel bit 2023-10-15 15:23:14 +02:00
iceman1001 026cd7d53d style 2023-10-15 13:21:16 +02:00
iceman1001 0442e04e05 text 2023-10-15 13:19:33 +02:00
Iceman ac25c9d47a
Merge pull request #2129 from Antiklesys/master 
Fixed iclass offline mode commands
 2023-10-15 12:39:49 +02:00
Antiklesys 22b85c74d8 Fixed iclass info available in offline mode 
Fixed iclass info available in offline mode
 2023-10-15 18:27:25 +08:00
iceman1001 a348d58c6d support fct 2023-10-15 11:24:48 +02:00
Antiklesys 90ac7fb67b Fixed iclass offline mode commands 
Fixed iclass offline mode commands
 2023-10-15 13:59:38 +08:00
iceman1001 fc6feea0d4 experimental UDP support. Doesnt quite work yet 2023-10-14 20:30:13 +02:00
iceman1001 0490dc9d07 use strstr instead of memcmp 2023-10-14 11:00:15 +02:00
Iceman 80ac7972fd
Merge branch 'master' into master 
Signed-off-by: Iceman <iceman@iuse.se>
 2023-10-14 09:52:55 +02:00
Self Not Found f90434521e
Reduce latency in local TCP connection 2023-10-14 14:16:30 +08:00
iceman1001 6e1cf6c0de added a C sample of grabbing output 2023-10-13 22:51:12 +02:00
Antiklesys 28c4f66c0b Update cmdhficlass.c 2023-10-13 22:53:29 +08:00
Antiklesys 0692af8425 Update cmdhficlass.c 
Reverted changes as otherwise the check is ignored.
 2023-10-13 22:22:10 +08:00
Antiklesys 7b4af95a40 Update cmdhficlass.c 2023-10-13 22:16:10 +08:00
Antiklesys e4f373dd65 Finished configcard implementation for keyroll cards 
Finalized implementation of configcard generation for keyroll when cardhelper is not present.
Results need to be compared with cardhelper output.
 2023-10-13 21:54:07 +08:00
Iceman 449eacdee5
Merge pull request #2125 from Antiklesys/master 
Ported configcard from nfc-iclass
 2023-10-13 11:34:31 +02:00
iceman1001 8a8288ec25 fix the doubletts.. 2023-10-13 08:40:54 +02:00
iceman1001 168b9eea7a Bandai Namco Passport [fka Banapassport] / Sega Aime Card. 
BNPs / Aimes endorsed with the Amusement IC Logo use FeliCa and will not work with the below keys.
Dumped on the Flipper Devices Discord Server
 2023-10-13 08:23:20 +02:00
Antiklesys ef9b57748a Ported configcard from nfc-iclass 
Enabled creation of configcards without cardhelper using nfc-iclass data
 2023-10-13 00:29:40 +08:00
iceman1001 0ff41fa652 style 2023-10-12 14:53:26 +02:00
iceman1001 3a1a09ef63 adapt to be online mode only 2023-10-12 09:37:44 +02:00
iceman1001 82294d71f6 making sure apdu logging is turned off after command execution. Still some commands when failing, hasnt been adapted to it. 2023-10-11 12:43:58 +02:00
iceman1001 29712bfde6 text 2023-10-10 19:49:27 +02:00
iceman1001 8625fc3283 maur 2023-10-10 19:47:35 +02:00
iceman1001 7cec258349 minor adjustments to texts 2023-10-09 20:09:22 +02:00
iceman1001 6229021f07 use the ISO7816 defines we already have 2023-10-09 15:24:57 +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