From 656b1c5902dbad06f9d07a25b8b6e8aa297faa57 Mon Sep 17 00:00:00 2001
From: Mounir IDRASSI <mounir.idrassi@idrix.fr>
Date: Thu, 30 Dec 2021 15:33:16 +0100
Subject: Update Release Notes and add signed Windows driver.

---
 doc/chm/VeraCrypt User Guide.chm            | Bin 1917709 -> 1918277 bytes
 doc/html/Release Notes.html                 |  19 ++++++++++++-------
 src/Common/Tcdefs.h                         |   2 +-
 src/Driver/Driver.rc                        |   4 ++--
 src/Release/Setup Files/veracrypt-arm64.cat | Bin 10627 -> 10615 bytes
 src/Release/Setup Files/veracrypt-arm64.sys | Bin 452936 -> 452928 bytes
 src/Release/Setup Files/veracrypt-x64.cat   | Bin 11746 -> 11746 bytes
 src/Release/Setup Files/veracrypt-x64.sys   | Bin 825672 -> 825672 bytes
 src/Release/Setup Files/veracrypt.Inf       |   2 +-
 src/Release/Setup Files/veracrypt.cat       | Bin 10573 -> 10573 bytes
 src/Release/Setup Files/veracrypt.sys       | Bin 793072 -> 792120 bytes
 11 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/doc/chm/VeraCrypt User Guide.chm b/doc/chm/VeraCrypt User Guide.chm
index 0f780816..b2ed8c3f 100644
Binary files a/doc/chm/VeraCrypt User Guide.chm and b/doc/chm/VeraCrypt User Guide.chm differ
diff --git a/doc/html/Release Notes.html b/doc/html/Release Notes.html
index 2010273d..cb842c5c 100644
--- a/doc/html/Release Notes.html	
+++ b/doc/html/Release Notes.html	
@@ -39,22 +39,27 @@
 <strong>Note to users who created volumes with 1.17 version of VeraCrypt or earlier: </strong><br/>
 <span style="color:#ff0000;">To avoid hinting whether your volumes contain a hidden volume or not, or if you depend on plausible deniability when using hidden volumes/OS, then you must recreate both the outer and hidden volumes including system encryption and hidden OS, discarding existing volumes created prior to 1.18a version of VeraCrypt.</span></li>
 </p>
-<p><strong style="text-align:left">1.25.6</strong> (December 27<sup>th</sup>, 2021):</p>
+<p><strong style="text-align:left">1.25.6</strong> (December 30<sup>th</sup>, 2021):</p>
 <ul>
 <li><strong>Windows:</strong>
 <ul>
-<li>MSI installation only: Fix double-clicking .hc file container inserting %1 instead of volume name in UI path field.</li>
-<li>Add registry settings to control driver internal encryption queue (under HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\veracrypt):
+<li>MSI installation only: Fix double-clicking .hc file container inserting %1 instead of volume name in path field.</li>
+<li>Advanced users: Add registry settings to control driver internal encryption queue to allow tuning performance for SSD disks and having better stability under heavy load.
 <ul>
-<li>VeraCryptEncryptionFragmentSize (REG_DWORD): size of encryption data fragment in KiB. Default is 256.</li>
-<li>VeraCryptEncryptionIoRequestCount (REG_DWORD): maximum number of parallel I/O requests. Default is 16.</li>
-<li>VeraCryptEncryptionItemCount (REG_DWORD): maximum number of encryption queue items processed in parallel. Default is 8.</li>
+<li>Under registry key HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\veracrypt:
+<ul>
+<li>VeraCryptEncryptionFragmentSize (REG_DWORD): size of encryption data fragment in KiB. Default is 256. Maximum is 2048.</li>
+<li>VeraCryptEncryptionIoRequestCount (REG_DWORD): maximum number of parallel I/O requests. Default is 16. Maximum is 8192.</li>
+<li>VeraCryptEncryptionItemCount (REG_DWORD): maximum number of encryption queue items processed in parallel. Default as well as maximum is half of VeraCryptEncryptionIoRequestCount.</li>
+</ul>
+</li>
+<li>The triplet (FragmentSize=512, IoRequestCount=128, ItemCount=64) is an example of parameters that enhance sequential read speed on some SSD NVMe systems.</li>
 </ul>
 </li>
 </ul>
 <li><strong>MacOSX:</strong>
 <ul>
