diff --git a/doc/chm/VeraCrypt User Guide.chm b/doc/chm/VeraCrypt User Guide.chm
index fa85ddbc..4a8ae925 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 6a712962..7781aa0b 100644
--- a/doc/html/Release Notes.html
+++ b/doc/html/Release Notes.html
@@ -39,13 +39,14 @@
Release Notes
Note to users who created volumes with 1.17 version of VeraCrypt or earlier:
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.
-1.24-Update7(July 22nd, 2020):
+1.24-Update7(August 3rd, 2020):
- All OSes:
- Don't allow Hidden volume to have the same password, PIM and keyfiles as Outer volume
- Fix random crash in 32-bit builds when using Streebog.
- Enable FIPS mode in JitterEntropy random generator.
+- Update Beginner's Tutorial in documentation to use "MyVolume.hc" instead of "My Volume" for file container name in order to avoid confusion about nature of file nature.
- Minor code cleanup
@@ -53,6 +54,7 @@ Release Notes
- Fix wrong results in benchmark of encryption algorithms when RAM encryption is enabled
- Fix issue when RAM encryption used, AES selected and AES-NI not supported by CPU that caused the free space of newly created volumes not filled with random data even if "quick format" is not selected.
+- Fix UI for blocking TRIM in system encryption not working in MBR boot mode.
- Support password drag-n-drop from external applications (e.g. KeePass) to password UI fields which is more secure than using clipboard.
- Implements compatibility with Windows 10 Modern Standby and Windows 8.1 Connected Standby power model. This makes detection of entring power saving mode more reliable.
- Avoid displaying waiting dialog when /silent specified for "VeraCrypt Format" during creating of file container using /create switch and a filesystem other than FAT.
@@ -62,6 +64,10 @@ Release Notes
- Implement detection of Hibernate and Fast Startup and disable them if RAM encryption is activated.
- Warn about Fast Startup if it is enabled during VeraCrypt installation/upgrade, when starting system encryption or when creating a volume, and propose to disable it.
- Add UI options to control the behavior of automatic bootloader fixing when System Encryption used.
+- Don't allow a directory path to be entered for the file container to be created in Format wizard.
+- Don't try to use fix for CVE-2019-19501 if Windows Shell has been modified or is not running since there is no reliable way to fix it in such non standard configuation.
+- MBR bootloader: fix incorrect compressed data size passed to decompressor in boot sector.
+- Update libzip to latest version 1.7.3.
- Update translations.
@@ -70,6 +76,7 @@ Release Notes
- Force reading of at least 32 bytes from /dev/random before allowing it to fail gracefully
- Allow choosing a filesystem other than FAT for Outer volume but display warning about risks of such choice. Implement an estimation of maximum possible size of hidden volume in this case.
- Erase sensitive memory explicitly instead of relying on the compiler not optimizing calls to method Memory::Erase.
+- Update wxWidgets for static builds to version 3.0.5.
diff --git a/src/Build/CMakeLists.txt b/src/Build/CMakeLists.txt
index 79ea4b87..32e5755d 100644
--- a/src/Build/CMakeLists.txt
+++ b/src/Build/CMakeLists.txt
@@ -12,7 +12,7 @@ endif()
# - Set version of the package
set( FULL_VERSION "1.24-Update7" )
-set( VERSION "1.24.20" )
+set( VERSION "1.24.21" )
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 f5bf2820..6450fadd 100644
--- a/src/Build/Resources/MacOSX/Info.plist.legacy.xml
+++ b/src/Build/Resources/MacOSX/Info.plist.legacy.xml
@@ -74,7 +74,7 @@
TRUE
CFBundleVersion
- 1.24.20
+ 1.24.21
CFBundleShortVersionString
_VERSION_
diff --git a/src/Build/Resources/MacOSX/Info.plist.xml b/src/Build/Resources/MacOSX/Info.plist.xml
index b4a824db..e1f886a2 100644
--- a/src/Build/Resources/MacOSX/Info.plist.xml
+++ b/src/Build/Resources/MacOSX/Info.plist.xml
@@ -74,7 +74,7 @@
TRUE
CFBundleVersion
- 1.24.20
+ 1.24.21
CFBundleShortVersionString
_VERSION_
diff --git a/src/Common/Tcdefs.h b/src/Common/Tcdefs.h
index 080859b1..8d17c381 100644
--- a/src/Common/Tcdefs.h
+++ b/src/Common/Tcdefs.h
@@ -67,9 +67,9 @@ extern unsigned short _rotl16(unsigned short value, unsigned char shift);
#define VERSION_NUM 0x0124
// Release date
-#define TC_STR_RELEASE_DATE L"July 22, 2020"
+#define TC_STR_RELEASE_DATE L"August 3, 2020"
#define TC_RELEASE_DATE_YEAR 2020
-#define TC_RELEASE_DATE_MONTH 7
+#define TC_RELEASE_DATE_MONTH 8
#define BYTES_PER_KB 1024LL
#define BYTES_PER_MB 1048576LL
diff --git a/src/ExpandVolume/ExpandVolume.rc b/src/ExpandVolume/ExpandVolume.rc
index b9969c5a..0898865e 100644
--- a/src/ExpandVolume/ExpandVolume.rc
+++ b/src/ExpandVolume/ExpandVolume.rc
@@ -193,8 +193,8 @@ IDR_MOUNT_RSRC_HEADER HEADER "resource.h"
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,24,20,0
- PRODUCTVERSION 1,24,20,0
+ FILEVERSION 1,24,21,0
+ PRODUCTVERSION 1,24,21,0
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
diff --git a/src/Format/Format.rc b/src/Format/Format.rc
index b8fb87d4..e98d84b0 100644
--- a/src/Format/Format.rc
+++ b/src/Format/Format.rc
@@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,24,20,0
- PRODUCTVERSION 1,24,20,0
+ FILEVERSION 1,24,21,0
+ PRODUCTVERSION 1,24,21,0
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
diff --git a/src/Mount/Mount.rc b/src/Mount/Mount.rc
index f00aab1e..d895e48e 100644
--- a/src/Mount/Mount.rc
+++ b/src/Mount/Mount.rc
@@ -559,8 +559,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,24,20,0
- PRODUCTVERSION 1,24,20,0
+ FILEVERSION 1,24,21,0
+ PRODUCTVERSION 1,24,21,0
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
diff --git a/src/Setup/MacOSX/veracrypt.pkgproj b/src/Setup/MacOSX/veracrypt.pkgproj
index 387fc4ff..2a90c5e3 100755
--- a/src/Setup/MacOSX/veracrypt.pkgproj
+++ b/src/Setup/MacOSX/veracrypt.pkgproj
@@ -555,7 +555,7 @@
USE_HFS+_COMPRESSION
VERSION
- 1.24.20
+ 1.24.21
TYPE
0
diff --git a/src/Setup/MacOSX/veracrypt_Legacy.pkgproj b/src/Setup/MacOSX/veracrypt_Legacy.pkgproj
index 8f9a73b4..64731a11 100755
--- a/src/Setup/MacOSX/veracrypt_Legacy.pkgproj
+++ b/src/Setup/MacOSX/veracrypt_Legacy.pkgproj
@@ -555,7 +555,7 @@
USE_HFS+_COMPRESSION
VERSION
- 1.24.20
+ 1.24.21
TYPE
0
diff --git a/src/Setup/Portable.rc b/src/Setup/Portable.rc
index d2412008..e3aa0880 100644
--- a/src/Setup/Portable.rc
+++ b/src/Setup/Portable.rc
@@ -26,8 +26,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,24,20,0
- PRODUCTVERSION 1,24,20,0
+ FILEVERSION 1,24,21,0
+ PRODUCTVERSION 1,24,21,0
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
diff --git a/src/Setup/Setup.rc b/src/Setup/Setup.rc
index e50fc8e1..c8844ede 100644
--- a/src/Setup/Setup.rc
+++ b/src/Setup/Setup.rc
@@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,24,20,0
- PRODUCTVERSION 1,24,20,0
+ FILEVERSION 1,24,21,0
+ PRODUCTVERSION 1,24,21,0
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L