From 69a9c6b3943db402a11bf2609c4778ab08628a76 Mon Sep 17 00:00:00 2001
From: Mounir IDRASSI <mounir.idrassi@idrix.fr>
Date: Tue, 22 Mar 2022 00:13:52 +0100
Subject: Update release notes for 1.26.0 and set its date to March 21st 2022

---
 doc/chm/VeraCrypt User Guide.chm                 | Bin 1919267 -> 1921257 bytes
 doc/chm/VeraCrypt.hhc                            |   4 ++--
 doc/chm/VeraCrypt.hhp                            |   2 +-
 doc/html/Release Notes.html                      |  22 ++++++++++++++++++++++
 src/Build/CMakeLists.txt                         |   4 ++--
 src/Build/Resources/MacOSX/Info.plist.legacy.xml |   2 +-
 src/Build/Resources/MacOSX/Info.plist.xml        |   2 +-
 src/Common/Tcdefs.h                              |   2 +-
 src/Setup/MacOSX/veracrypt.pkgproj               |   4 ++--
 src/Setup/MacOSX/veracrypt_Legacy.pkgproj        |   4 ++--
 10 files changed, 34 insertions(+), 12 deletions(-)

diff --git a/doc/chm/VeraCrypt User Guide.chm b/doc/chm/VeraCrypt User Guide.chm
index 62f048bd..8d2384aa 100644
Binary files a/doc/chm/VeraCrypt User Guide.chm and b/doc/chm/VeraCrypt User Guide.chm differ
diff --git a/doc/chm/VeraCrypt.hhc b/doc/chm/VeraCrypt.hhc
index 500f906b..d5b5b095 100644
--- a/doc/chm/VeraCrypt.hhc
+++ b/doc/chm/VeraCrypt.hhc
@@ -175,8 +175,8 @@
 		</OBJECT>
 	<UL>
 		<LI> <OBJECT type="text/sitemap">
-			<param name="Name" value="RIPEMD-160">
-			<param name="Local" value="RIPEMD-160.html">
+			<param name="Name" value="BLAKE2s-256">
+			<param name="Local" value="BLAKE2s-256.html">
 			</OBJECT>
 		<LI> <OBJECT type="text/sitemap">
 			<param name="Name" value="SHA-256">
diff --git a/doc/chm/VeraCrypt.hhp b/doc/chm/VeraCrypt.hhp
index c6c7f5d1..3f66edd0 100644
--- a/doc/chm/VeraCrypt.hhp
+++ b/doc/chm/VeraCrypt.hhp
@@ -44,6 +44,7 @@ Beginner's Tutorial_Image_022.jpg
 Beginner's Tutorial_Image_023.gif
 Beginner's Tutorial_Image_024.gif
 Beginner's Tutorial_Image_034.png
+BLAKE2s-256.html
 Camellia.html
 Cascades.html
 Changing Passwords and Keyfiles.html
@@ -141,7 +142,6 @@ References.html
 Release Notes.html
 Removable Medium Volume.html
 Removing Encryption.html
-RIPEMD-160.html
 Security Model.html
 Security Requirements and Precautions.html
 Security Requirements for Hidden Volumes.html
diff --git a/doc/html/Release Notes.html b/doc/html/Release Notes.html
index 7bcc434d..0748a3d5 100644
--- a/doc/html/Release Notes.html	
+++ b/doc/html/Release Notes.html	
@@ -39,6 +39,28 @@
 <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.26</strong> (March 21<sup>st</sup>, 2022):</p>
+<ul>
+<li><strong>All OSes:</strong>
+<ul>
+<li>Add support for BLAKE2s as new PRF algorithm for both system encryption and standard volumes.</li>
+<li>Complete removal of RIPEMD16 and GOST89 algorithms. Legacy volumes using any of them cannot be mounted by VeraCrypt anymore.</li>
+<li>Add Corsican language support. Update translations (French, German, Russian). </li>
+</ul>
+</li>
+<li><strong>Windows:</strong>
+<ul>
+<li>EFI Bootloader:
+<ul>
+<li>Fix bug in PasswordTimeout value handling that caused it to be limited to 255 seconds.</li>
+<li>Rescue Disk: enhance "Boot Original Windows Loader" by using embedded backup of original Windows loader if it is missing from disk</li>
+<li>Addition of Blake2s and removal of RIPEMD160 & GOST89</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+
 <p><strong style="text-align:left">1.25.9</strong> (February 19<sup>th</sup>, 2022):</p>
 <ul>
 <li><strong>All OSes:</strong>
