Commit Graph
17354 Commits
Author SHA1 Message Date
Daniel Karling efb645636b Updated changelog 2023-10-29 16:56:04 +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
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
Iceman 0c0967bcc5 Merge pull request #2147 from wh201906/net
Clean up the code for timeout
2023-10-25 19:37:10 +02:00
wh201906 9ff672ca8f Update docs 2023-10-26 00:01:41 +08: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
Iceman 0e203fb60c Merge pull request #2146 from s00se/patch-1
cmdscript.c: explicitly include ctype header
2023-10-25 14:12:48 +02: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
Iceman eb44e40561 Merge pull request #2145 from wh201906/usb_speed
Increase the USB speed by fixing synchronization waits in usb_write()
2023-10-24 14:03:45 +02:00
Iceman ad08f20879 Merge pull request #2144 from wh201906/bind
Added bind option for network connections
2023-10-24 14:01:38 +02:00
wh201906 a0af1fa085 Use ping-pong mode from the start of usb_write()
Before:
708608,708608,707584,707584,708608->708198.4 bytes/s
After:
722944,733184,732160,731136,733184->730521.6 bytes/s

Added some note for ping-pong mode and non ping-pong mode
2023-10-24 12:31:41 +08:00
wh201906 96dc4be112 Add an entry in CHANGELOG.md 2023-10-24 01:27:08 +08:00
wh201906 72da0c9623 Fix some wrong synchronization waits in usb_write()
To make the full use of the ping-pong endpoint
Transfer speed before this fix:
616448,618496,618496,615424,615424->616857.6 bytes/s
Transfer speed after this fix:
707584,709632,707584,709632,710656->709017.6 bytes/s (+14.9%)
Tested by running hw status
2023-10-24 00:46:28 +08: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
Iceman 74fe87c3c3 Merge pull request #2142 from Antiklesys/master
Fixed esetblk command description
2023-10-19 21:13:04 +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 5ae919d8ee since we split the image for iclass, every time we swap back to hf / mf commands there is a penalty for swapping fpga image. this fix some allow for fast simulation part 2023-10-18 20:43:52 +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