Commit graph

17636 commits

Author SHA1 Message Date
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
094882454d missing structs 2023-10-30 22:23:07 +01:00
iceman1001
75a70cbf53 updating json format for mfc 2023-10-30 22:22:22 +01:00
iceman1001
82e7830e5b style 2023-10-30 22:20:55 +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
d22d6c4879
Merge pull request #2150 from dankar/master
Partial implementation of NTAG424 commands
2023-10-29 21:13:42 +01: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
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
Iceman
9fd539723c
Merge pull request #2151 from Antiklesys/master
Fixed keyroll mode for hf ic configcard
2023-10-27 15:50:47 +02:00
Iceman
67f45afa0f
Merge pull request #2149 from yah01/optimize-sample-performance
Improve sampling performance
2023-10-27 15:48:59 +02:00
yah01
9d07ee497c Improve lf sampling performance
Signed-off-by: yah01 <yah2er0ne@outlook.com>
2023-10-27 13:47:26 +08: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
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