From bf9866e812dee093b2c33b3368b425212360d05b Mon Sep 17 00:00:00 2001 From: Mounir IDRASSI Date: Tue, 30 Nov 2021 23:41:27 +0100 Subject: Increment version to 1.25.4 and set release date to December 3rd 2021 --- Translations/Language.ar.xml | 2 +- Translations/Language.be.xml | 2 +- Translations/Language.bg.xml | 2 +- Translations/Language.ca.xml | 2 +- Translations/Language.cs.xml | 2 +- Translations/Language.da.xml | 2 +- Translations/Language.de.xml | 2 +- Translations/Language.el.xml | 2 +- Translations/Language.es.xml | 2 +- Translations/Language.et.xml | 2 +- Translations/Language.eu.xml | 2 +- Translations/Language.fa.xml | 2 +- Translations/Language.fi.xml | 2 +- Translations/Language.fr.xml | 2 +- Translations/Language.he.xml | 2 +- Translations/Language.hu.xml | 2 +- Translations/Language.id.xml | 2 +- Translations/Language.it.xml | 2 +- Translations/Language.ja.xml | 2 +- Translations/Language.ka.xml | 2 +- Translations/Language.ko.xml | 2 +- Translations/Language.lv.xml | 2 +- Translations/Language.my.xml | 2 +- Translations/Language.nl.xml | 2 +- Translations/Language.nn.xml | 2 +- Translations/Language.pl.xml | 2 +- Translations/Language.pt-br.xml | 2 +- Translations/Language.ro.xml | 2 +- Translations/Language.ru.xml | 2 +- Translations/Language.sk.xml | 2 +- Translations/Language.sl.xml | 2 +- Translations/Language.sv.xml | 2 +- Translations/Language.th.xml | 2 +- Translations/Language.tr.xml | 2 +- Translations/Language.uk.xml | 2 +- Translations/Language.uz.xml | 2 +- Translations/Language.vi.xml | 2 +- Translations/Language.zh-cn.xml | 2 +- Translations/Language.zh-hk.xml | 2 +- Translations/Language.zh-tw.xml | 2 +- doc/chm/VeraCrypt User Guide.chm | Bin 1917053 -> 1917053 bytes doc/html/Release Notes.html | 2 +- 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 | 6 +++--- src/Driver/Driver.rc | 4 ++-- src/ExpandVolume/ExpandVolume.rc | 4 ++-- src/Format/Format.rc | 4 ++-- src/Mount/Mount.rc | 4 ++-- src/Release/Setup Files/Product64.wxs | 4 ++-- src/Release/Setup Files/build_msi_x64.bat | 8 ++++---- src/Setup/MacOSX/veracrypt.pkgproj | 4 ++-- src/Setup/MacOSX/veracrypt_Legacy.pkgproj | 4 ++-- src/Setup/Portable.rc | 4 ++-- src/Setup/Setup.rc | 4 ++-- src/SetupDLL/Setup.rc | 4 ++-- src/Signing/sign.bat | 6 +++--- src/Signing/sign_test.bat | 6 +++--- src/Signing/sign_test_debug.bat | 6 +++--- 60 files changed, 81 insertions(+), 81 deletions(-) diff --git a/Translations/Language.ar.xml b/Translations/Language.ar.xml index dd27b0d2..f9d95bdd 100644 --- a/Translations/Language.ar.xml +++ b/Translations/Language.ar.xml @@ -1,6 +1,6 @@ - + diff --git a/Translations/Language.be.xml b/Translations/Language.be.xml index 975da68c..69439fb5 100644 --- a/Translations/Language.be.xml +++ b/Translations/Language.be.xml @@ -1,6 +1,6 @@ - + diff --git a/Translations/Language.bg.xml b/Translations/Language.bg.xml index f6dfa9c2..6bdd37a2 100644 --- a/Translations/Language.bg.xml +++ b/Translations/Language.bg.xml @@ -1,6 +1,6 @@ - + diff --git a/Translations/Language.ca.xml b/Translations/Language.ca.xml index 43f8efe1..e45a178f 100644 --- a/Translations/Language.ca.xml +++ b/Translations/Language.ca.xml @@ -1,6 +1,6 @@ - + diff --git a/Translations/Language.cs.xml b/Translations/Language.cs.xml index 645b2ec4..e98929d4 100644 --- a/Translations/Language.cs.xml +++ b/Translations/Language.cs.xml @@ -1,6 +1,6 @@ - + diff --git a/Translations/Language.da.xml b/Translations/Language.da.xml index a28c7115..9bdd18e8 100644 --- a/Translations/Language.da.xml +++ b/Translations/Language.da.xml @@ -1,6 +1,6 @@ - + diff --git a/Translations/Language.de.xml b/Translations/Language.de.xml index 9d1522c2..c8d1f805 100644 --- a/Translations/Language.de.xml +++ b/Translations/Language.de.xml @@ -1,6 +1,6 @@ - + diff --git a/Translations/Language.el.xml b/Translations/Language.el.xml index b6157317..5aa3dd5b 100644 --- a/Translations/Language.el.xml +++ b/Translations/Language.el.xml @@ -1,6 +1,6 @@ - + diff --git a/Translations/Language.es.xml b/Translations/Language.es.xml index 3b5bb363..5e377df9 100644 --- a/Translations/Language.es.xml +++ b/Translations/Language.es.xml @@ -1,6 +1,6 @@ - + diff --git a/Translations/Language.et.xml b/Translations/Language.et.xml index 971ba010..53d409f7 100644 --- a/Translations/Language.et.xml +++ b/Translations/Language.et.xml @@ -1,6 +1,6 @@ - + diff --git a/Translations/Language.eu.xml b/Translations/Language.eu.xml index a4adf5a9..77a9dff3 100644 --- a/Translations/Language.eu.xml +++ b/Translations/Language.eu.xml @@ -1,6 +1,6 @@ - + diff --git a/Translations/Language.fa.xml b/Translations/Language.fa.xml index dfdc1bd0..b0dd618b 100644 --- a/Translations/Language.fa.xml +++ b/Translations/Language.fa.xml @@ -1,6 +1,6 @@ - + diff --git a/Translations/Language.fi.xml b/Translations/Language.fi.xml index c9b76e93..08dc5e23 100644 --- a/Translations/Language.fi.xml +++ b/Translations/Language.fi.xml @@ -1,6 +1,6 @@ - + diff --git a/Translations/Language.fr.xml b/Translations/Language.fr.xml index f6bbe533..ad40ebd4 100644 --- a/Translations/Language.fr.xml +++ b/Translations/Language.fr.xml @@ -1,6 +1,6 @@ - + diff --git a/Translations/Language.he.xml b/Translations/Language.he.xml index 70d35477..67b3b3c0 100644 --- a/Translations/Language.he.xml +++ b/Translations/Language.he.xml @@ -1,6 +1,6 @@ - + diff --git a/Translations/Language.hu.xml b/Translations/Language.hu.xml index 89065cdc..02cdb804 100644 --- a/Translations/Language.hu.xml +++ b/Translations/Language.hu.xml @@ -1,6 +1,6 @@ - + diff --git a/Translations/Language.id.xml b/Translations/Language.id.xml index c767d6b9..207cfaca 100644 --- a/Translations/Language.id.xml +++ b/Translations/Language.id.xml @@ -1,6 +1,6 @@ - + diff --git a/Translations/Language.it.xml b/Translations/Language.it.xml index 861b13e3..c985b54f 100644 --- a/Translations/Language.it.xml +++ b/Translations/Language.it.xml @@ -1,6 +1,6 @@ - + diff --git a/Translations/Language.ja.xml b/Translations/Language.ja.xml index 8872cf8d..44577ab3 100644 --- a/Translations/Language.ja.xml +++ b/Translations/Language.ja.xml @@ -1,6 +1,6 @@ - + diff --git a/Translations/Language.ka.xml b/Translations/Language.ka.xml index dbe1e39f..5a7b4d92 100644 --- a/Translations/Language.ka.xml +++ b/Translations/Language.ka.xml @@ -1,6 +1,6 @@ - + diff --git a/Translations/Language.ko.xml b/Translations/Language.ko.xml index 1c764667..c15675e0 100644 --- a/Translations/Language.ko.xml +++ b/Translations/Language.ko.xml @@ -1,6 +1,6 @@ - + diff --git a/Translations/Language.lv.xml b/Translations/Language.lv.xml index 5b46c944..fe0debbc 100644 --- a/Translations/Language.lv.xml +++ b/Translations/Language.lv.xml @@ -1,6 +1,6 @@ - + diff --git a/Translations/Language.my.xml b/Translations/Language.my.xml index 32214100..15d0a150 100644 --- a/Translations/Language.my.xml +++ b/Translations/Language.my.xml @@ -1,6 +1,6 @@ - + diff --git a/Translations/Language.nl.xml b/Translations/Language.nl.xml index e24e6402..489bd9f6 100644 --- a/Translations/Language.nl.xml +++ b/Translations/Language.nl.xml @@ -1,6 +1,6 @@ - + diff --git a/Translations/Language.nn.xml b/Translations/Language.nn.xml index 294a45c2..e5951d5c 100644 --- a/Translations/Language.nn.xml +++ b/Translations/Language.nn.xml @@ -1,6 +1,6 @@ - + diff --git a/Translations/Language.pl.xml b/Translations/Language.pl.xml index dcc9585e..c4513420 100644 --- a/Translations/Language.pl.xml +++ b/Translations/Language.pl.xml @@ -1,6 +1,6 @@ - + diff --git a/Translations/Language.pt-br.xml b/Translations/Language.pt-br.xml index 093766d3..7619e21f 100644 --- a/Translations/Language.pt-br.xml +++ b/Translations/Language.pt-br.xml @@ -1,6 +1,6 @@ - + diff --git a/Translations/Language.ro.xml b/Translations/Language.ro.xml index 3cad48ef..5223df42 100644 --- a/Translations/Language.ro.xml +++ b/Translations/Language.ro.xml @@ -1,6 +1,6 @@ - + diff --git a/Translations/Language.ru.xml b/Translations/Language.ru.xml index d7b08c96..41e7dbcf 100644 --- a/Translations/Language.ru.xml +++ b/Translations/Language.ru.xml @@ -1,6 +1,6 @@ - + diff --git a/Translations/Language.sk.xml b/Translations/Language.sk.xml index a0032b13..1a7b46e0 100644 --- a/Translations/Language.sk.xml +++ b/Translations/Language.sk.xml @@ -1,6 +1,6 @@ - + diff --git a/Translations/Language.sl.xml b/Translations/Language.sl.xml index aae52927..604ad028 100644 --- a/Translations/Language.sl.xml +++ b/Translations/Language.sl.xml @@ -1,6 +1,6 @@ - + diff --git a/Translations/Language.sv.xml b/Translations/Language.sv.xml index 4a47e4c6..17c36293 100644 --- a/Translations/Language.sv.xml +++ b/Translations/Language.sv.xml @@ -1,6 +1,6 @@ - + diff --git a/Translations/Language.th.xml b/Translations/Language.th.xml index 546ff69b..bcba8ac0 100644 --- a/Translations/Language.th.xml +++ b/Translations/Language.th.xml @@ -1,6 +1,6 @@ - + diff --git a/Translations/Language.tr.xml b/Translations/Language.tr.xml index 938a1119..8a10379d 100644 --- a/Translations/Language.tr.xml +++ b/Translations/Language.tr.xml @@ -1,6 +1,6 @@ - + diff --git a/Translations/Language.uk.xml b/Translations/Language.uk.xml index eb380669..fd9df758 100644 --- a/Translations/Language.uk.xml +++ b/Translations/Language.uk.xml @@ -1,6 +1,6 @@ - + diff --git a/Translations/Language.uz.xml b/Translations/Language.uz.xml index 29d3cada..4b8ed087 100644 --- a/Translations/Language.uz.xml +++ b/Translations/Language.uz.xml @@ -1,6 +1,6 @@ - + diff --git a/Translations/Language.vi.xml b/Translations/Language.vi.xml index 21ef805a..49032329 100644 --- a/Translations/Language.vi.xml +++ b/Translations/Language.vi.xml @@ -1,6 +1,6 @@ - + diff --git a/Translations/Language.zh-cn.xml b/Translations/Language.zh-cn.xml index a52b829f..e4fbe960 100644 --- a/Translations/Language.zh-cn.xml +++ b/Translations/Language.zh-cn.xml @@ -1,6 +1,6 @@ - + diff --git a/Translations/Language.zh-hk.xml b/Translations/Language.zh-hk.xml index 47747539..6e4a22c4 100644 --- a/Translations/Language.zh-hk.xml +++ b/Translations/Language.zh-hk.xml @@ -1,6 +1,6 @@ - + diff --git a/Translations/Language.zh-tw.xml b/Translations/Language.zh-tw.xml index ed964add..bc2b8ad1 100644 --- a/Translations/Language.zh-tw.xml +++ b/Translations/Language.zh-tw.xml @@ -1,6 +1,6 @@ - + diff --git a/doc/chm/VeraCrypt User Guide.chm b/doc/chm/VeraCrypt User Guide.chm index d4f9221e..82302a44 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 b3f4cd1a..4b1c1aba 100644 --- a/doc/html/Release Notes.html +++ b/doc/html/Release Notes.html @@ -39,7 +39,7 @@ 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.25 (November 29th, 2021):