diff --git a/src/Build/CMakeLists.txt b/src/Build/CMakeLists.txt
index 51c8bdd2..24c37df9 100644
--- a/src/Build/CMakeLists.txt
+++ b/src/Build/CMakeLists.txt
@@ -11,8 +11,8 @@ elseif ( NOT DEFINED NOGUI )
 endif()
 
 # - Set version of the package
-set( FULL_VERSION 		"1.25.9" )
-set( VERSION 			"1.25.9" )
+set( FULL_VERSION 		"1.26.0" )
+set( VERSION 			"1.26.0" )
 set( RELEASE 			"1" )
 
 # - Set PROJECT_NAME and CONFLICT_PACKAGE values
diff --git a/src/Build/Resources/MacOSX/Info.plist.legacy.xml b/src/Build/Resources/MacOSX/Info.plist.legacy.xml
index d21c1cf5..ffe0ed69 100644
--- a/src/Build/Resources/MacOSX/Info.plist.legacy.xml
+++ b/src/Build/Resources/MacOSX/Info.plist.legacy.xml
@@ -74,7 +74,7 @@
 	<string>TRUE</string>
 
 	<key>CFBundleVersion</key>
-	<string>1.25.9</string>
+	<string>1.26.0</string>
 
 	<key>CFBundleShortVersionString</key>
 	<string>_VERSION_</string>
diff --git a/src/Build/Resources/MacOSX/Info.plist.xml b/src/Build/Resources/MacOSX/Info.plist.xml
index 6af60edd..d4729eff 100644
--- a/src/Build/Resources/MacOSX/Info.plist.xml
+++ b/src/Build/Resources/MacOSX/Info.plist.xml
@@ -74,7 +74,7 @@
 	<string>TRUE</string>
 
 	<key>CFBundleVersion</key>
-	<string>1.25.9</string>
+	<string>1.26.0</string>
 
 	<key>CFBundleShortVersionString</key>
 	<string>_VERSION_</string>
diff --git a/src/Common/Tcdefs.h b/src/Common/Tcdefs.h
index f2ffb02b..eb8fefdc 100644
--- a/src/Common/Tcdefs.h
+++ b/src/Common/Tcdefs.h
@@ -73,7 +73,7 @@ extern unsigned short _rotl16(unsigned short value, unsigned char shift);
 #define VERSION_NUM						0x0126
 
 // Release date
-#define TC_STR_RELEASE_DATE			L"March 9, 2022"
+#define TC_STR_RELEASE_DATE			L"March 21, 2022"
 #define TC_RELEASE_DATE_YEAR			2022
 #define TC_RELEASE_DATE_MONTH			 03
 
diff --git a/src/Setup/MacOSX/veracrypt.pkgproj b/src/Setup/MacOSX/veracrypt.pkgproj
index 8a365677..975b90a1 100755
--- a/src/Setup/MacOSX/veracrypt.pkgproj
+++ b/src/Setup/MacOSX/veracrypt.pkgproj
@@ -558,7 +558,7 @@
 				<key>USE_HFS+_COMPRESSION</key>
 				<false/>
 				<key>VERSION</key>
-				<string>1.25.9</string>
+				<string>1.26.0</string>
 			</dict>
 			<key>TYPE</key>
 			<integer>0</integer>
@@ -1026,7 +1026,7 @@ https://osxfuse.github.io/
 				</dict>
 			</array>
 			<key>NAME</key>
-			<string>VeraCrypt 1.25.9</string>
+			<string>VeraCrypt 1.26</string>
 			<key>PAYLOAD_ONLY</key>
 			<false/>
 			<key>TREAT_MISSING_PRESENTATION_DOCUMENTS_AS_WARNING</key>
diff --git a/src/Setup/MacOSX/veracrypt_Legacy.pkgproj b/src/Setup/MacOSX/veracrypt_Legacy.pkgproj
index 3e6e2653..75a879a3 100755
--- a/src/Setup/MacOSX/veracrypt_Legacy.pkgproj
+++ b/src/Setup/MacOSX/veracrypt_Legacy.pkgproj
@@ -557,7 +557,7 @@
 				<key>USE_HFS+_COMPRESSION</key>
 				<false/>
 				<key>VERSION</key>
-				<string>1.25.9</string>
+				<string>1.26.0</string>
 			</dict>
 			<key>TYPE</key>
 			<integer>0</integer>
@@ -1062,7 +1062,7 @@ https://osxfuse.github.io/
 				</dict>
 			</array>
 			<key>NAME</key>
-			<string>VeraCrypt Legacy 1.25.9</string>
+			<string>VeraCrypt Legacy 1.26</string>
 			<key>PAYLOAD_ONLY</key>
 			<false/>
 			<key>TREAT_MISSING_PRESENTATION_DOCUMENTS_AS_WARNING</key>
-- 
cgit v1.2.3