-<li>Fix resource files inside VeraCrypt application bundle (e.g. HTML documentation, languages XML files) being world-writable.</li>
+<li>Fix resource files inside VeraCrypt application bundle (e.g. HTML documentation, languages XML files) being world-writable. (Reported by Niall O'Reilly)</li>
 </ul>
 </li>
 </ul>
diff --git a/src/Common/Tcdefs.h b/src/Common/Tcdefs.h
index 4aa4bfe5..c13c333e 100644
--- a/src/Common/Tcdefs.h
+++ b/src/Common/Tcdefs.h
@@ -69,7 +69,7 @@ extern unsigned short _rotl16(unsigned short value, unsigned char shift);
 #define VERSION_NUM						0x0125
 
 // Release date
-#define TC_STR_RELEASE_DATE			L"December 27, 2021"
+#define TC_STR_RELEASE_DATE			L"December 30, 2021"
 #define TC_RELEASE_DATE_YEAR			2021
 #define TC_RELEASE_DATE_MONTH			 12
 
diff --git a/src/Driver/Driver.rc b/src/Driver/Driver.rc
index a695b9cd..3af073ce 100644
--- a/src/Driver/Driver.rc
+++ b/src/Driver/Driver.rc
@@ -27,8 +27,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,25,6,0
- PRODUCTVERSION 1,25,6,0
+ FILEVERSION 1,25,6,1
+ PRODUCTVERSION 1,25,6,1
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
diff --git a/src/Release/Setup Files/veracrypt-arm64.cat b/src/Release/Setup Files/veracrypt-arm64.cat
index 73360d66..751a6b26 100644
Binary files a/src/Release/Setup Files/veracrypt-arm64.cat and b/src/Release/Setup Files/veracrypt-arm64.cat differ
diff --git a/src/Release/Setup Files/veracrypt-arm64.sys b/src/Release/Setup Files/veracrypt-arm64.sys
index 8974d293..b5046d1f 100644
Binary files a/src/Release/Setup Files/veracrypt-arm64.sys and b/src/Release/Setup Files/veracrypt-arm64.sys differ
diff --git a/src/Release/Setup Files/veracrypt-x64.cat b/src/Release/Setup Files/veracrypt-x64.cat
index 206155cc..692a74df 100644
Binary files a/src/Release/Setup Files/veracrypt-x64.cat and b/src/Release/Setup Files/veracrypt-x64.cat differ
diff --git a/src/Release/Setup Files/veracrypt-x64.sys b/src/Release/Setup Files/veracrypt-x64.sys
index 8d4f5a39..4c800b44 100644
Binary files a/src/Release/Setup Files/veracrypt-x64.sys and b/src/Release/Setup Files/veracrypt-x64.sys differ
diff --git a/src/Release/Setup Files/veracrypt.Inf b/src/Release/Setup Files/veracrypt.Inf
index d8abd1f8..a9c1bea3 100644
--- a/src/Release/Setup Files/veracrypt.Inf	
+++ b/src/Release/Setup Files/veracrypt.Inf	
@@ -10,7 +10,7 @@ signature   = "$Windows NT$"
 Class       = "Encryption"                              ;This is determined by the work this filter driver does
 ClassGuid   = {a0a701c0-a511-42ff-aa6c-06dc0395576f}    ;This value is determined by the Class
 Provider    = %ProviderString%
-DriverVer   = 12/27/2021,1.25.6.0
+DriverVer   = 12/29/2021,1.25.6.1
 CatalogFile = veracrypt.cat
 
 
diff --git a/src/Release/Setup Files/veracrypt.cat b/src/Release/Setup Files/veracrypt.cat
index 25504c70..39cccb30 100644
Binary files a/src/Release/Setup Files/veracrypt.cat and b/src/Release/Setup Files/veracrypt.cat differ
diff --git a/src/Release/Setup Files/veracrypt.sys b/src/Release/Setup Files/veracrypt.sys
index 3e085d07..cc545696 100644
Binary files a/src/Release/Setup Files/veracrypt.sys and b/src/Release/Setup Files/veracrypt.sys differ
-- 
cgit v1.2.3