+

1.25.4 (December 3rd, 2021):

  • All OSes:
      diff --git a/src/Build/CMakeLists.txt b/src/Build/CMakeLists.txt index 529f0e84..4f88523b 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" ) -set( VERSION "1.25.3" ) +set( FULL_VERSION "1.25.4" ) +set( VERSION "1.25.4" ) 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 89bd93ce..6d4aa2ed 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.25.3 + 1.25.4 CFBundleShortVersionString _VERSION_ diff --git a/src/Build/Resources/MacOSX/Info.plist.xml b/src/Build/Resources/MacOSX/Info.plist.xml index 95f5baa7..cd7da625 100644 --- a/src/Build/Resources/MacOSX/Info.plist.xml +++ b/src/Build/Resources/MacOSX/Info.plist.xml @@ -74,7 +74,7 @@ TRUE CFBundleVersion - 1.25.3 + 1.25.4 CFBundleShortVersionString _VERSION_ diff --git a/src/Common/Tcdefs.h b/src/Common/Tcdefs.h index 5689a9ee..d7dc73d2 100644 --- a/src/Common/Tcdefs.h +++ b/src/Common/Tcdefs.h @@ -55,7 +55,7 @@ extern unsigned short _rotl16(unsigned short value, unsigned char shift); #define TC_APP_NAME "VeraCrypt" // Version displayed to user -#define VERSION_STRING "1.25" +#define VERSION_STRING "1.25.4" #ifdef VC_EFI_CUSTOM_MODE #define VERSION_STRING_SUFFIX "-CustomEFI" @@ -67,9 +67,9 @@ extern unsigned short _rotl16(unsigned short value, unsigned char shift); #define VERSION_NUM 0x0125 // Release date -#define TC_STR_RELEASE_DATE L"November 29, 2021" +#define TC_STR_RELEASE_DATE L"December 3, 2021" #define TC_RELEASE_DATE_YEAR 2021 -#define TC_RELEASE_DATE_MONTH 11 +#define TC_RELEASE_DATE_MONTH 12 #define BYTES_PER_KB 1024LL #define BYTES_PER_MB 1048576LL diff --git a/src/Driver/Driver.rc b/src/Driver/Driver.rc index 0184983e..43c299f2 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,3,0 - PRODUCTVERSION 1,25,3,0 + FILEVERSION 1,25,4,0 + PRODUCTVERSION 1,25,4,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L diff --git a/src/ExpandVolume/ExpandVolume.rc b/src/ExpandVolume/ExpandVolume.rc index 14ce9f35..79bb22b2 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,25,3,0 - PRODUCTVERSION 1,25,3,0 + FILEVERSION 1,25,4,0 + PRODUCTVERSION 1,25,4,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L diff --git a/src/Format/Format.rc b/src/Format/Format.rc index dfa00f2d..dd7251c8 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,25,3,0 - PRODUCTVERSION 1,25,3,0 + FILEVERSION 1,25,4,0 + PRODUCTVERSION 1,25,4,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L diff --git a/src/Mount/Mount.rc b/src/Mount/Mount.rc index e04fcf7b..d365e033 100644 --- a/src/Mount/Mount.rc +++ b/src/Mount/Mount.rc @@ -559,8 +559,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,25,3,0 - PRODUCTVERSION 1,25,3,0 + FILEVERSION 1,25,4,0 + PRODUCTVERSION 1,25,4,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L diff --git a/src/Release/Setup Files/Product64.wxs b/src/Release/Setup Files/Product64.wxs index e524e810..23f89387 100644 --- a/src/Release/Setup Files/Product64.wxs +++ b/src/Release/Setup Files/Product64.wxs @@ -4,7 +4,7 @@ - + @@ -12,7 +12,7 @@ - + diff --git a/src/Release/Setup Files/build_msi_x64.bat b/src/Release/Setup Files/build_msi_x64.bat index 476625b0..e610160a 100644 --- a/src/Release/Setup Files/build_msi_x64.bat +++ b/src/Release/Setup Files/build_msi_x64.bat @@ -118,7 +118,7 @@ cd %MSI_BUILDPATH% @if NOT "%ERRORLEVEL%" == "0" goto msi_failed "%VC_DIR_WIX%\candle.exe" -dLang=en -arch x64 -ext WixUIExtension -ext WiXUtilExtension Custom_InstallDirDlg.wxs -out out\64\en-us\Custom_InstallDirDlg.wixobj @if NOT "%ERRORLEVEL%" == "0" goto msi_failed -"%VC_DIR_WIX%\Light.exe" -ext WixUIExtension -ext WiXUtilExtension -cultures:en-us -loc Strings-en.wxl out\64\en-us\Product.wixobj out\64\en-us\Custom_InstallDirDlg.wixobj out\64\en-us\Custom_InstallDir.wixobj -out out\64\en-us\VeraCrypt_%1_Setup_en-us.msi -pdbout out\64\en-us\VeraCrypt_%1_Setup_en-us.wixpdb -sice:ICE09 +"%VC_DIR_WIX%\Light.exe" -ext WixUIExtension -ext WiXUtilExtension -cultures:en-us -loc Strings-en.wxl out\64\en-us\Product.wixobj out\64\en-us\Custom_InstallDirDlg.wixobj out\64\en-us\Custom_InstallDir.wixobj -out out\64\en-us\VeraCrypt_Setup_%1_en-us.msi -pdbout out\64\en-us\VeraCrypt_Setup_%1_en-us.wixpdb -sice:ICE09 @if NOT "%ERRORLEVEL%" == "0" goto msi_failed ::------------------------------------ @@ -129,8 +129,8 @@ cd %MSI_BUILDPATH% @set OUT_PATH=%cd%\out\64\ @echo [INFO] OUT_PATH=%OUT_PATH% -@set MSI_FILE_IN=VeraCrypt_%1_Setup -@set MSI_FILE_OUT=VeraCrypt_%1_Setup_x64 +@set MSI_FILE_IN=VeraCrypt_Setup_%1 +@set MSI_FILE_OUT=VeraCrypt_Setup_x64_%1 :: Check if all the MSI files were built @set LANG=en-us @@ -152,7 +152,7 @@ cd %MSI_BUILDPATH% mkdir bin @copy /Y "%OUT_PATH%\%MSI_FILE_OUT%.msi" "%cd%\bin\%MSI_FILE_OUT%.msi" @set LANG=en-us -@copy /Y "%OUT_PATH%\%LANG%\%MSI_FILE_IN%_%LANG%.msi" "%cd%\bin\%MSI_FILE_IN%_x64_%LANG%.msi" +@copy /Y "%OUT_PATH%\%LANG%\%MSI_FILE_IN%_%LANG%.msi" "%cd%\bin\%MSI_FILE_OUT%_%LANG%.msi" @rmdir /S /Q "%cd%\out" goto END diff --git a/src/Setup/MacOSX/veracrypt.pkgproj b/src/Setup/MacOSX/veracrypt.pkgproj index bbfe5086..9a71aa7c 100755 --- a/src/Setup/MacOSX/veracrypt.pkgproj +++ b/src/Setup/MacOSX/veracrypt.pkgproj @@ -557,7 +557,7 @@ USE_HFS+_COMPRESSION VERSION - 1.25.3 + 1.25.4 TYPE 0 @@ -1025,7 +1025,7 @@ https://osxfuse.github.io/ NAME - VeraCrypt 1.25 + VeraCrypt 1.25.4 PAYLOAD_ONLY TREAT_MISSING_PRESENTATION_DOCUMENTS_AS_WARNING diff --git a/src/Setup/MacOSX/veracrypt_Legacy.pkgproj b/src/Setup/MacOSX/veracrypt_Legacy.pkgproj index c03503ab..31d5c753 100755 --- a/src/Setup/MacOSX/veracrypt_Legacy.pkgproj +++ b/src/Setup/MacOSX/veracrypt_Legacy.pkgproj @@ -557,7 +557,7 @@ USE_HFS+_COMPRESSION VERSION - 1.25.3 + 1.25.4 TYPE 0 @@ -1062,7 +1062,7 @@ https://osxfuse.github.io/ NAME - VeraCrypt Legacy 1.25 + VeraCrypt Legacy 1.25.4 PAYLOAD_ONLY TREAT_MISSING_PRESENTATION_DOCUMENTS_AS_WARNING diff --git a/src/Setup/Portable.rc b/src/Setup/Portable.rc index 5df8ff68..75f7fc05 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,25,3,0 - PRODUCTVERSION 1,25,3,0 + FILEVERSION 1,25,4,0 + PRODUCTVERSION 1,25,4,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L diff --git a/src/Setup/Setup.rc b/src/Setup/Setup.rc index 334bb6b8..1c055869 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,25,3,0 - PRODUCTVERSION 1,25,3,0 + FILEVERSION 1,25,4,0 + PRODUCTVERSION 1,25,4,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L diff --git a/src/SetupDLL/Setup.rc b/src/SetupDLL/Setup.rc index 1e2697ac..da7c2043 100644 --- a/src/SetupDLL/Setup.rc +++ b/src/SetupDLL/Setup.rc @@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,25,3,0 - PRODUCTVERSION 1,25,3,0 + FILEVERSION 1,25,4,0 + PRODUCTVERSION 1,25,4,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L diff --git a/src/Signing/sign.bat b/src/Signing/sign.bat index 435517f4..46af0620 100644 --- a/src/Signing/sign.bat +++ b/src/Signing/sign.bat @@ -1,7 +1,7 @@ PATH=%PATH%;%WSDK81%\bin\x86;C:\Program Files\7-Zip;C:\Program Files (x86)\7-Zip -set VC_VERSION=1.25 -set VC_VERSION_NBRE=1.25.3 +set VC_VERSION=1.25.4 +set VC_VERSION_NBRE=1.25.4 set SIGNINGPATH=%~dp0 cd %SIGNINGPATH% @@ -58,6 +58,6 @@ rmdir /S /Q docs cd %SIGNINGPATH% rem sign Setup using SHA-256 -signtool sign /v /sha1 2B174F12D921AF2FF576D867BE91E97E4ADC7D07 /ac GlobalSign_SHA256_EV_CodeSigning_CA.cer /fd sha256 /tr http://timestamp.digicert.com /td SHA256 "..\Release\Setup Files\VeraCrypt Setup %VC_VERSION%.exe" "..\Release\Setup Files\VeraCrypt Portable %VC_VERSION%.exe" "..\Release\Setup Files\bin\VeraCrypt_%VC_VERSION_NBRE%_Setup_x64.msi" "..\Release\Setup Files\bin\VeraCrypt_%VC_VERSION_NBRE%_Setup_x64_en-us.msi" +signtool sign /v /sha1 2B174F12D921AF2FF576D867BE91E97E4ADC7D07 /ac GlobalSign_SHA256_EV_CodeSigning_CA.cer /fd sha256 /tr http://timestamp.digicert.com /td SHA256 "..\Release\Setup Files\VeraCrypt Setup %VC_VERSION%.exe" "..\Release\Setup Files\VeraCrypt Portable %VC_VERSION%.exe" "..\Release\Setup Files\bin\VeraCrypt_Setup_x64_%VC_VERSION_NBRE%.msi" "..\Release\Setup Files\bin\VeraCrypt_Setup_x64_%VC_VERSION_NBRE%_en-us.msi" pause diff --git a/src/Signing/sign_test.bat b/src/Signing/sign_test.bat index b001e03f..320e3a60 100644 --- a/src/Signing/sign_test.bat +++ b/src/Signing/sign_test.bat @@ -1,6 +1,6 @@ PATH=%PATH%;%WSDK81%\bin\x86;C:\Program Files\7-Zip;C:\Program Files (x86)\7-Zip -set VC_VERSION=1.25 -set VC_VERSION_NBRE=1.25.3 +set VC_VERSION=1.25.4 +set VC_VERSION_NBRE=1.25.4 set PFXNAME=TestCertificate\idrix_codeSign.pfx set PFXPASSWORD=idrix set PFXCA=TestCertificate\idrix_TestRootCA.crt @@ -76,6 +76,6 @@ rem dual-sign Setup using SHA-256 signtool sign /v /a /f %SHA256PFXNAME% /p %SHA256PFXPASSWORD% /ac %SHA256PFXCA% /as /fd sha256 /tr http://rfc3161timestamp.globalsign.com/advanced /td SHA256 "..\Release\Setup Files\VeraCrypt Setup %VC_VERSION%.exe" rem single sign MSI using SHA-256 -signtool sign /v /a /f %SHA256PFXNAME% /p %SHA256PFXPASSWORD% /ac %SHA256PFXCA% /fd sha256 /tr http://rfc3161timestamp.globalsign.com/advanced /td SHA256 "..\Release\Setup Files\bin\VeraCrypt_%VC_VERSION_NBRE%_Setup_x64.msi" "..\Release\Setup Files\bin\VeraCrypt_%VC_VERSION_NBRE%_Setup_x64_en-us.msi" +signtool sign /v /a /f %SHA256PFXNAME% /p %SHA256PFXPASSWORD% /ac %SHA256PFXCA% /fd sha256 /tr http://rfc3161timestamp.globalsign.com/advanced /td SHA256 "..\Release\Setup Files\bin\VeraCrypt_Setup_x64_%VC_VERSION_NBRE%.msi" "..\Release\Setup Files\bin\VeraCrypt_Setup_x64_%VC_VERSION_NBRE%_en-us.msi" pause \ No newline at end of file diff --git a/src/Signing/sign_test_debug.bat b/src/Signing/sign_test_debug.bat index 5696029a..40fa6c45 100644 --- a/src/Signing/sign_test_debug.bat +++ b/src/Signing/sign_test_debug.bat @@ -1,6 +1,6 @@ PATH=%PATH%;%WSDK81%\bin\x86;C:\Program Files\7-Zip;C:\Program Files (x86)\7-Zip -set VC_VERSION=1.25 -set VC_VERSION_NBRE=1.25.3 +set VC_VERSION=1.25.4 +set VC_VERSION_NBRE=1.25.4 set PFXNAME=TestCertificate\idrix_codeSign.pfx set PFXPASSWORD=idrix set PFXCA=TestCertificate\idrix_TestRootCA.crt @@ -74,6 +74,6 @@ rem dual-sign Setup using SHA-256 signtool sign /v /a /f %SHA256PFXNAME% /p %SHA256PFXPASSWORD% /ac %SHA256PFXCA% /as /fd sha256 /tr http://rfc3161timestamp.globalsign.com/advanced /td SHA256 "..\Debug\Setup Files\VeraCrypt Setup %VC_VERSION%.exe" rem single sign MSI using SHA-256 -signtool sign /v /a /f %SHA256PFXNAME% /p %SHA256PFXPASSWORD% /ac %SHA256PFXCA% /fd sha256 /tr http://rfc3161timestamp.globalsign.com/advanced /td SHA256 "..\Debug\Setup Files\bin\VeraCrypt_%VC_VERSION_NBRE%_Setup_x64.msi" "..\Debug\Setup Files\bin\VeraCrypt_%VC_VERSION_NBRE%_Setup_x64_en-us.msi" +signtool sign /v /a /f %SHA256PFXNAME% /p %SHA256PFXPASSWORD% /ac %SHA256PFXCA% /fd sha256 /tr http://rfc3161timestamp.globalsign.com/advanced /td SHA256 "..\Debug\Setup Files\bin\VeraCrypt_Setup_x64_%VC_VERSION_NBRE%.msi" "..\Debug\Setup Files\bin\VeraCrypt_Setup_x64_%VC_VERSION_NBRE%_en-us.msi" pause \ No newline at end of file -- cgit v1.2.3