mirrors/VeraCrypt
1
0
Fork 0
mirror of https://github.com/veracrypt/VeraCrypt.git synced 2026-09-03 14:47:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: mirrors/VeraCrypt:VeraCrypt_1.24
Branches Tags
mirrors/VeraCrypt:master mirrors/VeraCrypt:pr-1756-maintainer-fix mirrors/VeraCrypt:fix/awk-hash-warning mirrors/VeraCrypt:feature/windows-nonsys-inplace-recovery-ro mirrors/VeraCrypt:arch-packaging-support mirrors/VeraCrypt:Argon2_1.26.13 mirrors/VeraCrypt:revert-1404-master mirrors/VeraCrypt:VC_CHANGER mirrors/VeraCrypt:SysEncWizardPR957 mirrors/VeraCrypt:NewSysEncWizard
mirrors/VeraCrypt:VeraCrypt_1.26.29 mirrors/VeraCrypt:VeraCrypt_1.26.28_Beta4 mirrors/VeraCrypt:VeraCrypt_1.26.28_Beta3 mirrors/VeraCrypt:VeraCrypt_1.26.28_Beta2 mirrors/VeraCrypt:VeraCrypt_1.26.28_Beta mirrors/VeraCrypt:VeraCrypt_1.26.24 mirrors/VeraCrypt:VeraCrypt_1.26.20 mirrors/VeraCrypt:VeraCrypt_1.26.19 mirrors/VeraCrypt:VeraCrypt_1.26.18 mirrors/VeraCrypt:VeraCrypt_1.26.15 mirrors/VeraCrypt:VeraCrypt_1.26.14 mirrors/VeraCrypt:VeraCrypt_1.26.7 mirrors/VeraCrypt:VeraCrypt_1.26.6 mirrors/VeraCrypt:VeraCrypt_1.25.9 mirrors/VeraCrypt:VeraCrypt_1.25.7 mirrors/VeraCrypt:VeraCrypt_1.25.4 mirrors/VeraCrypt:VeraCrypt_1.24-Update8_MacOSX mirrors/VeraCrypt:VeraCrypt_1.24-Update7 mirrors/VeraCrypt:VeraCrypt_1.24-Update6 mirrors/VeraCrypt:VeraCrypt_1.24-Update5 mirrors/VeraCrypt:VeraCrypt_1.24-Update4 mirrors/VeraCrypt:VeraCrypt_1.24-Update3 mirrors/VeraCrypt:VeraCrypt_1.24-Update2 mirrors/VeraCrypt:VeraCrypt_1.24-Hotfix1 mirrors/VeraCrypt:VeraCrypt_1.24 mirrors/VeraCrypt:VeraCrypt_1.23 mirrors/VeraCrypt:VeraCrypt_1.22 mirrors/VeraCrypt:VeraCrypt_1.21 mirrors/VeraCrypt:VeraCrypt_1.20 mirrors/VeraCrypt:VeraCrypt_1.19 mirrors/VeraCrypt:VeraCrypt_1.18 mirrors/VeraCrypt:VeraCrypt_1.18a mirrors/VeraCrypt:VeraCrypt_1.18_PreRelease mirrors/VeraCrypt:VeraCrypt_1.17 mirrors/VeraCrypt:VeraCrypt_1.16 mirrors/VeraCrypt:VeraCrypt_1.15 mirrors/VeraCrypt:VeraCrypt_1.14 mirrors/VeraCrypt:VeraCrypt_1.13 mirrors/VeraCrypt:VeraCrypt_1.12 mirrors/VeraCrypt:VeraCrypt_1.0f-2 mirrors/VeraCrypt:VeraCrypt_1.0f-1 mirrors/VeraCrypt:VeraCrypt_1.0f mirrors/VeraCrypt:VeraCrypt_1.0f-BETA3 mirrors/VeraCrypt:VeraCrypt_1.0f-BETA2 mirrors/VeraCrypt:VeraCrypt_1.0f-BETA mirrors/VeraCrypt:VeraCrypt_Linux_1.0f-BETA mirrors/VeraCrypt:VeraCrypt_MacOSX_1.0f-BETA mirrors/VeraCrypt:VeraCrypt_MacOSX_1.0e mirrors/VeraCrypt:VeraCrypt_1.0e mirrors/VeraCrypt:VeraCrypt_Linux_1.0e mirrors/VeraCrypt:VeraCrypt_MacOSX_1.0d mirrors/VeraCrypt:VeraCrypt_Linux_1.0d mirrors/VeraCrypt:VeraCrypt_1.0d mirrors/VeraCrypt:VeraCrypt_1.0c mirrors/VeraCrypt:VeraCrypt_1.0b mirrors/VeraCrypt:VeraCrypt_1.0a
...
compare: mirrors/VeraCrypt:VeraCrypt_1.24-Hotfix1
Branches Tags
mirrors/VeraCrypt:master mirrors/VeraCrypt:pr-1756-maintainer-fix mirrors/VeraCrypt:fix/awk-hash-warning mirrors/VeraCrypt:feature/windows-nonsys-inplace-recovery-ro mirrors/VeraCrypt:arch-packaging-support mirrors/VeraCrypt:Argon2_1.26.13 mirrors/VeraCrypt:revert-1404-master mirrors/VeraCrypt:VC_CHANGER mirrors/VeraCrypt:SysEncWizardPR957 mirrors/VeraCrypt:NewSysEncWizard
mirrors/VeraCrypt:VeraCrypt_1.26.29 mirrors/VeraCrypt:VeraCrypt_1.26.28_Beta4 mirrors/VeraCrypt:VeraCrypt_1.26.28_Beta3 mirrors/VeraCrypt:VeraCrypt_1.26.28_Beta2 mirrors/VeraCrypt:VeraCrypt_1.26.28_Beta mirrors/VeraCrypt:VeraCrypt_1.26.24 mirrors/VeraCrypt:VeraCrypt_1.26.20 mirrors/VeraCrypt:VeraCrypt_1.26.19 mirrors/VeraCrypt:VeraCrypt_1.26.18 mirrors/VeraCrypt:VeraCrypt_1.26.15 mirrors/VeraCrypt:VeraCrypt_1.26.14 mirrors/VeraCrypt:VeraCrypt_1.26.7 mirrors/VeraCrypt:VeraCrypt_1.26.6 mirrors/VeraCrypt:VeraCrypt_1.25.9 mirrors/VeraCrypt:VeraCrypt_1.25.7 mirrors/VeraCrypt:VeraCrypt_1.25.4 mirrors/VeraCrypt:VeraCrypt_1.24-Update8_MacOSX mirrors/VeraCrypt:VeraCrypt_1.24-Update7 mirrors/VeraCrypt:VeraCrypt_1.24-Update6 mirrors/VeraCrypt:VeraCrypt_1.24-Update5 mirrors/VeraCrypt:VeraCrypt_1.24-Update4 mirrors/VeraCrypt:VeraCrypt_1.24-Update3 mirrors/VeraCrypt:VeraCrypt_1.24-Update2 mirrors/VeraCrypt:VeraCrypt_1.24-Hotfix1 mirrors/VeraCrypt:VeraCrypt_1.24 mirrors/VeraCrypt:VeraCrypt_1.23 mirrors/VeraCrypt:VeraCrypt_1.22 mirrors/VeraCrypt:VeraCrypt_1.21 mirrors/VeraCrypt:VeraCrypt_1.20 mirrors/VeraCrypt:VeraCrypt_1.19 mirrors/VeraCrypt:VeraCrypt_1.18 mirrors/VeraCrypt:VeraCrypt_1.18a mirrors/VeraCrypt:VeraCrypt_1.18_PreRelease mirrors/VeraCrypt:VeraCrypt_1.17 mirrors/VeraCrypt:VeraCrypt_1.16 mirrors/VeraCrypt:VeraCrypt_1.15 mirrors/VeraCrypt:VeraCrypt_1.14 mirrors/VeraCrypt:VeraCrypt_1.13 mirrors/VeraCrypt:VeraCrypt_1.12 mirrors/VeraCrypt:VeraCrypt_1.0f-2 mirrors/VeraCrypt:VeraCrypt_1.0f-1 mirrors/VeraCrypt:VeraCrypt_1.0f mirrors/VeraCrypt:VeraCrypt_1.0f-BETA3 mirrors/VeraCrypt:VeraCrypt_1.0f-BETA2 mirrors/VeraCrypt:VeraCrypt_1.0f-BETA mirrors/VeraCrypt:VeraCrypt_Linux_1.0f-BETA mirrors/VeraCrypt:VeraCrypt_MacOSX_1.0f-BETA mirrors/VeraCrypt:VeraCrypt_MacOSX_1.0e mirrors/VeraCrypt:VeraCrypt_1.0e mirrors/VeraCrypt:VeraCrypt_Linux_1.0e mirrors/VeraCrypt:VeraCrypt_MacOSX_1.0d mirrors/VeraCrypt:VeraCrypt_Linux_1.0d mirrors/VeraCrypt:VeraCrypt_1.0d mirrors/VeraCrypt:VeraCrypt_1.0c mirrors/VeraCrypt:VeraCrypt_1.0b mirrors/VeraCrypt:VeraCrypt_1.0a
46 Commits
VeraCrypt_1.24 ... VeraCrypt_1.24-Hotfix1
Author SHA1 Message Date
Mounir IDRASSI ac684352e6 Windows: use strcmp to compare effective content of std::string since == operator may return false if one of the strins has an extra \0 at the end. 2019-10-27 13:10:18 +01:00
Mounir IDRASSI 1ae99f2e67 Windows: Update Release Notes and set 1.24-Hotfix1 release date to October 27th. 2019-10-27 10:46:32 +01:00
Mounir IDRASSI 94084525b1 Windows: fix failure to create rescue and thus to encrypt the system if the Windows username contains a UNICODE non-ASCII character (cf https://github.com/veracrypt/VeraCrypt/issues/441) 2019-10-27 02:30:15 +02:00
Mounir IDRASSI b1b692d4a3 Windows: Only update boot configuration on disk if the user actually changed something in the UI 2019-10-27 02:05:00 +02:00
Mounir IDRASSI 2722b46530 Windows: code refactoring and convert NTSTATUS error code to WIN32 equivalent before displaying error message. 2019-10-27 02:04:51 +02:00
Mounir IDRASSI 89e2547851 Windows: Make EFI System Encryption PostOOBE code more robust to failure to access "\\\\?\\GLOBALROOT" disk namespace 2019-10-27 02:04:43 +02:00
Mounir IDRASSI ca46cf928a Windows: Update EFI NVRAM variable only if changed or doesn't exist and add configuration to force setting EFI BootNext to veraCrypt bootloader before each shutdown 2019-10-27 02:04:34 +02:00
Mounir IDRASSI f22abf93dd Windows: Restore veraCrypt boot meny entry for system encryption more often, especially during PostOOBE calls, and handle additional corner cases. 2019-10-26 22:09:27 +02:00
Mounir IDRASSI 7484c07364 Linux: Add build script for OpenSUSE 2019-10-26 18:43:18 +02:00
Mounir IDRASSI 0e4ab56e12 MacOSX: Update build script and Makefile to correctly build Legacy version of VeraCrypt that targets OSX 10.7+. 2019-10-26 00:17:23 +02:00
Mounir IDRASSI 0ca62a37d6 MacOSX: fix truncated algorithms description in the Encryption Options page of the volume creation wizard, which happened after moving to wxWidgets 3.1.2 2019-10-26 00:17:16 +02:00
Mounir IDRASSI 6bf37280d6 MacOSX: use wxWidgets 3.1.2 for the legacy build which is now done with SDK 10.9 while still targeting OSX 10.7. 2019-10-26 00:17:08 +02:00
Mounir IDRASSI 38b5af907e Set release date of 1.24-Hotfix1 to October 25th. 2019-10-25 18:25:44 +02:00
Mounir IDRASSI 28fc65e479 Windows: Fix test of GetPrivateProfileString output since this function discards double quotation marks 2019-10-25 18:25:29 +02:00
Mounir IDRASSI 343d1a95dc Windows: only update MBR first 512 bytes if they have changed and don't update full MBR bootload in case of PostOOBE 2019-10-25 14:47:51 +02:00
Mounir IDRASSI faa541f613 Windows: for system encryption case, also perform automatic fix of boot configuration if MBR boot used and not only EFI. 2019-10-25 14:47:44 +02:00
Mounir IDRASSI 318b00b6a2 Windows: Avoid unnecessarily update of system encryption SetupConfig related files if there content didn't change 2019-10-25 14:47:37 +02:00
Bugi4BugiandMounir IDRASSI 4ea4f36010 Update Langage.fr.xml (#526) 
Just a little mistake, Mainteant > Maintenant.
 2019-10-25 00:22:18 +02:00
Mounir IDRASSI 7745db6e4a MacOSX: Add dedicated installer for legacy version that targets OSX 10.7+ and update requirement for new installer to be OSX 10.9+ and 64-bit only. 2019-10-24 23:41:59 +02:00
Mounir IDRASSI 5031e69651 MacOSX: fix typo in MacOSX legacy build script 2019-10-24 23:41:52 +02:00
Mounir IDRASSI 96c90d18c2 Linux/MacOSX: Better approach to avoid that jitterentropy code is optimized by the compiler 2019-10-24 21:07:39 +02:00
Mounir IDRASSI 6b90e02624 Increment version to 1.24-Hotfix1 2019-10-24 00:10:34 +02:00
Mounir IDRASSI 692e2c3455 Linux: set version explicitly in CMakeLists.txt instead of relying on parsing of Tcdefs.h which can be erroneous 2019-10-24 00:10:27 +02:00
Mounir IDRASSI 2b65a14301 Windows: display prompt to upgrade Rescue Disk when installing 1.24 version since it adds functionality and it has better support for fix boot issues. 2019-10-24 00:10:19 +02:00
Mounir IDRASSI 478066c607 Linux/MacOSX: Add missing JitterEntropy implementation 2019-10-23 22:46:25 +02:00
Mounir IDRASSI 74e14c070f Windows: A Quick Expand option to VeraCrypt Expander to allow quicker expansion of file containers after warning about security issues associated with it. 2019-10-23 00:24:02 +02:00
Mounir IDRASSI 11f1a21652 Increment version to 1.23-Hotfix1-Preview 2019-10-20 22:31:42 +02:00
Mounir IDRASSI 9b394ddc49 Windows: Avoid unnecessary write operations when copying/modifying EFI bootloader files in order to avoid leaking modification timestamp 2019-10-20 22:17:12 +02:00
Mounir IDRASSI 31a87c2e5f Windows: add more checks to correctly identify Microsoft original bootloader. 2019-10-20 22:17:04 +02:00
Mounir IDRASSI cca08e1ed5 Windows: Add checks that the System Favorites service is running. Warn user if he enabled option to clear RAM encryption keys and the service is stopped. 2019-10-20 22:16:57 +02:00
Mounir IDRASSI 7c020c23ce Windows: resize UI elements of random collection step in Format wizard 2019-10-20 22:16:50 +02:00
Mounir IDRASSI 12461a55a8 MacOSX: Support APFS for creating volumes. 2019-10-19 23:18:40 +02:00
Mounir IDRASSI 008d0503be Windows: make VeraCrypt Expander able to resume expansion of volumes whose previous expansion was aborted before it finishes 2019-10-18 23:06:17 +02:00
Mounir IDRASSI 5b88a183ac Windows: handle case of DcsProp configuration file for EFI system encryption contains wrong "ActionSuccess" entry that points towards bootmgfw.efi which is now our bootloader and not Microsoft one. 2019-10-18 00:56:39 +02:00
Mounir IDRASSI 4119521f9e Linux: Workaround for gcc 4.4.7 bug under CentOS 6 that causes VeraCrypt built under CentOS 6 to crash when Whirlpool hash is used. 2019-10-17 15:00:37 +02:00
Mounir IDRASSI 3bb661244c Linux: fix compilation error under CentOS 6 2019-10-17 14:09:33 +02:00
El Mostafa IdrassiandMounir IDRASSI bdc1dc42a6 Small GUI enhancements (#521) 2019-10-16 00:43:49 +02:00
El Mostafa IdrassiandMounir IDRASSI c90b45f88c Fixed drag and drop not showing correct path, specifically under GTK-3. (#520) 2019-10-16 00:43:34 +02:00
Mounir IDRASSI 2675a9c60e Documentation: Add missing documentation for VeraCrypt.exe command line switch /DisableDeviceUpdate 2019-10-15 00:54:39 +02:00
El Mostafa IdrassiandMounir IDRASSI 67a514da6f MacOSX: Enhanced Makefile and build script (#519) 
Added new variable 'VC_OSX_SDK' to differentiate between the OSX minimum target and the SDK to use for building.
 2019-10-15 00:03:36 +02:00
El Mostafa IdrassiandMounir IDRASSI bdcfe5bbb2 Fixed buttons not being correctly aligned (#518) 2019-10-15 00:02:25 +02:00
Mounir IDRASSI b6dcea013e MacOSX: Add build scripts and modifications to linking against wxWidgets 3.1.2 for non legacy build targeting OSX 10.9+ 2019-10-14 15:05:24 +02:00
Mounir IDRASSI f56a8c49f9 Windows: Fix regression that causes system favorites not to mount if VeraCrypt 1.24 is freshly installed and not updated. 2019-10-14 01:08:43 +02:00
El Mostafa IdrassiandMounir IDRASSI 621330b726 MacOSX: Fixed devices / partitions not showing in the device selection dialog (#516) 
To get the size of each device / partition on the system, the method 'GetDeviceSize()' in 'src/Core/Unix/CoreUnix.cpp' first opens
the device / partition using 'open()' function to get a File Descriptor, then retrieves its size using this File Descriptor.

Starting OS X 10.11 ("El Capitan"), a feature called "System Integrity Protection (SIP)" or less formally, "rootless mode" has been added.
This feature blocks access to certain critical aspects of the OS and Hardware by 3rd-Party programs.
Specifically, low-level access to the system disks, devices and partitions is forbidden ; namely functions like 'open()' for instance fail
with the error code : "EPERM = Operation Not Permitted".

Therefore, for system devices / partitions, 'GetDeviceSize()' fails because of the failure of the 'open()' function, and throws an exception,
which is then caught inside the method 'GetHostDevices()' in '/src/Core/Unix/FreeBSD/CoreFreeBSD.cpp' : this leads to the size of the
device / partition being set to '0'.

Therefore, in the constructor of 'DeviceSelectionDialog' in 'src/Main/Forms/DeviceSelectionDialog.cpp', when the size of a device is '0',
the whole device is skipped, leading to all of its partitions not being treated or shown, even though some of these partitions may have a size which is != 0.

This commit fixes the issue by :
1 - First, checking whether the device size is '0'. If it is the case, the code loops through all the devices partitions : if there is at least one partition
with a size != 0, the device is not skipped. Otherwise, it is.
2 - Then, if the size of the device is '0', the size of the device is not shown to avoid confusing the user.
Also, since the device is not usable, the 'OK' button is not active when the device is selected.
3 - Finally, if a partition's size is '0', it is not shown since it is not usable : we cannot open it.

Signed-off-by: El Mostafa IDRASSI <el-mostafa.idrassi@prestalab.net>
 2019-10-11 17:02:03 +02:00
El Mostafa IdrassiandMounir IDRASSI 9463a628a6 Linux/FreeBSD: Use of 'sudo -n uptime' command to check whether user has an active 'sudo' session instead of the use of a 'dummy' password. (#513) 
Signed-off-by: El Mostafa IDRASSI <el-mostafa.idrassi@prestalab.net>
 2019-10-08 18:11:50 +02:00
El Mostafa IdrassiandMounir IDRASSI 15a8cde6f5 Updated and fixed build and packaging scripts. (#512) 
Now, under Debian 10+ and Ubuntu 18.04+, we link against the GTK-3 version of wxWidgets (libwxgtk3.0-gtk3-0v5).
Under Debian 9- and Ubuntu 16.04, we link against the GTK-2 version of wxWidgets (libwxgtk3.0-0v5) which is the
only one available.

Also, we now have 2 separate RPM scripts : 'build_cmake_rpm_gtk2.sh' which builds wxWidgets and links it against GTK-2,
then links VeraCrypt against 'gtk2' package (typically to be used under CentOS 6) and 'build_cmake_rpm_gtk3' which builds
wxWidgets and links it against GTK-3, then links VeraCrypt against 'gtk3' package (typically to be used under CentOS 7+).
 2019-10-07 18:49:46 +02:00
96 changed files with 2650 additions and 525 deletions
Expand all files Collapse all files
Translations/Language.ar.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<VeraCrypt> <VeraCrypt>
<localization prog-version= "1.24"> <localization prog-version= "1.24-Hotfix1">
<language langid="ar" name="العربية" en-name="Arabic" version="0.2.0" translators="Ahmad Gharbeia, Khaled Hosny, Ali Khojah" /> <language langid="ar" name="العربية" en-name="Arabic" version="0.2.0" translators="Ahmad Gharbeia, Khaled Hosny, Ali Khojah" />
<font lang="ar" class="normal" size="11" face="default" /> <font lang="ar" class="normal" size="11" face="default" />
<font lang="ar" class="bold" size="13" face="Arial" /> <font lang="ar" class="bold" size="13" face="Arial" />
Translations/Language.be.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<VeraCrypt> <VeraCrypt>
<localization prog-version= "1.24"> <localization prog-version= "1.24-Hotfix1">
<language langid="be" name="Беларуская" en-name="Belarusian" version="0.1.0" translators="Aleg Azarousky" /> <language langid="be" name="Беларуская" en-name="Belarusian" version="0.1.0" translators="Aleg Azarousky" />
<font lang="be" class="normal" size="11" face="default" /> <font lang="be" class="normal" size="11" face="default" />
<font lang="be" class="bold" size="13" face="Arial" /> <font lang="be" class="bold" size="13" face="Arial" />
Translations/Language.bg.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<VeraCrypt> <VeraCrypt>
<localization prog-version= "1.24"> <localization prog-version= "1.24-Hotfix1">
<language langid="bg" name="Български" en-name="Bulgarian" version="0.1.0" translators="Lachezar Gorchev" /> <language langid="bg" name="Български" en-name="Bulgarian" version="0.1.0" translators="Lachezar Gorchev" />
<font lang="bg" class="normal" size="11" face="default" /> <font lang="bg" class="normal" size="11" face="default" />
<font lang="bg" class="bold" size="13" face="Arial" /> <font lang="bg" class="bold" size="13" face="Arial" />
Translations/Language.ca.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<VeraCrypt> <VeraCrypt>
<localization prog-version= "1.24"> <localization prog-version= "1.24-Hotfix1">
<language langid="ca" name="Català" en-name="Catalan" version="0.1.0" translators="CESICAT, Centre de Seguretat de la Informació de Catalunya" /> <language langid="ca" name="Català" en-name="Catalan" version="0.1.0" translators="CESICAT, Centre de Seguretat de la Informació de Catalunya" />
<font lang="ca" class="normal" size="11" face="default" /> <font lang="ca" class="normal" size="11" face="default" />
<font lang="ca" class="bold" size="13" face="Arial" /> <font lang="ca" class="bold" size="13" face="Arial" />
Translations/Language.cs.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<VeraCrypt> <VeraCrypt>
<localization prog-version= "1.24"> <localization prog-version= "1.24-Hotfix1">
<language langid="cs" name="Čeština" en-name="Czech" version="1.1.0" translators="Vítek Moser, Lagardere" /> <language langid="cs" name="Čeština" en-name="Czech" version="1.1.0" translators="Vítek Moser, Lagardere" />
<font lang="cs" class="normal" size="11" face="default" /> <font lang="cs" class="normal" size="11" face="default" />
<font lang="cs" class="bold" size="13" face="Arial" /> <font lang="cs" class="bold" size="13" face="Arial" />
Translations/Language.da.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<VeraCrypt> <VeraCrypt>
<localization prog-version= "1.24"> <localization prog-version= "1.24-Hotfix1">
<language langid="da" name="Dansk" en-name="Danish" version="0.1.0" translators="Lasse Bond" /> <language langid="da" name="Dansk" en-name="Danish" version="0.1.0" translators="Lasse Bond" />
<font lang="da" class="normal" size="11" face="default" /> <font lang="da" class="normal" size="11" face="default" />
<font lang="da" class="bold" size="13" face="Arial" /> <font lang="da" class="bold" size="13" face="Arial" />
Translations/Language.de.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<VeraCrypt> <VeraCrypt>
<localization prog-version= "1.24"> <localization prog-version= "1.24-Hotfix1">
<!-- Sprachen --> <!-- Sprachen -->
<language langid="de" name="Deutsch" en-name="German" version="1.1.8" translators="Harry Haller, Alexander Schorg, Simon Frankenberger, David Arndt, H. Sauer, Dulla, Ettore Atalan, Matthias Kolja Miehl, Felix Reichmann" /> <language langid="de" name="Deutsch" en-name="German" version="1.1.8" translators="Harry Haller, Alexander Schorg, Simon Frankenberger, David Arndt, H. Sauer, Dulla, Ettore Atalan, Matthias Kolja Miehl, Felix Reichmann" />
<!-- Schriftarten --> <!-- Schriftarten -->
Translations/Language.el.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<VeraCrypt> <VeraCrypt>
<localization prog-version= "1.24"> <localization prog-version= "1.24-Hotfix1">
<language langid="el" name="Ελληνικά" en-name="Greek" version="0.1.0" translators="Βασίλης Κοσμίδης" /> <language langid="el" name="Ελληνικά" en-name="Greek" version="0.1.0" translators="Βασίλης Κοσμίδης" />
<font lang="el" class="normal" size="11" face="default" /> <font lang="el" class="normal" size="11" face="default" />
<font lang="el" class="bold" size="13" face="Arial" /> <font lang="el" class="bold" size="13" face="Arial" />
Translations/Language.es.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<VeraCrypt> <VeraCrypt>
<localization prog-version= "1.24"> <localization prog-version= "1.24-Hotfix1">
<language langid="es" name="Español" en-name="Spanish" version="1.0.0" translators="Juan Antonio Auñón Ochando" /> <language langid="es" name="Español" en-name="Spanish" version="1.0.0" translators="Juan Antonio Auñón Ochando" />
<font lang="es" class="normal" size="11" face="default" /> <font lang="es" class="normal" size="11" face="default" />
<font lang="es" class="bold" size="13" face="Arial" /> <font lang="es" class="bold" size="13" face="Arial" />
Translations/Language.et.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<VeraCrypt> <VeraCrypt>
<localization prog-version= "1.24"> <localization prog-version= "1.24-Hotfix1">
<language langid="et" name="Eesti" en-name="Estonian" version="0.1.0" translators="Maiko Mõtsar" /> <language langid="et" name="Eesti" en-name="Estonian" version="0.1.0" translators="Maiko Mõtsar" />
<font lang="et" class="normal" size="11" face="vaikimisi" /> <font lang="et" class="normal" size="11" face="vaikimisi" />
<font lang="et" class="bold" size="13" face="Arial" /> <font lang="et" class="bold" size="13" face="Arial" />
Translations/Language.eu.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<VeraCrypt> <VeraCrypt>
<localization prog-version= "1.24"> <localization prog-version= "1.24-Hotfix1">
<language langid="eu" name="Euskara" en-name="Basque" version="1.0.0" translators="Ander Genua" /> <language langid="eu" name="Euskara" en-name="Basque" version="1.0.0" translators="Ander Genua" />
<font lang="eu" class="normal" size="11" face="default" /> <font lang="eu" class="normal" size="11" face="default" />
<font lang="eu" class="bold" size="13" face="Arial" /> <font lang="eu" class="bold" size="13" face="Arial" />
Translations/Language.fa.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<VeraCrypt> <VeraCrypt>
<localization prog-version= "1.24"> <localization prog-version= "1.24-Hotfix1">
<language langid="fa" name="فارسي" en-name="Persian" version="0.1.0" translators="Ali Bitazar, Rodabeh Sarmadi" /> <language langid="fa" name="فارسي" en-name="Persian" version="0.1.0" translators="Ali Bitazar, Rodabeh Sarmadi" />
<font lang="fa" class="normal" size="11" face="default" /> <font lang="fa" class="normal" size="11" face="default" />
<font lang="fa" class="bold" size="13" face="Arial" /> <font lang="fa" class="bold" size="13" face="Arial" />
Translations/Language.fi.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<VeraCrypt> <VeraCrypt>
<localization prog-version= "1.24"> <localization prog-version= "1.24-Hotfix1">
<language langid="fi" name="Suomi" en-name="Finnish" version="0.2.0" translators="Matti Ruhanen" /> <language langid="fi" name="Suomi" en-name="Finnish" version="0.2.0" translators="Matti Ruhanen" />
<font lang="fi" class="normal" size="11" face="default" /> <font lang="fi" class="normal" size="11" face="default" />
<font lang="fi" class="bold" size="13" face="Arial" /> <font lang="fi" class="bold" size="13" face="Arial" />
Translations/Language.fr.xml
+2 -2
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<VeraCrypt> <VeraCrypt>
<localization prog-version= "1.24"> <localization prog-version= "1.24-Hotfix1">
<language langid="fr" name="Français" en-name="French" version="0.3.0" translators="Stéphane S., Olivier M., Thierry T" /> <language langid="fr" name="Français" en-name="French" version="0.3.0" translators="Stéphane S., Olivier M., Thierry T" />
<font lang="fr" class="normal" size="11" face="default" /> <font lang="fr" class="normal" size="11" face="default" />
<font lang="fr" class="bold" size="13" face="Arial" /> <font lang="fr" class="bold" size="13" face="Arial" />
@@ -1111,7 +1111,7 @@
<entry lang="fr" key="KEYB_LAYOUT_SYS_ENC_EXPLANATION">Note : Le mot de passe devra être saisi dans l’environnement de préamorçage (avant le démarrage de windows) où les dispositions de clavier non-américain ne sont pas disponibles. Aussi, le mot de passe doit toujours être saisi en utilisant la disposition du clavier Américain. Mais il est important de noter qu’il n’est PAS nécessaire de posséder un vrai clavier américain. VeraCrypt assure automatiquement que vous pouvez saisir en toute sécurité votre mot de passe (maintenant et dans l’environnement de préamorçage) même si vous ne possédez pas un vrai clavier américain.</entry> <entry lang="fr" key="KEYB_LAYOUT_SYS_ENC_EXPLANATION">Note : Le mot de passe devra être saisi dans l’environnement de préamorçage (avant le démarrage de windows) où les dispositions de clavier non-américain ne sont pas disponibles. Aussi, le mot de passe doit toujours être saisi en utilisant la disposition du clavier Américain. Mais il est important de noter qu’il n’est PAS nécessaire de posséder un vrai clavier américain. VeraCrypt assure automatiquement que vous pouvez saisir en toute sécurité votre mot de passe (maintenant et dans l’environnement de préamorçage) même si vous ne possédez pas un vrai clavier américain.</entry>
<entry lang="fr" key="RESCUE_DISK_INFO">Avant de pouvoir chiffrer la partition/disque, vous devez créer un disque de sauvegarde VeraCrypt (VRD), dont les buts sont :\n\n- Si le chargeur de démarrage de VeraCrypt, la clé principale ou d’autres données critiques sont endommagées, le VRD permet de les restaurer (remarquez que vous devrez toujours entrer le mot de passe correct).\n\n- Si Windows est endommagé et ne peut pas démarrer, VRD vous permet toujours de déchiffrer la partition/disque avant le démarrage de Windows.\n\n- Le VRD contiendra une sauvegarde du contenu actuel de la première plage du disque (qui contient en général un chargeur de système ou le gestionnaire de démarrage) et vous permettra de le restaurer si necessaire.\n\n L’image ISO du disque de récupération VeraCrypt sera créée à l’emplacement spécifié ci-dessous.</entry> <entry lang="fr" key="RESCUE_DISK_INFO">Avant de pouvoir chiffrer la partition/disque, vous devez créer un disque de sauvegarde VeraCrypt (VRD), dont les buts sont :\n\n- Si le chargeur de démarrage de VeraCrypt, la clé principale ou d’autres données critiques sont endommagées, le VRD permet de les restaurer (remarquez que vous devrez toujours entrer le mot de passe correct).\n\n- Si Windows est endommagé et ne peut pas démarrer, VRD vous permet toujours de déchiffrer la partition/disque avant le démarrage de Windows.\n\n- Le VRD contiendra une sauvegarde du contenu actuel de la première plage du disque (qui contient en général un chargeur de système ou le gestionnaire de démarrage) et vous permettra de le restaurer si necessaire.\n\n L’image ISO du disque de récupération VeraCrypt sera créée à l’emplacement spécifié ci-dessous.</entry>
<entry lang="fr" key="RESCUE_DISK_WIN_ISOBURN_PRELAUNCH_NOTE">Après avoir cliqué sur OK, le logiciel de gravage d’image Microsoft sera lancé. Utilisez-le pour graver l’image ISO du disque de récupération VeraCrypt sur un CD ou un DVD.\n\nAprès cela, revenez à l’assistant de création de volumes VeraCrypt et suivez les instructions.</entry> <entry lang="fr" key="RESCUE_DISK_WIN_ISOBURN_PRELAUNCH_NOTE">Après avoir cliqué sur OK, le logiciel de gravage d’image Microsoft sera lancé. Utilisez-le pour graver l’image ISO du disque de récupération VeraCrypt sur un CD ou un DVD.\n\nAprès cela, revenez à l’assistant de création de volumes VeraCrypt et suivez les instructions.</entry>
<entry lang="fr" key="RESCUE_DISK_BURN_INFO">L’image de la disque de secours a été créée et stockée dans le fichier : \n%s\n\nMainteant vous avez besoin de le graver sur un CD ou un DVD.\n\n%lsAprès l’avoir gravé, cliquez sur suivant pour vérifier qu’il a été gravé correctement.</entry> <entry lang="fr" key="RESCUE_DISK_BURN_INFO">L’image de la disque de secours a été créée et stockée dans le fichier : \n%s\n\nMaintenant vous avez besoin de le graver sur un CD ou un DVD.\n\n%lsAprès l’avoir gravé, cliquez sur suivant pour vérifier qu’il a été gravé correctement.</entry>
<entry lang="fr" key="RESCUE_DISK_BURN_INFO_NO_CHECK">L’image de la disque de secours a été créée et stockée dans le fichier : \n%s\n\nVous devriez maintenant graver l’image sur un CD/DVD ou la déplacer vers un emplacement sécurisé pour une utilisation ultérieure.\n\n%lsCliquez sur "Suivant" pour continuer.</entry> <entry lang="fr" key="RESCUE_DISK_BURN_INFO_NO_CHECK">L’image de la disque de secours a été créée et stockée dans le fichier : \n%s\n\nVous devriez maintenant graver l’image sur un CD/DVD ou la déplacer vers un emplacement sécurisé pour une utilisation ultérieure.\n\n%lsCliquez sur "Suivant" pour continuer.</entry>
<entry lang="fr" key="RESCUE_DISK_BURN_INFO_NONWIN_ISO_BURNER">IMPORTANT : Le fichier doit être écrit sur le CD/DVD sous forme d’image ISO (pas dans un fichier individuel). Pour plus d’informations sur la façon de le faire, veuillez vous reporter à la documentation de votre logiciel de gravure de CD/DVD. Si vous n’avez pas de logiciel de gravure de CD/DVD cliquez sur le lien ci-dessous pour télécharger un logiciel gratuit.\n\n</entry> <entry lang="fr" key="RESCUE_DISK_BURN_INFO_NONWIN_ISO_BURNER">IMPORTANT : Le fichier doit être écrit sur le CD/DVD sous forme d’image ISO (pas dans un fichier individuel). Pour plus d’informations sur la façon de le faire, veuillez vous reporter à la documentation de votre logiciel de gravure de CD/DVD. Si vous n’avez pas de logiciel de gravure de CD/DVD cliquez sur le lien ci-dessous pour télécharger un logiciel gratuit.\n\n</entry>
<entry lang="fr" key="LAUNCH_WIN_ISOBURN">Lancez le logiciel de gravure d’image disque de Microsoft</entry> <entry lang="fr" key="LAUNCH_WIN_ISOBURN">Lancez le logiciel de gravure d’image disque de Microsoft</entry>
Translations/Language.hu.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<VeraCrypt> <VeraCrypt>
<localization prog-version= "1.24"> <localization prog-version= "1.24-Hotfix1">
<language langid="hu" name="Magyar" en-name="Hungarian" version="2018.03.06" translators="Nyul Balazs > Szaki" /> <language langid="hu" name="Magyar" en-name="Hungarian" version="2018.03.06" translators="Nyul Balazs > Szaki" />
<font lang="hu" class="normal" size="11" face="default" /> <font lang="hu" class="normal" size="11" face="default" />
<font lang="hu" class="bold" size="13" face="Arial" /> <font lang="hu" class="bold" size="13" face="Arial" />
Translations/Language.id.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<VeraCrypt> <VeraCrypt>
<localization prog-version= "1.24"> <localization prog-version= "1.24-Hotfix1">
<language langid="id" name="Bahasa Indonesia" en-name="Indonesian" version="0.1.0" translators="Tajuddin N. F." /> <language langid="id" name="Bahasa Indonesia" en-name="Indonesian" version="0.1.0" translators="Tajuddin N. F." />
<font lang="id" class="normal" size="11" face="default" /> <font lang="id" class="normal" size="11" face="default" />
<font lang="id" class="bold" size="13" face="Arial" /> <font lang="id" class="bold" size="13" face="Arial" />
Translations/Language.it.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<VeraCrypt> <VeraCrypt>
<localization prog-version= "1.24"> <localization prog-version= "1.24-Hotfix1">
<language langid="it" name="Italiano" en-name="Italian" version="1.0.1" translators="Maurizio Ballo, Consiglio Gaetano" /> <language langid="it" name="Italiano" en-name="Italian" version="1.0.1" translators="Maurizio Ballo, Consiglio Gaetano" />
<font lang="it" class="normal" size="11" face="default" /> <font lang="it" class="normal" size="11" face="default" />
<font lang="it" class="bold" size="13" face="Arial" /> <font lang="it" class="bold" size="13" face="Arial" />
Translations/Language.ja.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<VeraCrypt> <VeraCrypt>
<localization prog-version= "1.24"> <localization prog-version= "1.24-Hotfix1">
<language langid="ja" name="日本語" en-name="Japanese" version="1.0.0" translators="OGOSHI Masayuki" /> <language langid="ja" name="日本語" en-name="Japanese" version="1.0.0" translators="OGOSHI Masayuki" />
<font lang="ja" class="normal" size="12" face="MS UI Gothic" /> <font lang="ja" class="normal" size="12" face="MS UI Gothic" />
<font lang="ja" class="bold" size="16" face="MS UI Gothic" /> <font lang="ja" class="bold" size="16" face="MS UI Gothic" />
Translations/Language.ka.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<VeraCrypt> <VeraCrypt>
<localization prog-version= "1.24"> <localization prog-version= "1.24-Hotfix1">
<language langid="ka" name="ქართული" en-name="Georgian" version="0.1.0" translators="Kakha Lomiashvili" /> <language langid="ka" name="ქართული" en-name="Georgian" version="0.1.0" translators="Kakha Lomiashvili" />
<font lang="ka" class="normal" size="12" face="Arial" /> <font lang="ka" class="normal" size="12" face="Arial" />
<font lang="ka" class="bold" size="12" face="Arial" /> <font lang="ka" class="bold" size="12" face="Arial" />
Translations/Language.ko.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<VeraCrypt> <VeraCrypt>
<localization prog-version= "1.24"> <localization prog-version= "1.24-Hotfix1">
<language langid="ko" name="한국어" en-name="Korean" version="0.1.1" translators="Kieaer, Herbert Shin" /> <language langid="ko" name="한국어" en-name="Korean" version="0.1.1" translators="Kieaer, Herbert Shin" />
<font lang="ko" class="normal" size="11" face="돋움" /> <font lang="ko" class="normal" size="11" face="돋움" />
<font lang="ko" class="bold" size="13" face="맑은 고딕" /> <font lang="ko" class="bold" size="13" face="맑은 고딕" />
Translations/Language.lv.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<VeraCrypt> <VeraCrypt>
<localization prog-version= "1.24"> <localization prog-version= "1.24-Hotfix1">
<language langid="lv" name="Latviešu" en-name="Latvian" version="0.1.0" translators="Edmunds Melkers" /> <language langid="lv" name="Latviešu" en-name="Latvian" version="0.1.0" translators="Edmunds Melkers" />
<font lang="lv" class="normal" size="11" face="default" /> <font lang="lv" class="normal" size="11" face="default" />
<font lang="lv" class="bold" size="13" face="Arial" /> <font lang="lv" class="bold" size="13" face="Arial" />
Translations/Language.my.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<VeraCrypt> <VeraCrypt>
<localization prog-version= "1.24"> <localization prog-version= "1.24-Hotfix1">
<language langid="my" name="မြန်မာ" en-name="Burmese" version="1.0.0" translators="Zaw Myo Htet" /> <language langid="my" name="မြန်မာ" en-name="Burmese" version="1.0.0" translators="Zaw Myo Htet" />
<font lang="my" class="normal" size="11" face="Myanmar3" /> <font lang="my" class="normal" size="11" face="Myanmar3" />
<font lang="my" class="bold" size="13" face="Myanmar3" /> <font lang="my" class="bold" size="13" face="Myanmar3" />
Translations/Language.nl.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<VeraCrypt> <VeraCrypt>
<localization prog-version= "1.24"> <localization prog-version= "1.24-Hotfix1">
<language langid="nl" name="Nederlands" en-name="Dutch" version="0.2.3" translators="Jan van der Wal, Peter Tak" /> <language langid="nl" name="Nederlands" en-name="Dutch" version="0.2.3" translators="Jan van der Wal, Peter Tak" />
<font lang="nl" class="normal" size="11" face="default" /> <font lang="nl" class="normal" size="11" face="default" />
Translations/Language.nn.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<VeraCrypt> <VeraCrypt>
<localization prog-version= "1.24"> <localization prog-version= "1.24-Hotfix1">
<language langid="nn" name="Norsk Nynorsk" en-name="Norwegian (Nynorsk)" version="0.1.0" translators="Kjell Rune Helland" /> <language langid="nn" name="Norsk Nynorsk" en-name="Norwegian (Nynorsk)" version="0.1.0" translators="Kjell Rune Helland" />
<font lang="nn" class="normal" size="11" face="default" /> <font lang="nn" class="normal" size="11" face="default" />
<font lang="nn" class="bold" size="13" face="Arial " /> <font lang="nn" class="bold" size="13" face="Arial " />
Translations/Language.pl.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<VeraCrypt> <VeraCrypt>
<localization prog-version= "1.24"> <localization prog-version= "1.24-Hotfix1">
<language langid="pl" name="Polski" en-name="Polish" version="1.0.0" translators="Mirek Druchowicz, Janusz Zamecki, Sobiesław Antolak, Begina Felicysym" /> <language langid="pl" name="Polski" en-name="Polish" version="1.0.0" translators="Mirek Druchowicz, Janusz Zamecki, Sobiesław Antolak, Begina Felicysym" />
<font lang="pl" class="normal" size="11" face="default" /> <font lang="pl" class="normal" size="11" face="default" />
<font lang="pl" class="bold" size="13" face="Arial" /> <font lang="pl" class="bold" size="13" face="Arial" />
Translations/Language.pt-br.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<VeraCrypt> <VeraCrypt>
<localization prog-version= "1.24"> <localization prog-version= "1.24-Hotfix1">
<language langid="pt-br" name="Português-Brasil" en-name="Portuguese (Brazil)" version="0.1.0" translators="Thiago C. L. Mendes, Lecidio S. Alencar , Lucas C. Ferreira" /> <language langid="pt-br" name="Português-Brasil" en-name="Portuguese (Brazil)" version="0.1.0" translators="Thiago C. L. Mendes, Lecidio S. Alencar , Lucas C. Ferreira" />
<font lang="pt-br" class="normal" size="11" face="padrão" /> <font lang="pt-br" class="normal" size="11" face="padrão" />
<font lang="pt-br" class="bold" size="13" face="Arial" /> <font lang="pt-br" class="bold" size="13" face="Arial" />
Translations/Language.ro.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<VeraCrypt> <VeraCrypt>
<localization prog-version="1.24"> <localization prog-version="1.24-Hotfix1">
<language langid="ro" name="Română" en-name="Romanian" version="1.0.0" translators="Barna Cosmin Marian" /> <language langid="ro" name="Română" en-name="Romanian" version="1.0.0" translators="Barna Cosmin Marian" />
<font lang="ro" class="normal" size="11" face="default" /> <font lang="ro" class="normal" size="11" face="default" />
<font lang="ro" class="bold" size="13" face="Arial" /> <font lang="ro" class="bold" size="13" face="Arial" />
Translations/Language.ru.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<VeraCrypt> <VeraCrypt>
<localization prog-version= "1.24"> <localization prog-version= "1.24-Hotfix1">
<language langid="ru" name="Русский" en-name="Russian" version="1.0.5" translators="Dmitry Yerokhin" /> <language langid="ru" name="Русский" en-name="Russian" version="1.0.5" translators="Dmitry Yerokhin" />
<font lang="ru" class="normal" size="11" face="default" /> <font lang="ru" class="normal" size="11" face="default" />
<font lang="ru" class="bold" size="13" face="Arial" /> <font lang="ru" class="bold" size="13" face="Arial" />
Translations/Language.sk.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<VeraCrypt> <VeraCrypt>
<localization prog-version= "1.24"> <localization prog-version= "1.24-Hotfix1">
<language langid="sk" name="Slovenčina" en-name="Slovak" version="0.1.0" translators="Kamil David" /> <language langid="sk" name="Slovenčina" en-name="Slovak" version="0.1.0" translators="Kamil David" />
<font lang="sk" class="normal" size="11" face="default" /> <font lang="sk" class="normal" size="11" face="default" />
<font lang="sk" class="bold" size="13" face="Arial" /> <font lang="sk" class="bold" size="13" face="Arial" />
Translations/Language.sl.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<VeraCrypt> <VeraCrypt>
<localization prog-version= "1.24"> <localization prog-version= "1.24-Hotfix1">
<language langid="sl" name="Slovenščina" en-name="Slovenian" version="0.1.0" translators="Erik David Salam" /> <language langid="sl" name="Slovenščina" en-name="Slovenian" version="0.1.0" translators="Erik David Salam" />
<font lang="sl" class="normal" size="11" face="default" /> <font lang="sl" class="normal" size="11" face="default" />
<font lang="sl" class="bold" size="13" face="Arial" /> <font lang="sl" class="bold" size="13" face="Arial" />
Translations/Language.sv.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<VeraCrypt> <VeraCrypt>
<localization prog-version= "1.24"> <localization prog-version= "1.24-Hotfix1">
<language langid="sv" name="Svenska" en-name="Swedish" version="1.0.0" translators="Peter Runesson" /> <language langid="sv" name="Svenska" en-name="Swedish" version="1.0.0" translators="Peter Runesson" />
<font lang="sv" class="normal" size="11" face="default" /> <font lang="sv" class="normal" size="11" face="default" />
<font lang="sv" class="bold" size="13" face="Arial" /> <font lang="sv" class="bold" size="13" face="Arial" />
Translations/Language.th.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<VeraCrypt> <VeraCrypt>
<localization prog-version= "1.24"> <localization prog-version= "1.24-Hotfix1">
<language langid="th" name="ภาษาไทย" en-name="Thai" version="0.0.0" translators=""/> <language langid="th" name="ภาษาไทย" en-name="Thai" version="0.0.0" translators=""/>
<font lang="th" class="normal" size="11" face="default" /> <font lang="th" class="normal" size="11" face="default" />
<font lang="th" class="bold" size="13" face="Arial" /> <font lang="th" class="bold" size="13" face="Arial" />
Translations/Language.tr.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<VeraCrypt> <VeraCrypt>
<localization prog-version= "1.24"> <localization prog-version= "1.24-Hotfix1">
<language langid="tr" name="Türkçe" en-name="Turkish" version="0.1.0" translators="Ali İskender Turan, Zeynel Abidin Öztürk" /> <language langid="tr" name="Türkçe" en-name="Turkish" version="0.1.0" translators="Ali İskender Turan, Zeynel Abidin Öztürk" />
<font lang="tr" class="normal" size="11" face="default" /> <font lang="tr" class="normal" size="11" face="default" />
<font lang="tr" class="bold" size="13" face="Arial" /> <font lang="tr" class="bold" size="13" face="Arial" />
Translations/Language.uk.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<VeraCrypt> <VeraCrypt>
<localization prog-version= "1.24"> <localization prog-version= "1.24-Hotfix1">
<language langid="uk" name="Українська" en-name="Ukrainian" version="1.0.0" translators="Kravchuk Olexandr, Babchuk Volodymyr" /> <language langid="uk" name="Українська" en-name="Ukrainian" version="1.0.0" translators="Kravchuk Olexandr, Babchuk Volodymyr" />
<font lang="uk" class="normal" size="11" face="default" /> <font lang="uk" class="normal" size="11" face="default" />
<font lang="uk" class="bold" size="13" face="Arial" /> <font lang="uk" class="bold" size="13" face="Arial" />
Translations/Language.uz.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<VeraCrypt> <VeraCrypt>
<localization prog-version= "1.24"> <localization prog-version= "1.24-Hotfix1">
<language langid="uz" name="Ўзбекча" en-name="Uzbek (Cyrillic)" version="0.1.0" translators="Abdurauf Azizov, Dmitry Yerokhin" /> <language langid="uz" name="Ўзбекча" en-name="Uzbek (Cyrillic)" version="0.1.0" translators="Abdurauf Azizov, Dmitry Yerokhin" />
<font lang="uz" class="normal" size="11" face="default" /> <font lang="uz" class="normal" size="11" face="default" />
<font lang="uz" class="bold" size="13" face="Arial" /> <font lang="uz" class="bold" size="13" face="Arial" />
Translations/Language.vi.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<VeraCrypt> <VeraCrypt>
<localization prog-version= "1.24"> <localization prog-version= "1.24-Hotfix1">
<language langid="vi" name="Tiếng Việt" en-name="Vietnamese" version="0.1.0" translators="Nguyễn Kim Huy" /> <language langid="vi" name="Tiếng Việt" en-name="Vietnamese" version="0.1.0" translators="Nguyễn Kim Huy" />
<font lang="vi" class="normal" size="11" face="default" /> <font lang="vi" class="normal" size="11" face="default" />
<font lang="vi" class="bold" size="13" face="Arial" /> <font lang="vi" class="bold" size="13" face="Arial" />
Translations/Language.zh-cn.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<VeraCrypt> <VeraCrypt>
<localization prog-version= "1.24"> <localization prog-version= "1.24-Hotfix1">
<language langid="zh-cn" name="简体中文" en-name="Chinese (Simplified)" version="1.0.0" translators="Barney Li and Zhangjintao" /> <language langid="zh-cn" name="简体中文" en-name="Chinese (Simplified)" version="1.0.0" translators="Barney Li and Zhangjintao" />
<font lang="zh-cn" class="normal" size="11" face="Tahoma" /> <font lang="zh-cn" class="normal" size="11" face="Tahoma" />
<font lang="zh-cn" class="bold" size="14" face="Tahoma" /> <font lang="zh-cn" class="bold" size="14" face="Tahoma" />
Translations/Language.zh-hk.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<VeraCrypt> <VeraCrypt>
<localization prog-version= "1.24"> <localization prog-version= "1.24-Hotfix1">
<language langid="zh-hk" name="繁體中文" en-name="Chinese (Hong Kong)" version="0.1.0" translators="PUN Chi Ho" /> <language langid="zh-hk" name="繁體中文" en-name="Chinese (Hong Kong)" version="0.1.0" translators="PUN Chi Ho" />
<font lang="zh-hk" class="normal" size="11" face="Arial" /> <font lang="zh-hk" class="normal" size="11" face="Arial" />
<font lang="zh-hk" class="bold" size="14" face="Arial" /> <font lang="zh-hk" class="bold" size="14" face="Arial" />
Translations/Language.zh-tw.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<VeraCrypt> <VeraCrypt>
<localization prog-version= "1.24"> <localization prog-version= "1.24-Hotfix1">
<language langid="zh-tw" name="繁體中文" en-name="Chinese (Taiwan)" version="0.1.0" translators="Barney Li, Simon Ma, ChangMing Hsu" /> <language langid="zh-tw" name="繁體中文" en-name="Chinese (Taiwan)" version="0.1.0" translators="Barney Li, Simon Ma, ChangMing Hsu" />
<font lang="zh-tw" class="normal" size="12" face="MingLiU" /> <font lang="zh-tw" class="normal" size="12" face="MingLiU" />
<font lang="zh-tw" class="bold" size="15" face="MingLiU" /> <font lang="zh-tw" class="bold" size="15" face="MingLiU" />
doc/chm/VeraCrypt User Guide.chm
BIN
View File
Binary file not shown.
doc/html/Command Line Usage.html
+5 -1
View File
@@ -37,7 +37,7 @@
<h1>Command Line Usage</h1> <h1>Command Line Usage</h1>
<p>Note that this section applies to the Windows version of VeraCrypt. For information on command line usage applying to the <p>Note that this section applies to the Windows version of VeraCrypt. For information on command line usage applying to the
<strong>Linux and Mac OS X versions</strong>, please run: veracrypt &ndash;h</p> <strong>Linux and Mac OS X versions</strong>, please run: veracrypt &ndash;h</p>
<table border="1" cellspacing="0" cellpadding="0"> <table border="1" cellspacing="0" cellpadding="1">
<tbody> <tbody>
<tr> <tr>
<td><em>/help</em> or <em>/?</em></td> <td><em>/help</em> or <em>/?</em></td>
@@ -176,6 +176,10 @@ Note that turning the password cache off will not clear it (use /w to clear the
<p>Please note that this switch may be present several times in the command line in order to specify multiple mount options (e.g.: /m rm /m ts)</p> <p>Please note that this switch may be present several times in the command line in order to specify multiple mount options (e.g.: /m rm /m ts)</p>
</td> </td>
</tr> </tr>
<tr>
<td><em>/DisableDeviceUpdate</em>&nbsp;</td>
<td>Disables periodic internel check on devices connected to the system that is used for handling favorites identified with VolumeID and replace it with on-demande checks.</td>
</tr>
</tbody> </tbody>
</table> </table>
<h4>VeraCrypt Format.exe (VeraCrypt Volume Creation Wizard):</h4> <h4>VeraCrypt Format.exe (VeraCrypt Volume Creation Wizard):</h4>
doc/html/Release Notes.html
+33
View File
@@ -39,6 +39,39 @@
<strong>Note to users who created volumes with 1.17 version of VeraCrypt or earlier: </strong><br/> <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> <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>
<p><strong style="text-align:left">1.24-Hotfix1 </strong>(October 27<sup>rd</sup>, 2019):</p>
<ul>
<li><strong>Windows:</strong>
<ul>
<li>Fix 1.24 regression that caused system favorites not to mount at boot if VeraCrypt freshly installed.</li>
<li>Fix failure to encrypt system if the current Windows username contains a Unicode non-ASCII character.</li>
<li>Make VeraCrypt Expander able to resume expansion of volumes whose previous expansion was aborted before it finishes.</li>
<li>Add "Quick Expand" option to VeraCrypt Expander to accelarate the expansion of large file containers.</li>
<li>Add several robustness checks and validation in case of system encryption to better handle some corner cases.</li>
<li>Minor UI and documentation changes.</li>
</ul>
</li>
<li><strong>Linux:</strong>
<ul>
<li>Workaround gcc 4.4.7 bug under CentOS 6 that caused VeraCrypt built under CentOS 6 to crash when Whirlpool hash is used.</li>
<li>Fix "incorrect password attempt" written to /var/log/auth.log when mounting volumes.</li>
<li>Fix dropping file in UI not showing its correct path , specifically under GTK-3.</li>
<li>Add missing JitterEntropy implementation/</li>
</ul>
</li>
<li><strong>MacOSX:</strong>
<ul>
<li>Fix some devices and partitions not showing in the device selection dialog under OSX 10.13 and newer.</li>
<li>Fix keyboard tab navigation between password fields in "Volume Password" page of volume creation wizard.</li>
<li>Add missing JitterEntropy implementation/</li>
<li>Support APFS filesystem for creation volumes.</li>
<li>Support Dark Mode.</li>
</ul>
</li>
</ul>
<p><strong style="text-align:left">1.24 </strong>(October 6<sup>th</sup>, 2019):</p> <p><strong style="text-align:left">1.24 </strong>(October 6<sup>th</sup>, 2019):</p>
<ul> <ul>
<li><strong>All OSs:</strong> <li><strong>All OSs:</strong>
src/Boot/Windows/BootCommon.h
+1 -1
View File
@@ -17,7 +17,7 @@
#include "BootDefs.h" #include "BootDefs.h"
// The user will be advised to upgrade the rescue disk if upgrading from the following or any previous version // The user will be advised to upgrade the rescue disk if upgrading from the following or any previous version
#define TC_RESCUE_DISK_UPGRADE_NOTICE_MAX_VERSION 0x0122 #define TC_RESCUE_DISK_UPGRADE_NOTICE_MAX_VERSION 0x0123
#define TC_BOOT_LOADER_AREA_SIZE (TC_BOOT_LOADER_AREA_SECTOR_COUNT * TC_SECTOR_SIZE_BIOS) #define TC_BOOT_LOADER_AREA_SIZE (TC_BOOT_LOADER_AREA_SECTOR_COUNT * TC_SECTOR_SIZE_BIOS)
src/Build/CMakeLists.txt
+37 -38
View File
@@ -10,6 +10,11 @@ elseif ( NOT DEFINED NOGUI )
MESSAGE(FATAL_ERROR "NOGUI variable MUST BE set to TRUE if building 'Console' version, 'FALSE' otherwise") MESSAGE(FATAL_ERROR "NOGUI variable MUST BE set to TRUE if building 'Console' version, 'FALSE' otherwise")
endif() endif()
# - Set version of the package
set( FULL_VERSION "1.24-Hotfix1" )
set( VERSION "1.24.7" )
set( RELEASE "1" )
# - Set PROJECT_NAME and CONFLICT_PACKAGE values # - Set PROJECT_NAME and CONFLICT_PACKAGE values
if (NOGUI) if (NOGUI)
set( PROJECT_NAME "veracrypt-console" ) set( PROJECT_NAME "veracrypt-console" )
@@ -53,10 +58,11 @@ endif( )
# - Detect OSX, CentOS, Debian, Ubuntu or openSUSE platform of the build system # - Detect OSX, CentOS, Debian, Ubuntu or openSUSE platform of the build system
# The following variable(s) will be set # The following variable(s) will be set
# $PLATFORM Debian Ubuntu CentOS openSUSE # $PLATFORM Debian Ubuntu CentOS openSUSE (TODO)
# $PLATFORM_VERSION # $PLATFORM_VERSION
# 9.x 16.04 7.X 42.3 # 9.x 16.04 7.X 42.3
# 10.X 18.04 8.X 15.0 # 10.X 18.04 8.X 15.0
# ... ... ... ...
# $DISTRO_NAME ${PLATFORM}-${PLATFORM_VERSION} # $DISTRO_NAME ${PLATFORM}-${PLATFORM_VERSION}
if ( UNIX ) if ( UNIX )
@@ -83,20 +89,16 @@ if ( UNIX )
else() else()
file(READ "/etc/debian_version" DEBIAN_RELEASE) file(READ "/etc/debian_version" DEBIAN_RELEASE)
string(REGEX MATCH "[a-zA-Z0-9 /\\.]+" _ ${DEBIAN_RELEASE}) string(REGEX MATCH "([0-9]+\\.[0-9]+)" _ ${DEBIAN_RELEASE})
set(PLATFORM_VERSION ${CMAKE_MATCH_1}) set(PLATFORM_VERSION ${CMAKE_MATCH_1})
if( PLATFORM_VERSION STREQUAL "stretch/sid" )
set( PLATFORM_VERSION "9" )
endif( PLATFORM_VERSION STREQUAL "stretch/sid" )
endif() endif()
# Get debian release version # Get debian release version
elseif(EXISTS "/etc/debian_version") elseif(EXISTS "/etc/debian_version")
file(READ "/etc/debian_version" DEBIAN_RELEASE) file(READ "/etc/debian_version" DEBIAN_RELEASE)
string(REGEX MATCH "[a-zA-Z0-9 /\\.]+" _ ${DEBIAN_RELEASE}) string(REGEX MATCH "([0-9]+\\.[0-9]+)" _ ${DEBIAN_RELEASE})
set(PLATFORM_VERSION ${CMAKE_MATCH_1}) set(PLATFORM_VERSION ${CMAKE_MATCH_1})
endif() endif()
@@ -158,30 +160,24 @@ if ( PLATFORM STREQUAL "Debian" OR PLATFORM STREQUAL "Ubuntu" )
elseif (SUFFIX STREQUAL "64") elseif (SUFFIX STREQUAL "64")
SET(ARCHITECTURE amd64) SET(ARCHITECTURE amd64)
endif() endif()
else(NOT DPKG_CMD) else( )
execute_process(COMMAND dpkg --print-architecture OUTPUT_VARIABLE ARCHITECTURE OUTPUT_STRIP_TRAILING_WHITESPACE) execute_process(COMMAND dpkg --print-architecture OUTPUT_VARIABLE ARCHITECTURE OUTPUT_STRIP_TRAILING_WHITESPACE)
endif(NOT DPKG_CMD) endif( )
elseif ( ( PLATFORM STREQUAL "CentOS" ) OR ( PLATFORM STREQUAL "openSUSE" ) ) elseif ( ( PLATFORM STREQUAL "CentOS" ) OR ( PLATFORM STREQUAL "openSUSE" ) )
execute_process(COMMAND arch OUTPUT_VARIABLE ARCHITECTURE OUTPUT_STRIP_TRAILING_WHITESPACE) execute_process(COMMAND arch OUTPUT_VARIABLE ARCHITECTURE OUTPUT_STRIP_TRAILING_WHITESPACE)
elseif ( PLATFORM STREQUAL "OSX" ) else ()
if ( UNIVERSAL ) MESSAGE(FATAL_ERROR "Unrecognized / unsupported distribution")
set ( ARCHITECTURE "Univesal-Binary" )
else ( UNIVERSAL )
# arch reports Intel using the i386 label rather than intel
# We use uname -m instead
execute_process(COMMAND uname -m OUTPUT_VARIABLE ARCHITECTURE OUTPUT_STRIP_TRAILING_WHITESPACE)
endif( UNIVERSAL )
endif ( ) endif ( )
MESSAGE ( STATUS "Architecture = ${ARCHITECTURE}" ) MESSAGE ( STATUS "Architecture = ${ARCHITECTURE}" )
# - Create installation folder directory at install time # - Create installation folder directory at install time
# This won't lead to the files being actually installed (in CMAKE_INSTALL_PREFIX) # This won't lead to the files being actually installed (in CMAKE_INSTALL_PREFIX)
# unless "cmake --build . --target install" is executed, which is not the case here/ # unless "cmake --build . --target install" is executed, which is not the case here.
# #
# Doing things like the following # Doing things like the following
# - install(DIRECTORY ${VERACRYPT_BUILD_DIR}/usr DESTINATION /) # - install(DIRECTORY ${VERACRYPT_BUILD_DIR}/usr DESTINATION /)
@@ -215,21 +211,6 @@ set(CPACK_PACKAGING_INSTALL_PREFIX "/usr")
file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/Packaging) # creates the Packaging directory under build directory when CMake generates the build system file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/Packaging) # creates the Packaging directory under build directory when CMake generates the build system
# - We excute 'grep VERSION_STRING ../../Common/Tcdefs.h | head -n 1' to get the line which include 'VERSION_STRING'
# Then we delete all first characters from the beginning of the line until the first '"' to get the version in the format : "X.YYY..."
# Then, we remove the leading and trailing '"' characters
# Then, we retrieve the 'version' and the 'release'
# Finally, we replace '-' in the release if it exists with a '.' because CPack does not like '-' in the release
execute_process(COMMAND grep VERSION_STRING "$ENV{SOURCEPATH}/Common/Tcdefs.h"
COMMAND head -n 1
OUTPUT_VARIABLE FULL_VERSION_LINE OUTPUT_STRIP_TRAILING_WHITESPACE)
string(REGEX REPLACE "^[^\"]+" "" FULL_VERSION ${FULL_VERSION_LINE})
string(REGEX REPLACE "\"" "" FULL_VERSION ${FULL_VERSION})
string(REPLACE "." ";" FULL_VERSION_LIST ${FULL_VERSION})
list(GET FULL_VERSION_LIST 0 VERSION)
list(GET FULL_VERSION_LIST 1 RELEASE)
string(REPLACE "-" "." RELEASE ${RELEASE})
set( VENDOR "IDRIX" ) set( VENDOR "IDRIX" )
set( LICENSE "VeraCrypt License" ) set( LICENSE "VeraCrypt License" )
set( CONTACT "VeraCrypt Team <veracrypt@idrix.fr>" ) set( CONTACT "VeraCrypt Team <veracrypt@idrix.fr>" )
@@ -261,16 +242,27 @@ if ( ( PLATFORM STREQUAL "Debian" ) OR ( PLATFORM STREQUAL "Ubuntu" ) )
set( CPACK_DEBIAN_PACKAGE_RELEASE ${CPACK_PACKAGE_RELEASE} ) set( CPACK_DEBIAN_PACKAGE_RELEASE ${CPACK_PACKAGE_RELEASE} )
set( CPACK_DEBIAN_PACKAGE_ARCHITECTURE ${ARCHITECTURE} ) # mandatory set( CPACK_DEBIAN_PACKAGE_ARCHITECTURE ${ARCHITECTURE} ) # mandatory
set( CPACK_DEBIAN_PACKAGE_DEPENDS "libwxgtk3.0-0v5, libfuse2, dmsetup") # Link against gtk3 version of wxWidgets if >= Debian 10 or >= Ubuntu 18.04
# Otherwise, link against gtk2 version of wxWidgets
if ( ( ( PLATFORM STREQUAL "Debian" ) AND ( PLATFORM_VERSION VERSION_GREATER_EQUAL "10" ) )
OR ( ( PLATFORM STREQUAL "Ubuntu" ) AND ( PLATFORM_VERSION VERSION_GREATER_EQUAL "18.04" ) ) )
set( CPACK_DEBIAN_PACKAGE_DEPENDS "libwxgtk3.0-gtk3-0v5, libfuse2, dmsetup" )
else ()
set( CPACK_DEBIAN_PACKAGE_DEPENDS "libwxgtk3.0-0v5, libfuse2, dmsetup" )
endif()
set( CPACK_DEBIAN_PACKAGE_MAINTAINER ${CONTACT} ) # mandatory set( CPACK_DEBIAN_PACKAGE_MAINTAINER ${CONTACT} ) # mandatory
set( CPACK_DEBIAN_PACKAGE_DESCRIPTION ${CPACK_PACKAGE_DESCRIPTION_SUMMARY} ) # mandatory set( CPACK_DEBIAN_PACKAGE_DESCRIPTION ${CPACK_PACKAGE_DESCRIPTION_SUMMARY} ) # mandatory
set( CPACK_DEBIAN_ARCHIVE_TYPE "gnutar") # mandatory set( CPACK_DEBIAN_ARCHIVE_TYPE "gnutar") # mandatory
set( CPACK_DEBIAN_COMPRESSION_TYPE "gzip") # mandatory set( CPACK_DEBIAN_COMPRESSION_TYPE "gzip") # mandatory
set( CPACK_DEBIAN_PACKAGE_PRIORITY "optional" ) # mandatory set( CPACK_DEBIAN_PACKAGE_PRIORITY "optional" ) # mandatory
set( CPACK_DEBIAN_PACKAGE_SECTION "libs" ) # recommended, to do, Section relative to Debian sections (https://www.debian.org/doc/debian-policy/ch-archive.html#s-subsections) set( CPACK_DEBIAN_PACKAGE_SECTION "libs" ) # recommended, Section relative to Debian sections (https://www.debian.org/doc/debian-policy/ch-archive.html#s-subsections)
set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA ${DEBIAN_PREINST};${DEBIAN_POSTINST};${DEBIAN_PRERM};${DEBIAN_POSTRM}) set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA ${DEBIAN_PREINST};${DEBIAN_POSTINST};${DEBIAN_PRERM};${DEBIAN_POSTRM})
set(CPACK_DEBIAN_PACKAGE_CONFLICTS ${CONFLICT_PACKAGE}) set(CPACK_DEBIAN_PACKAGE_CONFLICTS "${CONFLICT_PACKAGE}")
elseif ( ( PLATFORM STREQUAL "CentOS" ) OR ( PLATFORM STREQUAL "openSUSE" ) ) elseif ( ( PLATFORM STREQUAL "CentOS" ) OR ( PLATFORM STREQUAL "openSUSE" ) )
@@ -293,9 +285,16 @@ elseif ( ( PLATFORM STREQUAL "CentOS" ) OR ( PLATFORM STREQUAL "openSUSE" ) )
set( CPACK_RPM_PACKAGE_AUTOREQ "no" ) # disable automatic shared libraries dependency detection (most of the time buggy) set( CPACK_RPM_PACKAGE_AUTOREQ "no" ) # disable automatic shared libraries dependency detection (most of the time buggy)
if ( PLATFORM STREQUAL "CentOS" ) if ( PLATFORM STREQUAL "CentOS" )
set( CPACK_RPM_PACKAGE_REQUIRES "fuse, device-mapper, gtk3")
if ( DEFINED WITHGTK3 AND WITHGTK3 )
set( CPACK_RPM_PACKAGE_REQUIRES "fuse, device-mapper, gtk3" )
else ()
set( CPACK_RPM_PACKAGE_REQUIRES "fuse, device-mapper, gtk2" )
endif()
elseif ( PLATFORM STREQUAL "openSUSE" ) elseif ( PLATFORM STREQUAL "openSUSE" )
# TODO
set( CPACK_RPM_PACKAGE_REQUIRES "fuse, device-mapper, gtk2" )
endif() endif()
set( CPACK_RPM_PRE_UNINSTALL_SCRIPT_FILE ${RPM_PRERM}) # optional set( CPACK_RPM_PRE_UNINSTALL_SCRIPT_FILE ${RPM_PRERM}) # optional
src/Build/Include/Makefile.inc
+8 -4
View File
@@ -14,12 +14,16 @@ $(NAME): $(NAME).a
clean: clean:
@echo Cleaning $(NAME) @echo Cleaning $(NAME)
rm -f $(APPNAME) $(NAME).a $(OBJS) $(OBJSEX) $(OBJS:.o=.d) *.gch rm -f $(APPNAME) $(NAME).a $(OBJS) $(OBJSEX) $(OBJSNOOPT) $(OBJS:.o=.d) $(OBJSEX:.oo=.d) $(OBJSNOOPT:.o0=.d) *.gch
%.o: %.c %.o: %.c
@echo Compiling $(<F) @echo Compiling $(<F)
$(CC) $(CFLAGS) -c $< -o $@ $(CC) $(CFLAGS) -c $< -o $@
%.o0: %.c
@echo Compiling $(<F)
$(CC) $(CFLAGS) -O0 -c $< -o $@
%.o: %.cpp %.o: %.cpp
@echo Compiling $(<F) @echo Compiling $(<F)
$(CXX) $(CXXFLAGS) -c $< -o $@ $(CXX) $(CXXFLAGS) -c $< -o $@
@@ -64,10 +68,10 @@ TR_SED_BIN := tr '\n' ' ' | tr -s ' ' ',' | sed -e 's/^,//g' -e 's/,$$/n/' | tr
# Dependencies # Dependencies
-include $(OBJS:.o=.d) $(OBJSEX:.oo=.d) -include $(OBJS:.o=.d) $(OBJSEX:.oo=.d) $(OBJSNOOPT:.o0=.d)
$(NAME).a: $(OBJS) $(OBJSEX) $(NAME).a: $(OBJS) $(OBJSEX) $(OBJSNOOPT)
@echo Updating library $@ @echo Updating library $@
$(AR) $(AFLAGS) -rcu $@ $(OBJS) $(OBJSEX) $(AR) $(AFLAGS) -rcu $@ $(OBJS) $(OBJSEX) $(OBJSNOOPT)
$(RANLIB) $@ $(RANLIB) $@
src/Build/Resources/MacOSX/Info.plist.legacy.xml
+106
View File
@@ -0,0 +1,106 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd">
<plist version="0.9">
<dict>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleIdentifier</key>
<string>org.idrix.VeraCrypt</string>
<key>UTExportedTypeDeclarations</key>
<array>
<dict>
<key>UTTypeIdentifier</key>
<string>org.idrix.veracrypt.hc</string>
<key>UTTypeDescription</key>
<string>VeraCrypt Container File</string>
<key>UTTypeConformsTo</key>
<array>
<string>public.data</string>
</array>
<key>UTTypeTagSpecification</key>
<dict>
<key>public.filename-extension</key>
<array>
<string>hc</string>
<string>tc</string>
</array>
<key>public.mime-type</key>
<string>application/veracrypt</string>
</dict>
</dict>
</array>
<key>CFBundleDocumentTypes</key>
<array>
<dict>
<key>CFBundleTypeIconFile</key>
<string>VeraCrypt_Volume.icns</string>
<key>CFBundleTypeName</key>
<string>VeraCrypt Container File</string>
<key>CFBundleTypeRole</key>
<string>Viewer</string>
<key>LSHandlerRank</key>
<string>Owner</string>
<key>LSItemContentTypes</key>
<array>
<!-- my app supports files with my custom extension (see UTExportedTypeDeclarations) -->
<string>org.idrix.veracrypt.hc</string>
</array>
</dict>
</array>
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleExecutable</key>
<string>VeraCrypt</string>
<key>CFBundleIconFile</key>
<string>VeraCrypt.icns</string>
<key>CFBundleName</key>
<string>VeraCrypt</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleSignature</key>
<string>TRUE</string>
<key>CFBundleVersion</key>
<string>1.24.7</string>
<key>CFBundleShortVersionString</key>
<string>_VERSION_</string>
<key>CFBundleLongVersionString</key>
<string>VeraCrypt _VERSION_</string>
<key>LSArchitecturePriority</key>
<array>
<string>x86_64</string>
<string>i386</string>
</array>
<key>LSMinimumSystemVersion</key>
<string>10.7.0</string>
<key>LSRequiresCarbon</key>
<false/>
<key>CSResourcesFileMapped</key>
<true/>
<key>NSHighResolutionCapable</key>
<true/>
<key>NSPrincipalClass</key>
<string>NSApplication</string>
</dict>
</plist>
src/Build/Resources/MacOSX/Info.plist.xml
+2 -8
View File
@@ -74,7 +74,7 @@
<string>TRUE</string> <string>TRUE</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>1.24.6</string> <string>1.24.7</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>_VERSION_</string> <string>_VERSION_</string>
@@ -82,14 +82,8 @@
<key>CFBundleLongVersionString</key> <key>CFBundleLongVersionString</key>
<string>VeraCrypt _VERSION_</string> <string>VeraCrypt _VERSION_</string>
<key>LSArchitecturePriority</key>
<array>
<string>x86_64</string>
<string>i386</string>
</array>
<key>LSMinimumSystemVersion</key> <key>LSMinimumSystemVersion</key>
<string>10.7.0</string> <string>10.9.0</string>
<key>LSRequiresCarbon</key> <key>LSRequiresCarbon</key>
<false/> <false/>
src/Build/build_cmake_deb.sh
+8 -6
View File
@@ -20,6 +20,7 @@ make || exit 1
make install DESTDIR="$PARENTDIR/VeraCrypt_Setup/GUI" || exit 1 make install DESTDIR="$PARENTDIR/VeraCrypt_Setup/GUI" || exit 1
echo "Building console version of VeraCrypt for DEB using system wxWidgets" echo "Building console version of VeraCrypt for DEB using system wxWidgets"
# This is to avoid " Error: Unable to initialize GTK+, is DISPLAY set properly?" # This is to avoid " Error: Unable to initialize GTK+, is DISPLAY set properly?"
# when building over SSH without X11 Forwarding # when building over SSH without X11 Forwarding
# export DISPLAY=:0.0 # export DISPLAY=:0.0
@@ -29,13 +30,14 @@ make NOGUI=1 || exit 1
make NOGUI=1 install DESTDIR="$PARENTDIR/VeraCrypt_Setup/Console" || exit 1 make NOGUI=1 install DESTDIR="$PARENTDIR/VeraCrypt_Setup/Console" || exit 1
echo "Creating VeraCrypt DEB packages" echo "Creating VeraCrypt DEB packages"
# -DCPACK_RPM_PACKAGE_DEBUG=TRUE for debugging cpack DEB # -DCPACK_RPM_PACKAGE_DEBUG=TRUE for debugging cpack DEB
# -DCPACK_RPM_PACKAGE_DEBUG=TRUE for debugging cpack DEB # -DCPACK_RPM_PACKAGE_DEBUG=TRUE for debugging cpack DEB
mkdir $PARENTDIR/VeraCrypt_Packaging mkdir -p $PARENTDIR/VeraCrypt_Packaging/GUI
mkdir -p $PARENTDIR/VeraCrypt_Packaging/Console
cmake -H$SCRIPTPATH -B$PARENTDIR/VeraCrypt_Packaging -DVERACRYPT_BUILD_DIR="$PARENTDIR/VeraCrypt_Setup/GUI" -DNOGUI=FALSE || exit 1 cmake -H$SCRIPTPATH -B$PARENTDIR/VeraCrypt_Packaging/GUI -DVERACRYPT_BUILD_DIR="$PARENTDIR/VeraCrypt_Setup/GUI" -DNOGUI=FALSE || exit 1
cpack --config $PARENTDIR/VeraCrypt_Packaging/CPackConfig.cmake || exit 1 cpack --config $PARENTDIR/VeraCrypt_Packaging/GUI/CPackConfig.cmake || exit 1
cmake -H$SCRIPTPATH -B$PARENTDIR/VeraCrypt_Packaging/Console -DVERACRYPT_BUILD_DIR="$PARENTDIR/VeraCrypt_Setup/Console" -DNOGUI=TRUE || exit 1
cmake -H$SCRIPTPATH -B$PARENTDIR/VeraCrypt_Packaging -DVERACRYPT_BUILD_DIR="$PARENTDIR/VeraCrypt_Setup/Console" -DNOGUI=TRUE || exit 1 cpack --config $PARENTDIR/VeraCrypt_Packaging/Console/CPackConfig.cmake || exit 1
cpack --config $PARENTDIR/VeraCrypt_Packaging/CPackConfig.cmake || exit 1
src/Build/build_cmake_opensuse.sh
+71
View File
@@ -0,0 +1,71 @@
#!/bin/sh
# Errors should cause script to exit
set -e
# Absolute path to this script
export SCRIPT=$(readlink -f "$0")
# Absolute path this script is in
export SCRIPTPATH=$(dirname "$SCRIPT")
# Source directory which contains the Makefile
export SOURCEPATH=$(readlink -f "$SCRIPTPATH/..")
# Directory where the VeraCrypt has been checked out
export PARENTDIR=$(readlink -f "$SCRIPTPATH/../../..")
# The sources of wxWidgets 3.0.4 must be extracted to the parent directory
export WX_ROOT=$PARENTDIR/wxWidgets-3.0.4
echo "Using wxWidgets sources in $WX_ROOT"
cd $SOURCEPATH
echo "Building GUI version of VeraCrypt for RPM using wxWidgets static libraries"
# This will be the temporary wxWidgets directory
export WX_BUILD_DIR=$PARENTDIR/wxBuildGui
# To build wxWidgets using GTK-2
make WXSTATIC=1 wxbuild || exit 1
ln -s $WX_BUILD_DIR/lib $WX_BUILD_DIR/lib64
make WXSTATIC=1 clean || exit 1
make WXSTATIC=1 || exit 1
make WXSTATIC=1 install DESTDIR="$PARENTDIR/VeraCrypt_Setup/GUI" || exit 1
# Uncomment below and comment lines above to reuse existing wxWidgets build
# make WXSTATIC=1 clean || exit 1
# make WXSTATIC=1 || exit 1
# make WXSTATIC=1 install DESTDIR="$PARENTDIR/VeraCrypt_Setup/GUI" || exit 1
echo "Building console version of VeraCrypt for RPM using wxWidgets static libraries"
# This is to avoid " Error: Unable to initialize GTK+, is DISPLAY set properly?"
# when building over SSH without X11 Forwarding
# export DISPLAY=:0.0
# This will be the temporary wxWidgets directory
export WX_BUILD_DIR=$PARENTDIR/wxBuildConsole
# To build wxWidgets using GTK-2
make WXSTATIC=1 NOGUI=1 wxbuild || exit 1
ln -s $WX_BUILD_DIR/lib $WX_BUILD_DIR/lib64
make WXSTATIC=1 NOGUI=1 clean || exit 1
make WXSTATIC=1 NOGUI=1 || exit 1
make WXSTATIC=1 NOGUI=1 install DESTDIR="$PARENTDIR/VeraCrypt_Setup/Console" || exit 1
# Uncomment below and comment lines above to reuse existing wxWidgets build
# make WXSTATIC=1 NOGUI=1 clean || exit 1
# make WXSTATIC=1 NOGUI=1 || exit 1
# make WXSTATIC=1 NOGUI=1 install DESTDIR="$PARENTDIR/VeraCrypt_Setup/Console" || exit 1
echo "Creating VeraCrypt RPM packages "
# -DCPACK_RPM_PACKAGE_DEBUG=TRUE for debugging cpack RPM
# -DCPACK_RPM_PACKAGE_DEBUG=TRUE for debugging cpack RPM
mkdir -p $PARENTDIR/VeraCrypt_Packaging/GUI
mkdir -p $PARENTDIR/VeraCrypt_Packaging/Console
# wxWidgets was built using GTK-2
cmake -H$SCRIPTPATH -B$PARENTDIR/VeraCrypt_Packaging/GUI -DVERACRYPT_BUILD_DIR="$PARENTDIR/VeraCrypt_Setup/GUI" -DWITHGTK3=TRUE -DNOGUI=FALSE || exit 1
cpack --config $PARENTDIR/VeraCrypt_Packaging/GUI/CPackConfig.cmake || exit 1
cmake -H$SCRIPTPATH -B$PARENTDIR/VeraCrypt_Packaging/Console -DVERACRYPT_BUILD_DIR="$PARENTDIR/VeraCrypt_Setup/Console" -DWITHGTK3=TRUE -DNOGUI=TRUE || exit 1
cpack --config $PARENTDIR/VeraCrypt_Packaging/Console/CPackConfig.cmake|| exit 1
src/Build/build_cmake_rpm.sh → src/Build/build_cmake_rpm_gtk2.sh
Executable → Regular
+17 -13
View File
@@ -23,12 +23,13 @@ echo "Building GUI version of VeraCrypt for RPM using wxWidgets static libraries
# This will be the temporary wxWidgets directory # This will be the temporary wxWidgets directory
export WX_BUILD_DIR=$PARENTDIR/wxBuildGui export WX_BUILD_DIR=$PARENTDIR/wxBuildGui
make WXSTATIC=1 WITHGTK3=1 wxbuild || exit 1 # To build wxWidgets using GTK-2
make WXSTATIC=1 clean || exit 1 make WXSTATIC=1 wxbuild || exit 1
make WXSTATIC=1 || exit 1 make WXSTATIC=1 clean || exit 1
make WXSTATIC=1 || exit 1
make WXSTATIC=1 install DESTDIR="$PARENTDIR/VeraCrypt_Setup/GUI" || exit 1 make WXSTATIC=1 install DESTDIR="$PARENTDIR/VeraCrypt_Setup/GUI" || exit 1
# Uncomment below and comment line above to reuse existing wxWidgets build # Uncomment below and comment lines above to reuse existing wxWidgets build
# make WXSTATIC=1 clean || exit 1 # make WXSTATIC=1 clean || exit 1
# make WXSTATIC=1 || exit 1 # make WXSTATIC=1 || exit 1
# make WXSTATIC=1 install DESTDIR="$PARENTDIR/VeraCrypt_Setup/GUI" || exit 1 # make WXSTATIC=1 install DESTDIR="$PARENTDIR/VeraCrypt_Setup/GUI" || exit 1
@@ -42,9 +43,10 @@ echo "Building console version of VeraCrypt for RPM using wxWidgets static libra
# This will be the temporary wxWidgets directory # This will be the temporary wxWidgets directory
export WX_BUILD_DIR=$PARENTDIR/wxBuildConsole export WX_BUILD_DIR=$PARENTDIR/wxBuildConsole
make WXSTATIC=1 WITHGTK3=1 NOGUI=1 wxbuild || exit 1 # To build wxWidgets using GTK-2
make WXSTATIC=1 NOGUI=1 clean || exit 1 make WXSTATIC=1 NOGUI=1 wxbuild || exit 1
make WXSTATIC=1 NOGUI=1 || exit 1 make WXSTATIC=1 NOGUI=1 clean || exit 1
make WXSTATIC=1 NOGUI=1 || exit 1
make WXSTATIC=1 NOGUI=1 install DESTDIR="$PARENTDIR/VeraCrypt_Setup/Console" || exit 1 make WXSTATIC=1 NOGUI=1 install DESTDIR="$PARENTDIR/VeraCrypt_Setup/Console" || exit 1
# Uncomment below and comment lines above to reuse existing wxWidgets build # Uncomment below and comment lines above to reuse existing wxWidgets build
@@ -53,13 +55,15 @@ make WXSTATIC=1 NOGUI=1 install DESTDIR="$PARENTDIR/VeraCrypt_Setup/Console" ||
# make WXSTATIC=1 NOGUI=1 install DESTDIR="$PARENTDIR/VeraCrypt_Setup/Console" || exit 1 # make WXSTATIC=1 NOGUI=1 install DESTDIR="$PARENTDIR/VeraCrypt_Setup/Console" || exit 1
echo "Creating VeraCrypt RPM packages " echo "Creating VeraCrypt RPM packages "
# -DCPACK_RPM_PACKAGE_DEBUG=TRUE for debugging cpack RPM # -DCPACK_RPM_PACKAGE_DEBUG=TRUE for debugging cpack RPM
# -DCPACK_RPM_PACKAGE_DEBUG=TRUE for debugging cpack RPM # -DCPACK_RPM_PACKAGE_DEBUG=TRUE for debugging cpack RPM
mkdir $PARENTDIR/VeraCrypt_Packaging mkdir -p $PARENTDIR/VeraCrypt_Packaging/GUI
mkdir -p $PARENTDIR/VeraCrypt_Packaging/Console
cmake -H$SCRIPTPATH -B$PARENTDIR/VeraCrypt_Packaging -DVERACRYPT_BUILD_DIR="$PARENTDIR/VeraCrypt_Setup/GUI" -DNOGUI=FALSE || exit 1 # wxWidgets was built using GTK-2
cpack --config $PARENTDIR/VeraCrypt_Packaging/CPackConfig.cmake || exit 1 cmake -H$SCRIPTPATH -B$PARENTDIR/VeraCrypt_Packaging/GUI -DVERACRYPT_BUILD_DIR="$PARENTDIR/VeraCrypt_Setup/GUI" -DWITHGTK3=FALSE -DNOGUI=FALSE || exit 1
cpack --config $PARENTDIR/VeraCrypt_Packaging/GUI/CPackConfig.cmake || exit 1
cmake -H$SCRIPTPATH -B$PARENTDIR/VeraCrypt_Packaging -DVERACRYPT_BUILD_DIR="$PARENTDIR/VeraCrypt_Setup/Console" -DNOGUI=TRUE || exit 1 cmake -H$SCRIPTPATH -B$PARENTDIR/VeraCrypt_Packaging/Console -DVERACRYPT_BUILD_DIR="$PARENTDIR/VeraCrypt_Setup/Console" -DWITHGTK3=FALSE -DNOGUI=TRUE || exit 1
cpack --config $PARENTDIR/VeraCrypt_Packaging/CPackConfig.cmake|| exit 1 cpack --config $PARENTDIR/VeraCrypt_Packaging/Console/CPackConfig.cmake || exit 1
src/Build/build_cmake_rpm_gtk3.sh
+69
View File
@@ -0,0 +1,69 @@
#!/bin/sh
# Errors should cause script to exit
set -e
# Absolute path to this script
export SCRIPT=$(readlink -f "$0")
# Absolute path this script is in
export SCRIPTPATH=$(dirname "$SCRIPT")
# Source directory which contains the Makefile
export SOURCEPATH=$(readlink -f "$SCRIPTPATH/..")
# Directory where the VeraCrypt has been checked out
export PARENTDIR=$(readlink -f "$SCRIPTPATH/../../..")
# The sources of wxWidgets 3.0.4 must be extracted to the parent directory
export WX_ROOT=$PARENTDIR/wxWidgets-3.0.4
echo "Using wxWidgets sources in $WX_ROOT"
cd $SOURCEPATH
echo "Building GUI version of VeraCrypt for RPM using wxWidgets static libraries"
# This will be the temporary wxWidgets directory
export WX_BUILD_DIR=$PARENTDIR/wxBuildGui
# To build wxWidgets using GTK-3
make WXSTATIC=1 WITHGTK3=1 wxbuild || exit 1
make WXSTATIC=1 clean || exit 1
make WXSTATIC=1 || exit 1
make WXSTATIC=1 install DESTDIR="$PARENTDIR/VeraCrypt_Setup/GUI" || exit 1
# Uncomment below and comment lines above to reuse existing wxWidgets build
# make WXSTATIC=1 clean || exit 1
# make WXSTATIC=1 || exit 1
# make WXSTATIC=1 install DESTDIR="$PARENTDIR/VeraCrypt_Setup/GUI" || exit 1
echo "Building console version of VeraCrypt for RPM using wxWidgets static libraries"
# This is to avoid " Error: Unable to initialize GTK+, is DISPLAY set properly?"
# when building over SSH without X11 Forwarding
# export DISPLAY=:0.0
# This will be the temporary wxWidgets directory
export WX_BUILD_DIR=$PARENTDIR/wxBuildConsole
# To build wxWidgets using GTK-3
make WXSTATIC=1 WITHGTK3=1 NOGUI=1 wxbuild || exit 1
make WXSTATIC=1 NOGUI=1 clean || exit 1
make WXSTATIC=1 NOGUI=1 || exit 1
make WXSTATIC=1 NOGUI=1 install DESTDIR="$PARENTDIR/VeraCrypt_Setup/Console" || exit 1
# Uncomment below and comment lines above to reuse existing wxWidgets build
# make WXSTATIC=1 NOGUI=1 clean || exit 1
# make WXSTATIC=1 NOGUI=1 || exit 1
# make WXSTATIC=1 NOGUI=1 install DESTDIR="$PARENTDIR/VeraCrypt_Setup/Console" || exit 1
echo "Creating VeraCrypt RPM packages "
# -DCPACK_RPM_PACKAGE_DEBUG=TRUE for debugging cpack RPM
# -DCPACK_RPM_PACKAGE_DEBUG=TRUE for debugging cpack RPM
mkdir -p $PARENTDIR/VeraCrypt_Packaging/GUI
mkdir -p $PARENTDIR/VeraCrypt_Packaging/Console
# wxWidgets was built using GTK-3
cmake -H$SCRIPTPATH -B$PARENTDIR/VeraCrypt_Packaging/GUI -DVERACRYPT_BUILD_DIR="$PARENTDIR/VeraCrypt_Setup/GUI" -DWITHGTK3=TRUE -DNOGUI=FALSE || exit 1
cpack --config $PARENTDIR/VeraCrypt_Packaging/GUI/CPackConfig.cmake || exit 1
cmake -H$SCRIPTPATH -B$PARENTDIR/VeraCrypt_Packaging/Console -DVERACRYPT_BUILD_DIR="$PARENTDIR/VeraCrypt_Setup/Console" -DWITHGTK3=TRUE -DNOGUI=TRUE || exit 1
cpack --config $PARENTDIR/VeraCrypt_Packaging/Console/CPackConfig.cmake|| exit 1
src/Build/build_veracrypt_macosx.sh
+10 -10
View File
@@ -1,5 +1,5 @@
# #
# Copyright (c) 2013-2017 IDRIX # Copyright (c) 2013-2019 IDRIX
# Governed by the Apache License 2.0 the full text of which is contained # Governed by the Apache License 2.0 the full text of which is contained
# in the file License.txt included in VeraCrypt binary and source # in the file License.txt included in VeraCrypt binary and source
# code distribution packages. # code distribution packages.
@@ -12,22 +12,22 @@ SOURCEPATH=$(cd "$(dirname "$SCRIPTPATH/../.")"; pwd)
# directory where the VeraCrypt project has been checked out # directory where the VeraCrypt project has been checked out
PARENTDIR=$(cd "$(dirname "$SCRIPTPATH/../../../.")"; pwd) PARENTDIR=$(cd "$(dirname "$SCRIPTPATH/../../../.")"; pwd)
# the sources of wxWidgets 3.0.3 must be extracted to the parent directory # the sources of wxWidgets 3.1.2 must be extracted to the parent directory (for night mode)
export WX_ROOT=$PARENTDIR/wxWidgets-3.0.4 export WX_ROOT=$PARENTDIR/wxWidgets-3.1.2
echo "Using wxWidgets sources in $WX_ROOT" echo "Using wxWidgets sources in $WX_ROOT"
# this will be the temporary wxWidgets directory # this will be the temporary wxWidgets directory
export WX_BUILD_DIR=$PARENTDIR/wxBuild export WX_BUILD_DIR=$PARENTDIR/wxBuild-3.1.2
# define the SDK version to use. We use 10.7 by default
export VC_OSX_TARGET=10.7
echo "Using MacOSX SDK $VC_OSX_TARGET"
# define the SDK version to use and OSX minimum target. We target 10.9 by default
export VC_OSX_TARGET=10.9
export VC_OSX_SDK=10.14
echo "Using MacOSX SDK $VC_OSX_SDK"
cd $SOURCEPATH cd $SOURCEPATH
echo "Building VeraCrypt" echo "Building VeraCrypt"
make WXSTATIC=1 wxbuild && make WXSTATIC=1 clean && make WXSTATIC=1 && make WXSTATIC=1 package make WXSTATIC=FULL wxbuild && make WXSTATIC=FULL clean && make WXSTATIC=FULL && make WXSTATIC=FULL package
# Uncomment below and comment line above to reuse existing wxWidgets build # Uncomment below and comment line above to reuse existing wxWidgets build
# make WXSTATIC=1 clean && make WXSTATIC=1 && make WXSTATIC=1 package # make WXSTATIC=FULL clean && make WXSTATIC=FULL && make WXSTATIC=FULL package
src/Build/build_veracrypt_macosx_legacy.sh
Executable
+33
View File
@@ -0,0 +1,33 @@
#
# Copyright (c) 2013-2017 IDRIX
# Governed by the Apache License 2.0 the full text of which is contained
# in the file License.txt included in VeraCrypt binary and source
# code distribution packages.
#
# Absolute path this script is in
SCRIPTPATH=$(cd "$(dirname "$0")"; pwd)
# source directory which contains the Makefile
SOURCEPATH=$(cd "$(dirname "$SCRIPTPATH/../.")"; pwd)
# directory where the VeraCrypt project has been checked out
PARENTDIR=$(cd "$(dirname "$SCRIPTPATH/../../../.")"; pwd)
# the sources of wxWidgets 3.1.2 must be extracted to the parent directory
export WX_ROOT=$PARENTDIR/wxWidgets-3.1.2
echo "Using wxWidgets sources in $WX_ROOT"
# this will be the temporary wxWidgets directory
export WX_BUILD_DIR=$PARENTDIR/wxBuild
# define the SDK version to use. We use 10.7 by default
export VC_OSX_TARGET=10.7
export VC_OSX_SDK=10.9
echo "Using MacOSX SDK $VC_OSX_TARGET"
cd $SOURCEPATH
echo "Building VeraCrypt"
make WXSTATIC=FULL wxbuild && make WXSTATIC=FULL clean && make WXSTATIC=FULL && make WXSTATIC=FULL package
# Uncomment below and comment line above to reuse existing wxWidgets build
# make WXSTATIC=FULL clean && make WXSTATIC=FULL && make WXSTATIC=FULL package
src/Common/BootEncryption.cpp
+556 -226
View File
File diff suppressed because it is too large Load Diff
src/Common/BootEncryption.h
+17 -7
View File
@@ -29,6 +29,10 @@ typedef NTSTATUS (WINAPI *NtQuerySystemInformationFn)(
PULONG ReturnLength PULONG ReturnLength
); );
typedef ULONG (WINAPI *RtlNtStatusToDosErrorFn)(
NTSTATUS Status
);
using namespace std; using namespace std;
namespace VeraCrypt namespace VeraCrypt
@@ -189,9 +193,11 @@ namespace VeraCrypt
BOOL Load (const wchar_t* fileName); BOOL Load (const wchar_t* fileName);
void Load (char* configContent); void Load (char* configContent);
BOOL Save (const wchar_t* fileName, HWND hwnd); BOOL Save (const wchar_t* fileName, HWND hwnd);
static BOOL IsPostExecFileField (const string& szFieldValue, string& filePath);
static BOOL IsPostExecFileField (const string& szFieldValue, wstring& filePath);
}; };
void GetVolumeESP(wstring& path); void GetVolumeESP(wstring& path, wstring& bootVolumePath);
std::string ReadESPFile (LPCWSTR szFilePath, bool bSkipUTF8BOM); std::string ReadESPFile (LPCWSTR szFilePath, bool bSkipUTF8BOM);
void WriteESPFile (LPCWSTR szFilePath, LPBYTE pbData, DWORD dwDataLen, bool bAddUTF8BOM); void WriteESPFile (LPCWSTR szFilePath, LPBYTE pbData, DWORD dwDataLen, bool bAddUTF8BOM);
@@ -199,16 +205,18 @@ namespace VeraCrypt
public: public:
EfiBoot(); EfiBoot();
void PrepareBootPartition(); void PrepareBootPartition(bool bDisableException = false);
bool IsEfiBoot(); bool IsEfiBoot();
void DeleteStartExec(uint16 statrtOrderNum = 0xDC5B, wchar_t* type = NULL); void DeleteStartExec(uint16 statrtOrderNum = 0xDC5B, wchar_t* type = NULL);
void SetStartExec(wstring description, wstring execPath, uint16 statrtOrderNum = 0xDC5B, wchar_t* type = NULL, uint32 attr = 1); void SetStartExec(wstring description, wstring execPath, bool setBootNext = true, uint16 statrtOrderNum = 0xDC5B, wchar_t* type = NULL, uint32 attr = 1);
void SaveFile(const wchar_t* name, byte* data, DWORD size); void SaveFile(const wchar_t* name, byte* data, DWORD size);
void GetFileSize(const wchar_t* name, unsigned __int64& size); void GetFileSize(const wchar_t* name, unsigned __int64& size);
void ReadFile(const wchar_t* name, byte* data, DWORD size); void ReadFile(const wchar_t* name, byte* data, DWORD size);
void CopyFile(const wchar_t* name, const wchar_t* targetName); void CopyFile(const wchar_t* name, const wchar_t* targetName);
bool FileExists(const wchar_t* name); bool FileExists(const wchar_t* name);
static bool CompareFiles (const wchar_t* fileName1, const wchar_t* fileName2);
static bool CompareFileData (const wchar_t* fileName, const byte* data, DWORD size);
BOOL RenameFile(const wchar_t* name, const wchar_t* nameNew, BOOL bForce); BOOL RenameFile(const wchar_t* name, const wchar_t* nameNew, BOOL bForce);
BOOL DelFile(const wchar_t* name); BOOL DelFile(const wchar_t* name);
@@ -217,23 +225,22 @@ namespace VeraCrypt
BOOL UpdateConfig (const wchar_t* name, int pim, int hashAlgo, HWND hwndDlg); BOOL UpdateConfig (const wchar_t* name, int pim, int hashAlgo, HWND hwndDlg);
BOOL WriteConfig (const wchar_t* name, bool preserveUserConfig, int pim, int hashAlgo, const char* passPromptMsg, HWND hwndDlg); BOOL WriteConfig (const wchar_t* name, bool preserveUserConfig, int pim, int hashAlgo, const char* passPromptMsg, HWND hwndDlg);
BOOL DelDir(const wchar_t* name); BOOL DelDir(const wchar_t* name);
void SelectBootVolumeESP(); PSTORAGE_DEVICE_NUMBER GetStorageDeviceNumber () { if (bDeviceInfoValid) return &sdn; else { SetLastError (ERROR_INVALID_DRIVE); throw SystemException(SRC_POS);}}
PSTORAGE_DEVICE_NUMBER GetStorageDeviceNumber () { return &sdn;}
protected: protected:
bool m_bMounted; bool m_bMounted;
std::wstring EfiBootPartPath; std::wstring EfiBootPartPath;
STORAGE_DEVICE_NUMBER sdn; STORAGE_DEVICE_NUMBER sdn;
PARTITION_INFORMATION_EX partInfo; PARTITION_INFORMATION_EX partInfo;
bool bDeviceInfoValid;
WCHAR tempBuf[1024]; WCHAR tempBuf[1024];
bool bBootVolumePathSelected;
std::wstring BootVolumePath; std::wstring BootVolumePath;
}; };
class BootEncryption class BootEncryption
{ {
public: public:
BootEncryption (HWND parent, bool postOOBE = false); BootEncryption (HWND parent, bool postOOBE = false, bool setBootNext = false);
~BootEncryption (); ~BootEncryption ();
enum FilterType enum FilterType
@@ -285,6 +292,7 @@ namespace VeraCrypt
void RegisterFilterDriver (bool registerDriver, FilterType filterType); void RegisterFilterDriver (bool registerDriver, FilterType filterType);
void RegisterSystemFavoritesService (BOOL registerService); void RegisterSystemFavoritesService (BOOL registerService);
void RegisterSystemFavoritesService (BOOL registerService, BOOL noFileHandling); void RegisterSystemFavoritesService (BOOL registerService, BOOL noFileHandling);
bool IsSystemFavoritesServiceRunning ();
void UpdateSystemFavoritesService (); void UpdateSystemFavoritesService ();
void RenameDeprecatedSystemLoaderBackup (); void RenameDeprecatedSystemLoaderBackup ();
bool RestartComputer (BOOL bShutdown = FALSE); bool RestartComputer (BOOL bShutdown = FALSE);
@@ -344,6 +352,7 @@ namespace VeraCrypt
bool RescueVolumeHeaderValid; bool RescueVolumeHeaderValid;
bool VolumeHeaderValid; bool VolumeHeaderValid;
bool PostOOBEMode; bool PostOOBEMode;
bool SetBootNext;
}; };
} }
@@ -361,6 +370,7 @@ namespace VeraCrypt
#define VC_SYSTEM_FAVORITES_SERVICE_ARG_SKIP_MOUNT L"/SkipMount" #define VC_SYSTEM_FAVORITES_SERVICE_ARG_SKIP_MOUNT L"/SkipMount"
#define VC_SYSTEM_FAVORITES_SERVICE_CONFIG_DONT_UPDATE_LOADER 0x1 #define VC_SYSTEM_FAVORITES_SERVICE_CONFIG_DONT_UPDATE_LOADER 0x1
#define VC_SYSTEM_FAVORITES_SERVICE_CONFIG_FORCE_SET_BOOTNEXT 0x2
#define VC_WINDOWS_UPGRADE_POSTOOBE_CMDLINE_OPTION L"/PostOOBE" #define VC_WINDOWS_UPGRADE_POSTOOBE_CMDLINE_OPTION L"/PostOOBE"
src/Common/Dlgcode.c
+1 -1
View File
@@ -11142,7 +11142,7 @@ void InconsistencyResolved (char *techInfo)
} }
void ReportUnexpectedState (char *techInfo) void ReportUnexpectedState (const char *techInfo)
{ {
wchar_t finalMsg[8024]; wchar_t finalMsg[8024];
src/Common/Dlgcode.h
+1 -1
View File
@@ -473,7 +473,7 @@ BOOL CALLBACK CloseTCWindowsEnum( HWND hwnd, LPARAM lParam);
BOOL CALLBACK FindTCWindowEnum (HWND hwnd, LPARAM lParam); BOOL CALLBACK FindTCWindowEnum (HWND hwnd, LPARAM lParam);
BYTE *MapResource (wchar_t *resourceType, int resourceId, PDWORD size); BYTE *MapResource (wchar_t *resourceType, int resourceId, PDWORD size);
void InconsistencyResolved (char *msg); void InconsistencyResolved (char *msg);
void ReportUnexpectedState (char *techInfo); void ReportUnexpectedState (const char *techInfo);
BOOL SelectMultipleFiles (HWND hwndDlg, const char *stringId, wchar_t *lpszFileName, size_t cbFileName, BOOL keepHistory); BOOL SelectMultipleFiles (HWND hwndDlg, const char *stringId, wchar_t *lpszFileName, size_t cbFileName, BOOL keepHistory);
BOOL SelectMultipleFilesNext (wchar_t *lpszFileName, size_t cbFileName); BOOL SelectMultipleFilesNext (wchar_t *lpszFileName, size_t cbFileName);
void OpenOnlineHelp (); void OpenOnlineHelp ();
src/Common/Tcdefs.h
+2 -2
View File
@@ -55,7 +55,7 @@ extern unsigned short _rotl16(unsigned short value, unsigned char shift);
#define TC_APP_NAME "VeraCrypt" #define TC_APP_NAME "VeraCrypt"
// Version displayed to user // Version displayed to user
#define VERSION_STRING "1.24" #define VERSION_STRING "1.24-Hotfix1"
#ifdef VC_EFI_CUSTOM_MODE #ifdef VC_EFI_CUSTOM_MODE
#define VERSION_STRING_SUFFIX "-CustomEFI" #define VERSION_STRING_SUFFIX "-CustomEFI"
@@ -67,7 +67,7 @@ extern unsigned short _rotl16(unsigned short value, unsigned char shift);
#define VERSION_NUM 0x0124 #define VERSION_NUM 0x0124
// Release date // Release date
#define TC_STR_RELEASE_DATE L"October 6, 2019" #define TC_STR_RELEASE_DATE L"October 27, 2019"
#define TC_RELEASE_DATE_YEAR 2019 #define TC_RELEASE_DATE_YEAR 2019
#define TC_RELEASE_DATE_MONTH 10 #define TC_RELEASE_DATE_MONTH 10
src/Core/RandomNumberGenerator.cpp
+23
View File
@@ -46,6 +46,16 @@ namespace VeraCrypt
throw_sys_sub_if (read (random, buffer, buffer.Size()) == -1 && errno != EAGAIN, L"/dev/random"); throw_sys_sub_if (read (random, buffer, buffer.Size()) == -1 && errno != EAGAIN, L"/dev/random");
AddToPool (buffer); AddToPool (buffer);
/* use JitterEntropy library to get good quality random bytes based on CPU timing jitter */
if (JitterRngCtx)
{
ssize_t rndLen = jent_read_entropy (JitterRngCtx, (char*) buffer.Ptr(), buffer.Size());
if (rndLen > 0)
{
AddToPool (buffer);
}
}
} }
#endif #endif
} }
@@ -81,6 +91,12 @@ namespace VeraCrypt
size_t bufferLen = buffer.Size(), loopLen; size_t bufferLen = buffer.Size(), loopLen;
byte* pbBuffer = buffer.Get(); byte* pbBuffer = buffer.Get();
// Initialize JitterEntropy RNG for this call
if (0 == jent_entropy_init ())
{
JitterRngCtx = jent_entropy_collector_alloc (1, 0);
}
// Poll system for data // Poll system for data
AddSystemDataToPool (fast); AddSystemDataToPool (fast);
HashMixPool(); HashMixPool();
@@ -127,6 +143,12 @@ namespace VeraCrypt
pbBuffer += loopLen; pbBuffer += loopLen;
} }
if (JitterRngCtx)
{
jent_entropy_collector_free (JitterRngCtx);
JitterRngCtx = NULL;
}
} }
shared_ptr <Hash> RandomNumberGenerator::GetHash () shared_ptr <Hash> RandomNumberGenerator::GetHash ()
@@ -232,4 +254,5 @@ namespace VeraCrypt
size_t RandomNumberGenerator::ReadOffset; size_t RandomNumberGenerator::ReadOffset;
bool RandomNumberGenerator::Running = false; bool RandomNumberGenerator::Running = false;
size_t RandomNumberGenerator::WriteOffset; size_t RandomNumberGenerator::WriteOffset;
struct rand_data *RandomNumberGenerator::JitterRngCtx = NULL;
} }
src/Core/RandomNumberGenerator.h
+2
View File
@@ -16,6 +16,7 @@
#include "Platform/Platform.h" #include "Platform/Platform.h"
#include "Volume/Hash.h" #include "Volume/Hash.h"
#include "Common/Random.h" #include "Common/Random.h"
#include "Crypto/jitterentropy.h"
namespace VeraCrypt namespace VeraCrypt
{ {
@@ -53,6 +54,7 @@ namespace VeraCrypt
static size_t ReadOffset; static size_t ReadOffset;
static bool Running; static bool Running;
static size_t WriteOffset; static size_t WriteOffset;
static struct rand_data *JitterRngCtx;
}; };
} }
src/Core/Unix/CoreService.cpp
+38
View File
@@ -13,6 +13,7 @@
#include "CoreService.h" #include "CoreService.h"
#include <fcntl.h> #include <fcntl.h>
#include <sys/wait.h> #include <sys/wait.h>
#include <stdio.h>
#include "Platform/FileStream.h" #include "Platform/FileStream.h"
#include "Platform/MemoryStream.h" #include "Platform/MemoryStream.h"
#include "Platform/Serializable.h" #include "Platform/Serializable.h"
@@ -288,6 +289,41 @@ namespace VeraCrypt
request.FastElevation = !ElevatedServiceAvailable; request.FastElevation = !ElevatedServiceAvailable;
request.ApplicationExecutablePath = Core->GetApplicationExecutablePath(); request.ApplicationExecutablePath = Core->GetApplicationExecutablePath();
// Test if the user has an active "sudo" session.
// This is only done under Linux / FreeBSD by executing the command 'sudo -n uptime'.
// In case a "sudo" session is active, the result of the command contains the string 'load average'.
// Otherwise, the result contains "sudo: a password is required".
// This may not work on all OSX versions because of a bug in sudo in its version 1.7.10,
// therefore we keep the old behaviour of sending a 'dummy' password under OSX.
// See : https://superuser.com/questions/902826/why-does-sudo-n-on-mac-os-x-always-return-0
#if defined(TC_LINUX ) || defined (TC_FREEBSD)
// Set to false to force the 'WarningEvent' to be raised in case of and elevation exception.
request.FastElevation = false;
std::vector<char> buffer(128, 0);
std::string result;
FILE* pipe = popen("sudo -n uptime 2>&1 | grep 'load average' | wc -l", "r"); // We redirect stderr to stdout (2>&1) to be able to catch the result of the command
if (pipe)
{
while (!feof(pipe))
{
if (fgets(buffer.data(), 128, pipe) != nullptr)
result += buffer.data();
}
fflush(pipe);
pclose(pipe);
pipe = NULL;
if (!result.empty() && strlen(result.c_str()) != 0 && !memcmp(result.c_str(), "0", 1))
{
(*AdminPasswordCallback) (request.AdminPassword);
}
}
#endif
while (!ElevatedServiceAvailable) while (!ElevatedServiceAvailable)
{ {
try try
@@ -396,6 +432,7 @@ namespace VeraCrypt
vector <char> adminPassword (request.AdminPassword.size() + 1); vector <char> adminPassword (request.AdminPassword.size() + 1);
int timeout = 6000; int timeout = 6000;
// 'request.FastElevation' is always false under Linux / FreeBSD
if (request.FastElevation) if (request.FastElevation)
{ {
string dummyPassword = "dummy\n"; string dummyPassword = "dummy\n";
@@ -457,6 +494,7 @@ namespace VeraCrypt
outPipe->Close(); outPipe->Close();
errPipe.Close(); errPipe.Close();
// 'request.FastElevation' is always false under Linux / FreeBSD
if (request.FastElevation) if (request.FastElevation)
{ {
// Prevent defunct process // Prevent defunct process
src/Core/VolumeCreator.h
+1
View File
@@ -45,6 +45,7 @@ namespace VeraCrypt
Ext3, Ext3,
Ext4, Ext4,
MacOsExt, MacOsExt,
APFS,
UFS UFS
}; };
src/Crypto/Whirlpool.c
+14
View File
@@ -642,6 +642,20 @@ static const uint64 Whirlpool_C[8*256+R] = {
// Whirlpool basic transformation. Transforms state based on block. // Whirlpool basic transformation. Transforms state based on block.
void WhirlpoolTransform(uint64 *digest, const uint64 *block) void WhirlpoolTransform(uint64 *digest, const uint64 *block)
{ {
#if CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE
#if defined(__GNUC__) && (CRYPTOPP_GCC_VERSION <= 40407)
/* workaround for gcc 4.4.7 bug under CentOS which causes crash
* in inline assembly.
* This dummy check that is always false since "block" is aligned.
*/
uint64 lb = (uint64) block;
if (lb % 16)
{
TC_THROW_FATAL_EXCEPTION;
}
#endif
#endif
#if CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE #if CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE
if (HasISSE()) if (HasISSE())
{ {
src/Crypto/jitterentropy-base-user.h
+13 -4
View File
@@ -88,7 +88,7 @@ static VC_INLINE void jent_get_nstime(__u64 *out)
#define EAX_EDX_RET(val, low, high) "=A" (val) #define EAX_EDX_RET(val, low, high) "=A" (val)
#endif #endif
static VC_INLINE void jent_get_nstime(__u64 *out) VC_INLINE void jent_get_nstime(__u64 *out)
{ {
DECLARE_ARGS(val, low, high); DECLARE_ARGS(val, low, high);
asm volatile("rdtsc" : EAX_EDX_RET(val, low, high)); asm volatile("rdtsc" : EAX_EDX_RET(val, low, high));
@@ -97,7 +97,10 @@ static VC_INLINE void jent_get_nstime(__u64 *out)
#endif #endif
static VC_INLINE void *jent_zalloc(size_t len) #ifdef _MSC_VER
static
#endif
VC_INLINE void *jent_zalloc(size_t len)
{ {
void *tmp = NULL; void *tmp = NULL;
tmp = TCalloc(len); tmp = TCalloc(len);
@@ -111,7 +114,10 @@ static VC_INLINE void *jent_zalloc(size_t len)
return tmp; return tmp;
} }
static VC_INLINE void jent_zfree(void *ptr, unsigned int len) #ifdef _MSC_VER
static
#endif
VC_INLINE void jent_zfree(void *ptr, unsigned int len)
{ {
if (len % 8) if (len % 8)
burn(ptr, len); burn(ptr, len);
@@ -123,7 +129,10 @@ static VC_INLINE void jent_zfree(void *ptr, unsigned int len)
TCfree(ptr); TCfree(ptr);
} }
static VC_INLINE int jent_fips_enabled(void) #ifdef _MSC_VER
static
#endif
VC_INLINE int jent_fips_enabled(void)
{ {
return 0; return 0;
} }
src/Crypto/jitterentropy-base.c
+5 -1
View File
@@ -57,7 +57,11 @@
#pragma optimize( "", off ) #pragma optimize( "", off )
#pragma warning(disable:4242 4244 4334) /* disable warnings on the original code */ #pragma warning(disable:4242 4244 4334) /* disable warnings on the original code */
#else #else
#pragma GCC optimize ("O0") #if defined(__clang__)
#pragma clang optimize off
#elif defined (__GNUC__)
#pragma GCC optimize ("O0")
#endif
#endif #endif
#include "jitterentropy.h" #include "jitterentropy.h"
src/ExpandVolume/DlgExpandVolume.cpp
+68 -2
View File
@@ -49,6 +49,8 @@
#define TIMER_ID_RANDVIEW 0xff #define TIMER_ID_RANDVIEW 0xff
#define TIMER_INTERVAL_RANDVIEW 50 #define TIMER_INTERVAL_RANDVIEW 50
BOOL bSeManageVolumeNameSet = FALSE;
// see definition of enum EV_FileSystem // see definition of enum EV_FileSystem
const wchar_t * szFileSystemStr[4] = {L"RAW",L"FAT",L"NTFS",L"EXFAT"}; const wchar_t * szFileSystemStr[4] = {L"RAW",L"FAT",L"NTFS",L"EXFAT"};
@@ -117,6 +119,20 @@ uint64 GetSizeBoxMultiplier(HWND hwndDlg)
return Muliplier[i]; return Muliplier[i];
} }
void HandleQuickExpanddCheckBox (HWND hwndDlg)
{
if (IsButtonChecked (GetDlgItem (hwndDlg, IDC_INIT_NEWSPACE)))
{
EnableWindow (GetDlgItem (hwndDlg, IDC_QUICKEXPAND), FALSE);
SendDlgItemMessage (hwndDlg, IDC_QUICKEXPAND, BM_SETCHECK, BST_UNCHECKED, 0);
}
else
{
EnableWindow (GetDlgItem (hwndDlg, IDC_QUICKEXPAND), TRUE);
}
}
BOOL CALLBACK ExpandVolSizeDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) BOOL CALLBACK ExpandVolSizeDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
{ {
static EXPAND_VOL_THREAD_PARAMS *pVolExpandParam; static EXPAND_VOL_THREAD_PARAMS *pVolExpandParam;
@@ -164,6 +180,12 @@ BOOL CALLBACK ExpandVolSizeDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
SetWindowText (GetDlgItem (hwndDlg, IDT_NEW_SIZE), L""); SetWindowText (GetDlgItem (hwndDlg, IDT_NEW_SIZE), L"");
GetSpaceString(szHostFreeStr,sizeof(szHostFreeStr),pVolExpandParam->hostSizeFree,FALSE); GetSpaceString(szHostFreeStr,sizeof(szHostFreeStr),pVolExpandParam->hostSizeFree,FALSE);
StringCbPrintfW (szTemp,sizeof(szTemp),L"%s available on host drive", szHostFreeStr); StringCbPrintfW (szTemp,sizeof(szTemp),L"%s available on host drive", szHostFreeStr);
if (!pVolExpandParam->bDisableQuickExpand)
{
ShowWindow (GetDlgItem (hwndDlg, IDC_QUICKEXPAND), SW_SHOW);
HandleQuickExpanddCheckBox (hwndDlg);
}
} }
SetWindowText (GetDlgItem (hwndDlg, IDC_EXPAND_VOLUME_NEWSIZE), szTemp); SetWindowText (GetDlgItem (hwndDlg, IDC_EXPAND_VOLUME_NEWSIZE), szTemp);
@@ -197,6 +219,7 @@ BOOL CALLBACK ExpandVolSizeDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
wchar_t szTemp[4096]; wchar_t szTemp[4096];
pVolExpandParam->bInitFreeSpace = IsButtonChecked (GetDlgItem (hwndDlg, IDC_INIT_NEWSPACE)); pVolExpandParam->bInitFreeSpace = IsButtonChecked (GetDlgItem (hwndDlg, IDC_INIT_NEWSPACE));
pVolExpandParam->bQuickExpand = IsButtonChecked (GetDlgItem (hwndDlg, IDC_QUICKEXPAND));
if (!pVolExpandParam->bIsDevice) // for devices new size is set by calling function if (!pVolExpandParam->bIsDevice) // for devices new size is set by calling function
{ {
GetWindowText (GetDlgItem (hwndDlg, IDC_SIZEBOX), szTemp, ARRAYSIZE (szTemp)); GetWindowText (GetDlgItem (hwndDlg, IDC_SIZEBOX), szTemp, ARRAYSIZE (szTemp));
@@ -207,6 +230,23 @@ BOOL CALLBACK ExpandVolSizeDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
return 1; return 1;
} }
if (lw == IDC_INIT_NEWSPACE && !pVolExpandParam->bDisableQuickExpand)
{
HandleQuickExpanddCheckBox (hwndDlg);
return 1;
}
if (lw == IDC_QUICKEXPAND && IsButtonChecked (GetDlgItem (hwndDlg, IDC_QUICKEXPAND)))
{
// If quick expand selected, then we warn about security issue
if (MessageBoxW (hwndDlg, L"WARNING: You should use Quick Expand only in the following cases:\n\n1) The device where the file container is located contains no sensitive data and you do not need plausible deniability.\n2) The device where the file container is located has already been securely and fully encrypted.\n\nAre you sure you want to use Quick Expand?",
lpszTitle, YES_NO|MB_ICONWARNING|MB_DEFBUTTON2) == IDNO)
{
SendDlgItemMessage (hwndDlg, IDC_QUICKEXPAND, BM_SETCHECK, BST_UNCHECKED, 0);
return 1;
}
}
return 0; return 0;
} }
@@ -393,6 +433,7 @@ BOOL CALLBACK ExpandVolProgressDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, L
// tell the volume transform thread to terminate // tell the volume transform thread to terminate
bVolTransformThreadCancel = TRUE; bVolTransformThreadCancel = TRUE;
} }
NormalCursor ();
EndDialog (hwndDlg, lw); EndDialog (hwndDlg, lw);
return 1; return 1;
} }
@@ -402,6 +443,7 @@ BOOL CALLBACK ExpandVolProgressDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, L
if (bVolTransformStarted) if (bVolTransformStarted)
{ {
// TransformThreadFunction finished -> OK button is now exit // TransformThreadFunction finished -> OK button is now exit
NormalCursor ();
EndDialog (hwndDlg, lw); EndDialog (hwndDlg, lw);
} }
else else
@@ -561,7 +603,6 @@ void ExpandVolumeWizard (HWND hwndDlg, wchar_t *lpszVolume)
if (KeyFilesEnable && FirstKeyFile) if (KeyFilesEnable && FirstKeyFile)
KeyFilesApply (hwndDlg, &VolumePassword, FirstKeyFile, lpszVolume); KeyFilesApply (hwndDlg, &VolumePassword, FirstKeyFile, lpszVolume);
WaitCursor ();
OpenVolumeThreadParam threadParam; OpenVolumeThreadParam threadParam;
threadParam.context = &expandVol; threadParam.context = &expandVol;
@@ -691,6 +732,8 @@ void ExpandVolumeWizard (HWND hwndDlg, wchar_t *lpszVolume)
EXPAND_VOL_THREAD_PARAMS VolExpandParam; EXPAND_VOL_THREAD_PARAMS VolExpandParam;
VolExpandParam.bInitFreeSpace = (bIsLegacy && bIsDevice) ? FALSE:TRUE; VolExpandParam.bInitFreeSpace = (bIsLegacy && bIsDevice) ? FALSE:TRUE;
VolExpandParam.bQuickExpand = FALSE;
VolExpandParam.bDisableQuickExpand = bIsDevice;
VolExpandParam.szVolumeName = lpszVolume; VolExpandParam.szVolumeName = lpszVolume;
VolExpandParam.FileSystem = volFSType; VolExpandParam.FileSystem = volFSType;
VolExpandParam.pVolumePassword = &VolumePassword; VolExpandParam.pVolumePassword = &VolumePassword;
@@ -702,6 +745,17 @@ void ExpandVolumeWizard (HWND hwndDlg, wchar_t *lpszVolume)
VolExpandParam.newSize = hostSize; VolExpandParam.newSize = hostSize;
VolExpandParam.hostSizeFree = hostSizeFree; VolExpandParam.hostSizeFree = hostSizeFree;
// disable Quick Expand if the file is sparse or compressed
if (!bIsDevice)
{
DWORD dwFileAttrib = GetFileAttributesW (lpszVolume);
if (INVALID_FILE_ATTRIBUTES != dwFileAttrib)
{
if (dwFileAttrib & (FILE_ATTRIBUTE_COMPRESSED | FILE_ATTRIBUTE_SPARSE_FILE))
VolExpandParam.bDisableQuickExpand = TRUE;
}
}
while (1) while (1)
{ {
uint64 newVolumeSize; uint64 newVolumeSize;
@@ -717,7 +771,7 @@ void ExpandVolumeWizard (HWND hwndDlg, wchar_t *lpszVolume)
if ( !bIsDevice ) if ( !bIsDevice )
{ {
if ( newVolumeSize < hostSize + TC_MINVAL_FS_EXPAND) if ( (newVolumeSize < hostSize + TC_MINVAL_FS_EXPAND) && ((hostSize == volSize) || (newVolumeSize != hostSize) || ((hostSize - volSize) < TC_MINVAL_FS_EXPAND)))
{ {
StringCbPrintfW(szTmp,sizeof(szTmp),L"New volume size too small, must be at least %I64u kB larger than the current size.",TC_MINVAL_FS_EXPAND/BYTES_PER_KB); StringCbPrintfW(szTmp,sizeof(szTmp),L"New volume size too small, must be at least %I64u kB larger than the current size.",TC_MINVAL_FS_EXPAND/BYTES_PER_KB);
MessageBoxW (hwndDlg, szTmp, lpszTitle, MB_OK | MB_ICONEXCLAMATION ); MessageBoxW (hwndDlg, szTmp, lpszTitle, MB_OK | MB_ICONEXCLAMATION );
@@ -737,6 +791,18 @@ void ExpandVolumeWizard (HWND hwndDlg, wchar_t *lpszVolume)
MessageBoxW (hwndDlg, L"!\n",lpszTitle, MB_OK | MB_ICONEXCLAMATION ); MessageBoxW (hwndDlg, L"!\n",lpszTitle, MB_OK | MB_ICONEXCLAMATION );
continue; continue;
} }
if (VolExpandParam.bQuickExpand && !bSeManageVolumeNameSet)
{
if (!SetPrivilege (SE_MANAGE_VOLUME_NAME, TRUE))
{
MessageBoxW (hwndDlg, L"Error: Failed to get necessary privileges to enable Quick Expand!\nPlease uncheck Quick Expand option and try again.",lpszTitle, MB_OK | MB_ICONEXCLAMATION );
VolExpandParam.bQuickExpand = FALSE;
continue;
}
bSeManageVolumeNameSet = TRUE;
}
} }
if ( newVolumeSize > TC_MAX_VOLUME_SIZE ) if ( newVolumeSize > TC_MAX_VOLUME_SIZE )
src/ExpandVolume/ExpandVolume.c
+32 -8
View File
@@ -492,7 +492,7 @@ error:
Remarks: a lot of code is from TrueCrypt 'Common\Password.c' :: ChangePwd() Remarks: a lot of code is from TrueCrypt 'Common\Password.c' :: ChangePwd()
*/ */
static int ExpandVolume (HWND hwndDlg, wchar_t *lpszVolume, Password *pVolumePassword, int VolumePkcs5, int VolumePim, uint64 newHostSize, BOOL initFreeSpace) static int ExpandVolume (HWND hwndDlg, wchar_t *lpszVolume, Password *pVolumePassword, int VolumePkcs5, int VolumePim, uint64 newHostSize, BOOL initFreeSpace, BOOL bQuickExpand)
{ {
int nDosLinkCreated = 1, nStatus = ERR_OS_ERROR; int nDosLinkCreated = 1, nStatus = ERR_OS_ERROR;
wchar_t szDiskFile[TC_MAX_PATH], szCFDevice[TC_MAX_PATH]; wchar_t szDiskFile[TC_MAX_PATH], szCFDevice[TC_MAX_PATH];
@@ -750,13 +750,37 @@ static int ExpandVolume (HWND hwndDlg, wchar_t *lpszVolume, Password *pVolumePas
liNewSize.QuadPart=(LONGLONG)newHostSize; liNewSize.QuadPart=(LONGLONG)newHostSize;
// Preallocate the file if (hostSize != newHostSize)
if (!SetFilePointerEx (dev, liNewSize, NULL, FILE_BEGIN)
|| !SetEndOfFile (dev)
|| SetFilePointer (dev, 0, NULL, FILE_BEGIN) != 0)
{ {
nStatus = ERR_OS_ERROR; // Preallocate the file
goto error; if (!SetFilePointerEx (dev, liNewSize, NULL, FILE_BEGIN)
|| !SetEndOfFile (dev))
{
nStatus = ERR_OS_ERROR;
goto error;
}
if (bQuickExpand)
{
if (!SetFileValidData (dev, liNewSize.QuadPart))
{
DebugAddProgressDlgStatus(hwndDlg, L"Warning: Failed to perform Quick Expand. Continuing with standard expanding...\r\n");
}
}
if (SetFilePointer (dev, 0, NULL, FILE_BEGIN) != 0)
{
nStatus = ERR_OS_ERROR;
goto error;
}
}
else
{
if (SetFilePointer (dev, 0, NULL, FILE_BEGIN) != 0)
{
nStatus = ERR_OS_ERROR;
goto error;
}
} }
} }
@@ -1050,7 +1074,7 @@ void __cdecl volTransformThreadFunction (void *pExpandDlgParam)
HWND hwndDlg = (HWND) pParam->hwndDlg; HWND hwndDlg = (HWND) pParam->hwndDlg;
nStatus = ExpandVolume (hwndDlg, (wchar_t*)pParam->szVolumeName, pParam->pVolumePassword, nStatus = ExpandVolume (hwndDlg, (wchar_t*)pParam->szVolumeName, pParam->pVolumePassword,
pParam->VolumePkcs5, pParam->VolumePim, pParam->newSize, pParam->bInitFreeSpace ); pParam->VolumePkcs5, pParam->VolumePim, pParam->newSize, pParam->bInitFreeSpace, pParam->bQuickExpand );
if (nStatus!=ERR_SUCCESS && nStatus!=ERR_USER_ABORT) if (nStatus!=ERR_SUCCESS && nStatus!=ERR_USER_ABORT)
handleError (hwndDlg, nStatus, SRC_POS); handleError (hwndDlg, nStatus, SRC_POS);
src/ExpandVolume/ExpandVolume.h
+2
View File
@@ -40,6 +40,8 @@ typedef struct
BOOL bIsDevice; BOOL bIsDevice;
BOOL bIsLegacy; BOOL bIsLegacy;
BOOL bInitFreeSpace; BOOL bInitFreeSpace;
BOOL bQuickExpand;
BOOL bDisableQuickExpand;
Password *pVolumePassword; Password *pVolumePassword;
int VolumePkcs5; int VolumePkcs5;
int VolumePim; int VolumePim;
src/ExpandVolume/ExpandVolume.rc
+6 -5
View File
@@ -38,7 +38,8 @@ BEGIN
CONTROL "&GB",IDC_GB,"Button",BS_AUTORADIOBUTTON,248,105,38,10 CONTROL "&GB",IDC_GB,"Button",BS_AUTORADIOBUTTON,248,105,38,10
CONTROL "&TB",IDC_TB,"Button",BS_AUTORADIOBUTTON,288,105,38,10 CONTROL "&TB",IDC_TB,"Button",BS_AUTORADIOBUTTON,288,105,38,10
CONTROL "Fill new space with random data",IDC_INIT_NEWSPACE, CONTROL "Fill new space with random data",IDC_INIT_NEWSPACE,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,30,127,118,10 "Button",BS_AUTOCHECKBOX | WS_TABSTOP,30,120,276,10
CONTROL "Quick Expand",IDC_QUICKEXPAND,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_DISABLED | WS_TABSTOP,30,132,276,10
DEFPUSHBUTTON "Continue",IDOK,15,238,84,18 DEFPUSHBUTTON "Continue",IDOK,15,238,84,18
PUSHBUTTON "Cancel",IDCANCEL,277,238,84,18 PUSHBUTTON "Cancel",IDCANCEL,277,238,84,18
LTEXT "Help Text",IDC_BOX_HELP,15,165,346,58,0,WS_EX_CLIENTEDGE LTEXT "Help Text",IDC_BOX_HELP,15,165,346,58,0,WS_EX_CLIENTEDGE
@@ -192,8 +193,8 @@ IDR_MOUNT_RSRC_HEADER HEADER "resource.h"
// //
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,24,6,0 FILEVERSION 1,24,7,1
PRODUCTVERSION 1,24,6,0 PRODUCTVERSION 1,24,7,1
FILEFLAGSMASK 0x17L FILEFLAGSMASK 0x17L
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x1L FILEFLAGS 0x1L
@@ -210,11 +211,11 @@ BEGIN
BEGIN BEGIN
VALUE "CompanyName", "IDRIX" VALUE "CompanyName", "IDRIX"
VALUE "FileDescription", "VeraCrypt Expander" VALUE "FileDescription", "VeraCrypt Expander"
VALUE "FileVersion", "1.24" VALUE "FileVersion", "1.24-Hotfix1"
VALUE "LegalTrademarks", "VeraCrypt" VALUE "LegalTrademarks", "VeraCrypt"
VALUE "OriginalFilename", "VeraCryptExpander.exe" VALUE "OriginalFilename", "VeraCryptExpander.exe"
VALUE "ProductName", "VeraCrypt" VALUE "ProductName", "VeraCrypt"
VALUE "ProductVersion", "1.24" VALUE "ProductVersion", "1.24-Hotfix1"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"
src/ExpandVolume/resource.h
+2 -1
View File
@@ -71,6 +71,7 @@
#define IDC_OLD_PIM 1143 #define IDC_OLD_PIM 1143
#define IDC_OLD_PIM_HELP 1144 #define IDC_OLD_PIM_HELP 1144
#define ID_HOMEPAGE 1145 #define ID_HOMEPAGE 1145
#define IDC_QUICKEXPAND 1146
#define IDM_HELP 40001 #define IDM_HELP 40001
#define IDM_ABOUT 40002 #define IDM_ABOUT 40002
#define IDM_UNMOUNT_VOLUME 40003 #define IDM_UNMOUNT_VOLUME 40003
@@ -141,7 +142,7 @@
#define _APS_NO_MFC 1 #define _APS_NO_MFC 1
#define _APS_NEXT_RESOURCE_VALUE 120 #define _APS_NEXT_RESOURCE_VALUE 120
#define _APS_NEXT_COMMAND_VALUE 40064 #define _APS_NEXT_COMMAND_VALUE 40064
#define _APS_NEXT_CONTROL_VALUE 1146 #define _APS_NEXT_CONTROL_VALUE 1147
#define _APS_NEXT_SYMED_VALUE 101 #define _APS_NEXT_SYMED_VALUE 101
#endif #endif
#endif #endif
src/Format/Format.rc
+10 -11
View File
@@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
// //
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,24,6,0 FILEVERSION 1,24,7,1
PRODUCTVERSION 1,24,6,0 PRODUCTVERSION 1,24,7,1
FILEFLAGSMASK 0x17L FILEFLAGSMASK 0x17L
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x1L FILEFLAGS 0x1L
@@ -46,11 +46,11 @@ BEGIN
BEGIN BEGIN
VALUE "CompanyName", "IDRIX" VALUE "CompanyName", "IDRIX"
VALUE "FileDescription", "VeraCrypt Format" VALUE "FileDescription", "VeraCrypt Format"
VALUE "FileVersion", "1.24" VALUE "FileVersion", "1.24-Hotfix1"
VALUE "LegalTrademarks", "VeraCrypt" VALUE "LegalTrademarks", "VeraCrypt"
VALUE "OriginalFilename", "VeraCrypt Format.exe" VALUE "OriginalFilename", "VeraCrypt Format.exe"
VALUE "ProductName", "VeraCrypt" VALUE "ProductName", "VeraCrypt"
// VALUE "ProductVersion", "1.24" VALUE "ProductVersion", "1.24-Hotfix1"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"
@@ -278,12 +278,12 @@ IDD_SYSENC_COLLECTING_RANDOM_DATA_DLG DIALOGEX 0, 0, 276, 193
STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD
FONT 8, "MS Shell Dlg", 0, 0, 0x0 FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN BEGIN
CONTROL "Display pool content",IDC_DISPLAY_POOL_CONTENTS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,1,93,225,10 CONTROL "Display pool content",IDC_DISPLAY_POOL_CONTENTS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,93,266,10
CONTROL "",IDC_SYS_POOL_CONTENTS,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,6,17,209,63,WS_EX_TRANSPARENT CONTROL "",IDC_SYS_POOL_CONTENTS,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,33,17,209,63,WS_EX_TRANSPARENT
LTEXT "IMPORTANT: Move your mouse as randomly as possible within this window. The longer you move it, the better. This significantly increases the cryptographic strength of the encryption keys. Then click Next to continue.",IDT_COLLECTING_RANDOM_DATA_NOTE,1,107,225,63 LTEXT "IMPORTANT: Move your mouse as randomly as possible within this window. The longer you move it, the better. This significantly increases the cryptographic strength of the encryption keys. Then click Next to continue.",IDT_COLLECTING_RANDOM_DATA_NOTE,10,107,265,63
GROUPBOX "Current pool content (partial)",IDT_PARTIAL_POOL_CONTENTS,0,5,225,83 GROUPBOX "Current pool content (partial)",IDT_PARTIAL_POOL_CONTENTS,0,5,276,83
GROUPBOX "Randomness Collected From Mouse Movements",IDT_ENTROPY_BAR,0,174,225,18 GROUPBOX "Randomness Collected From Mouse Movements",IDT_ENTROPY_BAR,0,174,276,18
CONTROL "",IDC_ENTROPY_BAR,"msctls_progress32",WS_BORDER,11,183,202,6 CONTROL "",IDC_ENTROPY_BAR,"msctls_progress32",WS_BORDER,11,183,254,6
END END
IDD_SYSENC_MULTI_BOOT_MODE_PAGE_DLG DIALOGEX 0, 0, 276, 193 IDD_SYSENC_MULTI_BOOT_MODE_PAGE_DLG DIALOGEX 0, 0, 276, 193
@@ -588,7 +588,6 @@ BEGIN
IDD_SYSENC_COLLECTING_RANDOM_DATA_DLG, DIALOG IDD_SYSENC_COLLECTING_RANDOM_DATA_DLG, DIALOG
BEGIN BEGIN
RIGHTMARGIN, 267
BOTTOMMARGIN, 174 BOTTOMMARGIN, 174
HORZGUIDE, 80 HORZGUIDE, 80
HORZGUIDE, 96 HORZGUIDE, 96
src/Main/CommandLineInterface.cpp
+2
View File
@@ -321,6 +321,8 @@ namespace VeraCrypt
} }
else if (str.IsSameAs (L"exFAT", false)) else if (str.IsSameAs (L"exFAT", false))
ArgFilesystem = VolumeCreationOptions::FilesystemType::exFAT; ArgFilesystem = VolumeCreationOptions::FilesystemType::exFAT;
else if (str.IsSameAs (L"APFS", false))
ArgFilesystem = VolumeCreationOptions::FilesystemType::APFS;
#elif defined (TC_FREEBSD) || defined (TC_SOLARIS) #elif defined (TC_FREEBSD) || defined (TC_SOLARIS)
else if (str.IsSameAs (L"UFS", false)) else if (str.IsSameAs (L"UFS", false))
ArgFilesystem = VolumeCreationOptions::FilesystemType::UFS; ArgFilesystem = VolumeCreationOptions::FilesystemType::UFS;
src/Main/Forms/DeviceSelectionDialog.cpp
+33 -5
View File
@@ -48,14 +48,32 @@ namespace VeraCrypt
foreach_ref (HostDevice &device, DeviceList) foreach_ref (HostDevice &device, DeviceList)
{ {
if (device.Size == 0)
continue;
vector <wstring> fields (DeviceListCtrl->GetColumnCount()); vector <wstring> fields (DeviceListCtrl->GetColumnCount());
if (DeviceListCtrl->GetItemCount() > 0) if (DeviceListCtrl->GetItemCount() > 0)
Gui->AppendToListCtrl (DeviceListCtrl, fields); Gui->AppendToListCtrl (DeviceListCtrl, fields);
// i.e. /dev/rdisk0 might have size = 0 in case open() fails because, for example on OSX,
// SIP is enabled on the machine ;
// This does not mean that it does not have partitions that have been successfully opened
// and have a size != 0 ;
// Therefore, we do not show the device ONLY if it does not have partitions with size != 0 ;
if (device.Size == 0)
{
bool bHasNonEmptyPartition = false;
foreach_ref (HostDevice &partition, device.Partitions)
{
if (partition.Size)
{
bHasNonEmptyPartition = true;
break;
}
}
if (!bHasNonEmptyPartition)
continue;
}
#ifdef TC_WINDOWS #ifdef TC_WINDOWS
fields[ColumnDevice] = StringFormatter (L"{0} {1}:", _("Harddisk"), device.SystemNumber); fields[ColumnDevice] = StringFormatter (L"{0} {1}:", _("Harddisk"), device.SystemNumber);
fields[ColumnDrive] = device.MountPoint; fields[ColumnDrive] = device.MountPoint;
@@ -64,11 +82,20 @@ namespace VeraCrypt
fields[ColumnDevice] = wstring (device.Path) + L":"; fields[ColumnDevice] = wstring (device.Path) + L":";
fields[ColumnMountPoint] = device.MountPoint; fields[ColumnMountPoint] = device.MountPoint;
#endif #endif
fields[ColumnSize] = Gui->SizeToString (device.Size); // If the size of the device is 0, we do not show the size to avoid confusing the user ;
if (device.Size)
fields[ColumnSize] = Gui->SizeToString (device.Size);
else
fields[ColumnSize] = L"";
Gui->AppendToListCtrl (DeviceListCtrl, fields, 0, &device); Gui->AppendToListCtrl (DeviceListCtrl, fields, 0, &device);
foreach_ref (HostDevice &partition, device.Partitions) foreach_ref (HostDevice &partition, device.Partitions)
{ {
// If a partition's size is 0, there is no need to show it in the list
// since this means it is not usable (i.e on OSX, because of SIP enabled in the machine) ;
if (!partition.Size)
continue;
fields[ColumnDevice] = fields[ColumnDevice] =
#ifndef TC_WINDOWS #ifndef TC_WINDOWS
wstring (L" ") + wstring (L" ") +
@@ -113,7 +140,8 @@ namespace VeraCrypt
void DeviceSelectionDialog::OnListItemSelected (wxListEvent& event) void DeviceSelectionDialog::OnListItemSelected (wxListEvent& event)
{ {
HostDevice *device = (HostDevice *) (event.GetItem().GetData()); HostDevice *device = (HostDevice *) (event.GetItem().GetData());
if (device) // If a device's size is 0, we do not enable the 'OK' button since it is not usable
if (device && device->Size)
{ {
SelectedDevice = *device; SelectedDevice = *device;
StdButtonsOK->Enable(); StdButtonsOK->Enable();
src/Main/Forms/EncryptionOptionsWizardPage.cpp
+18
View File
@@ -24,6 +24,9 @@ namespace VeraCrypt
: EncryptionOptionsWizardPageBase (parent) : EncryptionOptionsWizardPageBase (parent)
{ {
#ifdef TC_MACOSX
EncryptionAlgorithmStaticText->Connect( wxEVT_SIZE, wxSizeEventHandler( EncryptionOptionsWizardPage::HandleOnSize ), NULL, this );
#endif
EncryptionAlgorithms = EncryptionAlgorithm::GetAvailableAlgorithms(); EncryptionAlgorithms = EncryptionAlgorithm::GetAvailableAlgorithms();
foreach (shared_ptr <EncryptionAlgorithm> ea, EncryptionAlgorithms) foreach (shared_ptr <EncryptionAlgorithm> ea, EncryptionAlgorithms)
{ {
@@ -45,6 +48,21 @@ namespace VeraCrypt
} }
#ifdef TC_MACOSX
EncryptionOptionsWizardPage::~EncryptionOptionsWizardPage()
{
EncryptionAlgorithmStaticText->Disconnect( wxEVT_SIZE, wxSizeEventHandler( EncryptionOptionsWizardPage::HandleOnSize ), NULL, this );
}
void EncryptionOptionsWizardPage::HandleOnSize( wxSizeEvent& event )
{
int width, height;
EncryptionAlgorithmStaticText->GetClientSize (&width, &height);
EncryptionAlgorithmStaticText->Wrap (width);
event.Skip();
}
#endif
shared_ptr <EncryptionAlgorithm> EncryptionOptionsWizardPage::GetEncryptionAlgorithm () const shared_ptr <EncryptionAlgorithm> EncryptionOptionsWizardPage::GetEncryptionAlgorithm () const
{ {
return Gui->GetSelectedData <EncryptionAlgorithm> (EncryptionAlgorithmChoice)->GetNew(); return Gui->GetSelectedData <EncryptionAlgorithm> (EncryptionAlgorithmChoice)->GetNew();
src/Main/Forms/EncryptionOptionsWizardPage.h
+6
View File
@@ -22,6 +22,9 @@ namespace VeraCrypt
public: public:
EncryptionOptionsWizardPage (wxPanel* parent); EncryptionOptionsWizardPage (wxPanel* parent);
#ifdef TC_MACOSX
~EncryptionOptionsWizardPage ();
#endif
shared_ptr <EncryptionAlgorithm> GetEncryptionAlgorithm () const; shared_ptr <EncryptionAlgorithm> GetEncryptionAlgorithm () const;
shared_ptr <Hash> GetHash () const; shared_ptr <Hash> GetHash () const;
bool IsValid () { return true; } bool IsValid () { return true; }
@@ -37,6 +40,9 @@ namespace VeraCrypt
void OnHashHyperlinkClick (wxHyperlinkEvent& event); void OnHashHyperlinkClick (wxHyperlinkEvent& event);
void OnTestButtonClick (wxCommandEvent& event); void OnTestButtonClick (wxCommandEvent& event);
#ifdef TC_MACOSX
void HandleOnSize( wxSizeEvent& event );
#endif
EncryptionAlgorithmList EncryptionAlgorithms; EncryptionAlgorithmList EncryptionAlgorithms;
HashList Hashes; HashList Hashes;
}; };
src/Main/Forms/Forms.cpp
+12 -9
View File
@@ -328,7 +328,7 @@ MainFrameBase::MainFrameBase( wxWindow* parent, wxWindowID id, const wxString& t
VolumeStaticBoxSizer->Add( VolumeGridBagSizer, 1, wxEXPAND|wxALL, 4 ); VolumeStaticBoxSizer->Add( VolumeGridBagSizer, 1, wxEXPAND|wxALL, 4 );
LowStaticBoxSizer->Add( VolumeStaticBoxSizer, 1, wxEXPAND, 5 ); LowStaticBoxSizer->Add( VolumeStaticBoxSizer, 1, wxEXPAND|wxALL, 5 );
LowStaticBoxSizer->Add( 0, 0, 0, 0, 5 ); LowStaticBoxSizer->Add( 0, 0, 0, 0, 5 );
@@ -344,46 +344,49 @@ MainFrameBase::MainFrameBase( wxWindow* parent, wxWindowID id, const wxString& t
VolumeButton->SetDefault(); VolumeButton->SetDefault();
VolumeButton->SetMinSize( wxSize( -1,32 ) ); VolumeButton->SetMinSize( wxSize( -1,32 ) );
sbSizer4->Add( VolumeButton, 1, wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxTOP, 2 ); sbSizer4->Add( VolumeButton, 1, wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxALL, 2 );
gSizer2->Add( sbSizer4, 1, wxEXPAND, 0 ); gSizer2->Add( sbSizer4, 1, wxEXPAND, 0 );
wxStaticBoxSizer* sbSizer41; wxStaticBoxSizer* sbSizer41;
sbSizer41 = new wxStaticBoxSizer( new wxStaticBox( MainPanel, wxID_ANY, wxEmptyString ), wxVERTICAL ); sbSizer41 = new wxStaticBoxSizer( new wxStaticBox( MainPanel, wxID_ANY, wxEmptyString ), wxVERTICAL );
sbSizer41->SetMinSize( wxSize( 139,-1 ) );
MountAllDevicesButton = new wxButton( MainPanel, wxID_ANY, _("&Auto-Mount Devices"), wxDefaultPosition, wxDefaultSize, 0 ); MountAllDevicesButton = new wxButton( MainPanel, wxID_ANY, _("&Auto-Mount Devices"), wxDefaultPosition, wxDefaultSize, 0 );
MountAllDevicesButton->SetMinSize( wxSize( -1,32 ) ); MountAllDevicesButton->SetMinSize( wxSize( -1,32 ) );
sbSizer41->Add( MountAllDevicesButton, 1, wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxTOP, 2 ); sbSizer41->Add( MountAllDevicesButton, 1, wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxALL, 2 );
gSizer2->Add( sbSizer41, 1, wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 ); gSizer2->Add( sbSizer41, 1, wxEXPAND, 5 );
wxStaticBoxSizer* sbSizer42; wxStaticBoxSizer* sbSizer42;
sbSizer42 = new wxStaticBoxSizer( new wxStaticBox( MainPanel, wxID_ANY, wxEmptyString ), wxVERTICAL ); sbSizer42 = new wxStaticBoxSizer( new wxStaticBox( MainPanel, wxID_ANY, wxEmptyString ), wxVERTICAL );
sbSizer42->SetMinSize( wxSize( 139,-1 ) );
DismountAllButton = new wxButton( MainPanel, wxID_ANY, _("Di&smount All"), wxDefaultPosition, wxDefaultSize, 0 ); DismountAllButton = new wxButton( MainPanel, wxID_ANY, _("Di&smount All"), wxDefaultPosition, wxDefaultSize, 0 );
DismountAllButton->SetMinSize( wxSize( -1,32 ) ); DismountAllButton->SetMinSize( wxSize( -1,32 ) );
sbSizer42->Add( DismountAllButton, 1, wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxTOP, 2 ); sbSizer42->Add( DismountAllButton, 1, wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxALL, 2 );
gSizer2->Add( sbSizer42, 1, wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 ); gSizer2->Add( sbSizer42, 1, wxEXPAND, 5 );
wxStaticBoxSizer* sbSizer43; wxStaticBoxSizer* sbSizer43;
sbSizer43 = new wxStaticBoxSizer( new wxStaticBox( MainPanel, wxID_ANY, wxEmptyString ), wxVERTICAL ); sbSizer43 = new wxStaticBoxSizer( new wxStaticBox( MainPanel, wxID_ANY, wxEmptyString ), wxVERTICAL );
sbSizer43->SetMinSize( wxSize( 139,-1 ) );
ExitButton = new wxButton( MainPanel, wxID_ANY, _("E&xit"), wxDefaultPosition, wxDefaultSize, 0 ); ExitButton = new wxButton( MainPanel, wxID_ANY, _("E&xit"), wxDefaultPosition, wxDefaultSize, 0 );
ExitButton->SetMinSize( wxSize( -1,32 ) ); ExitButton->SetMinSize( wxSize( -1,32 ) );
sbSizer43->Add( ExitButton, 1, wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxTOP, 2 ); sbSizer43->Add( ExitButton, 1, wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxALL, 2 );
gSizer2->Add( sbSizer43, 1, wxALIGN_RIGHT|wxEXPAND, 5 ); gSizer2->Add( sbSizer43, 1, wxEXPAND, 5 );
LowStaticBoxSizer->Add( gSizer2, 0, wxEXPAND, 5 ); LowStaticBoxSizer->Add( gSizer2, 0, wxEXPAND|wxALL, 5 );
bSizer48->Add( LowStaticBoxSizer, 0, wxEXPAND, 5 ); bSizer48->Add( LowStaticBoxSizer, 0, wxEXPAND, 5 );
src/Main/Forms/KeyfilesPanel.cpp
-2
View File
@@ -59,10 +59,8 @@ namespace VeraCrypt
SetDropTarget (new FileDropTarget (this)); SetDropTarget (new FileDropTarget (this));
KeyfilesListCtrl->SetDropTarget (new FileDropTarget (this)); KeyfilesListCtrl->SetDropTarget (new FileDropTarget (this));
#ifdef TC_MACOSX
foreach (wxWindow *c, GetChildren()) foreach (wxWindow *c, GetChildren())
c->SetDropTarget (new FileDropTarget (this)); c->SetDropTarget (new FileDropTarget (this));
#endif
UpdateButtons(); UpdateButtons();
} }
src/Main/Forms/MainFrame.cpp
-2
View File
@@ -393,10 +393,8 @@ namespace VeraCrypt
}; };
SetDropTarget (new FileDropTarget (this)); SetDropTarget (new FileDropTarget (this));
#ifdef TC_MACOSX
foreach (wxWindow *c, MainPanel->GetChildren()) foreach (wxWindow *c, MainPanel->GetChildren())
c->SetDropTarget (new FileDropTarget (this)); c->SetDropTarget (new FileDropTarget (this));
#endif
// Volume history // Volume history
VolumeHistory::ConnectComboBox (VolumePathComboBox); VolumeHistory::ConnectComboBox (VolumePathComboBox);
src/Main/Forms/TrueCrypt.fbp
+12 -12
View File
@@ -1373,7 +1373,7 @@
</object> </object>
<object class="sizeritem" expanded="1"> <object class="sizeritem" expanded="1">
<property name="border">5</property> <property name="border">5</property>
<property name="flag">wxEXPAND</property> <property name="flag">wxEXPAND|wxALL</property>
<property name="proportion">1</property> <property name="proportion">1</property>
<object class="wxStaticBoxSizer" expanded="1"> <object class="wxStaticBoxSizer" expanded="1">
<property name="id">wxID_ANY</property> <property name="id">wxID_ANY</property>
@@ -1989,7 +1989,7 @@
</object> </object>
<object class="sizeritem" expanded="1"> <object class="sizeritem" expanded="1">
<property name="border">5</property> <property name="border">5</property>
<property name="flag">wxEXPAND</property> <property name="flag">wxEXPAND|wxALL</property>
<property name="proportion">0</property> <property name="proportion">0</property>
<object class="wxGridSizer" expanded="1"> <object class="wxGridSizer" expanded="1">
<property name="cols">4</property> <property name="cols">4</property>
@@ -2013,7 +2013,7 @@
<event name="OnUpdateUI"></event> <event name="OnUpdateUI"></event>
<object class="sizeritem" expanded="1"> <object class="sizeritem" expanded="1">
<property name="border">2</property> <property name="border">2</property>
<property name="flag">wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxTOP</property> <property name="flag">wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxALL</property>
<property name="proportion">1</property> <property name="proportion">1</property>
<object class="wxButton" expanded="1"> <object class="wxButton" expanded="1">
<property name="BottomDockable">1</property> <property name="BottomDockable">1</property>
@@ -2103,19 +2103,19 @@
</object> </object>
<object class="sizeritem" expanded="1"> <object class="sizeritem" expanded="1">
<property name="border">5</property> <property name="border">5</property>
<property name="flag">wxALIGN_CENTER_HORIZONTAL|wxEXPAND</property> <property name="flag">wxEXPAND</property>
<property name="proportion">1</property> <property name="proportion">1</property>
<object class="wxStaticBoxSizer" expanded="1"> <object class="wxStaticBoxSizer" expanded="1">
<property name="id">wxID_ANY</property> <property name="id">wxID_ANY</property>
<property name="label"></property> <property name="label"></property>
<property name="minimum_size">-1,-1</property> <property name="minimum_size">139,-1</property>
<property name="name">sbSizer41</property> <property name="name">sbSizer41</property>
<property name="orient">wxVERTICAL</property> <property name="orient">wxVERTICAL</property>
<property name="permission">none</property> <property name="permission">none</property>
<event name="OnUpdateUI"></event> <event name="OnUpdateUI"></event>
<object class="sizeritem" expanded="1"> <object class="sizeritem" expanded="1">
<property name="border">2</property> <property name="border">2</property>
<property name="flag">wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxTOP</property> <property name="flag">wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxALL</property>
<property name="proportion">1</property> <property name="proportion">1</property>
<object class="wxButton" expanded="1"> <object class="wxButton" expanded="1">
<property name="BottomDockable">1</property> <property name="BottomDockable">1</property>
@@ -2205,19 +2205,19 @@
</object> </object>
<object class="sizeritem" expanded="1"> <object class="sizeritem" expanded="1">
<property name="border">5</property> <property name="border">5</property>
<property name="flag">wxALIGN_CENTER_HORIZONTAL|wxEXPAND</property> <property name="flag">wxEXPAND</property>
<property name="proportion">1</property> <property name="proportion">1</property>
<object class="wxStaticBoxSizer" expanded="1"> <object class="wxStaticBoxSizer" expanded="1">
<property name="id">wxID_ANY</property> <property name="id">wxID_ANY</property>
<property name="label"></property> <property name="label"></property>
<property name="minimum_size">-1,-1</property> <property name="minimum_size">139,-1</property>
<property name="name">sbSizer42</property> <property name="name">sbSizer42</property>
<property name="orient">wxVERTICAL</property> <property name="orient">wxVERTICAL</property>
<property name="permission">none</property> <property name="permission">none</property>
<event name="OnUpdateUI"></event> <event name="OnUpdateUI"></event>
<object class="sizeritem" expanded="1"> <object class="sizeritem" expanded="1">
<property name="border">2</property> <property name="border">2</property>
<property name="flag">wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxTOP</property> <property name="flag">wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxALL</property>
<property name="proportion">1</property> <property name="proportion">1</property>
<object class="wxButton" expanded="1"> <object class="wxButton" expanded="1">
<property name="BottomDockable">1</property> <property name="BottomDockable">1</property>
@@ -2307,19 +2307,19 @@
</object> </object>
<object class="sizeritem" expanded="1"> <object class="sizeritem" expanded="1">
<property name="border">5</property> <property name="border">5</property>
<property name="flag">wxALIGN_RIGHT|wxEXPAND</property> <property name="flag">wxEXPAND</property>
<property name="proportion">1</property> <property name="proportion">1</property>
<object class="wxStaticBoxSizer" expanded="1"> <object class="wxStaticBoxSizer" expanded="1">
<property name="id">wxID_ANY</property> <property name="id">wxID_ANY</property>
<property name="label"></property> <property name="label"></property>
<property name="minimum_size">-1,-1</property> <property name="minimum_size">139,-1</property>
<property name="name">sbSizer43</property> <property name="name">sbSizer43</property>
<property name="orient">wxVERTICAL</property> <property name="orient">wxVERTICAL</property>
<property name="permission">none</property> <property name="permission">none</property>
<event name="OnUpdateUI"></event> <event name="OnUpdateUI"></event>
<object class="sizeritem" expanded="1"> <object class="sizeritem" expanded="1">
<property name="border">2</property> <property name="border">2</property>
<property name="flag">wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxTOP</property> <property name="flag">wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxALL</property>
<property name="proportion">1</property> <property name="proportion">1</property>
<object class="wxButton" expanded="1"> <object class="wxButton" expanded="1">
<property name="BottomDockable">1</property> <property name="BottomDockable">1</property>
src/Main/Forms/VolumeCreationWizard.cpp
+1
View File
@@ -475,6 +475,7 @@ namespace VeraCrypt
#elif defined (TC_MACOSX) #elif defined (TC_MACOSX)
case VolumeCreationOptions::FilesystemType::MacOsExt: fsFormatter = "newfs_hfs"; break; case VolumeCreationOptions::FilesystemType::MacOsExt: fsFormatter = "newfs_hfs"; break;
case VolumeCreationOptions::FilesystemType::exFAT: fsFormatter = "newfs_exfat"; break; case VolumeCreationOptions::FilesystemType::exFAT: fsFormatter = "newfs_exfat"; break;
case VolumeCreationOptions::FilesystemType::APFS: fsFormatter = "newfs_apfs"; break;
#elif defined (TC_FREEBSD) || defined (TC_SOLARIS) #elif defined (TC_FREEBSD) || defined (TC_SOLARIS)
case VolumeCreationOptions::FilesystemType::UFS: fsFormatter = "newfs" ; break; case VolumeCreationOptions::FilesystemType::UFS: fsFormatter = "newfs" ; break;
#endif #endif
src/Main/Forms/VolumeFormatOptionsWizardPage.cpp
+4
View File
@@ -13,6 +13,7 @@
#include "System.h" #include "System.h"
#include "Main/GraphicUserInterface.h" #include "Main/GraphicUserInterface.h"
#include "VolumeFormatOptionsWizardPage.h" #include "VolumeFormatOptionsWizardPage.h"
#include <wx/platinfo.h>
namespace VeraCrypt namespace VeraCrypt
{ {
@@ -40,6 +41,8 @@ namespace VeraCrypt
#elif defined (TC_MACOSX) #elif defined (TC_MACOSX)
FilesystemTypeChoice->Append (L"Mac OS Extended", (void *) VolumeCreationOptions::FilesystemType::MacOsExt); FilesystemTypeChoice->Append (L"Mac OS Extended", (void *) VolumeCreationOptions::FilesystemType::MacOsExt);
FilesystemTypeChoice->Append (L"exFAT", (void *) VolumeCreationOptions::FilesystemType::exFAT); FilesystemTypeChoice->Append (L"exFAT", (void *) VolumeCreationOptions::FilesystemType::exFAT);
if (wxPlatformInfo::Get().CheckOSVersion (10, 13))
FilesystemTypeChoice->Append (L"APFS", (void *) VolumeCreationOptions::FilesystemType::APFS);
#elif defined (TC_FREEBSD) || defined (TC_SOLARIS) #elif defined (TC_FREEBSD) || defined (TC_SOLARIS)
FilesystemTypeChoice->Append (L"UFS", (void *) VolumeCreationOptions::FilesystemType::UFS); FilesystemTypeChoice->Append (L"UFS", (void *) VolumeCreationOptions::FilesystemType::UFS);
#endif #endif
@@ -81,6 +84,7 @@ namespace VeraCrypt
case VolumeCreationOptions::FilesystemType::Ext3: FilesystemTypeChoice->SetStringSelection (L"Linux Ext3"); break; case VolumeCreationOptions::FilesystemType::Ext3: FilesystemTypeChoice->SetStringSelection (L"Linux Ext3"); break;
case VolumeCreationOptions::FilesystemType::Ext4: FilesystemTypeChoice->SetStringSelection (L"Linux Ext4"); break; case VolumeCreationOptions::FilesystemType::Ext4: FilesystemTypeChoice->SetStringSelection (L"Linux Ext4"); break;
case VolumeCreationOptions::FilesystemType::MacOsExt: FilesystemTypeChoice->SetStringSelection (L"Mac OS Extended"); break; case VolumeCreationOptions::FilesystemType::MacOsExt: FilesystemTypeChoice->SetStringSelection (L"Mac OS Extended"); break;
case VolumeCreationOptions::FilesystemType::APFS: FilesystemTypeChoice->SetStringSelection (L"APFS"); break;
case VolumeCreationOptions::FilesystemType::UFS: FilesystemTypeChoice->SetStringSelection (L"UFS"); break; case VolumeCreationOptions::FilesystemType::UFS: FilesystemTypeChoice->SetStringSelection (L"UFS"); break;
default: default:
src/Main/Forms/VolumePasswordPanel.cpp
-2
View File
@@ -159,10 +159,8 @@ namespace VeraCrypt
if (enableKeyfiles) if (enableKeyfiles)
{ {
SetDropTarget (new FileDropTarget (this)); SetDropTarget (new FileDropTarget (this));
#ifdef TC_MACOSX
foreach (wxWindow *c, GetChildren()) foreach (wxWindow *c, GetChildren())
c->SetDropTarget (new FileDropTarget (this)); c->SetDropTarget (new FileDropTarget (this));
#endif
} }
Layout(); Layout();
src/Main/Main.make
+14
View File
@@ -210,16 +210,26 @@ endif
cp $(BASE_DIR)/../doc/html/* $(APPNAME).app/Contents/Resources/doc/HTML cp $(BASE_DIR)/../doc/html/* $(APPNAME).app/Contents/Resources/doc/HTML
echo -n APPLTRUE >$(APPNAME).app/Contents/PkgInfo echo -n APPLTRUE >$(APPNAME).app/Contents/PkgInfo
ifdef VC_LEGACY_BUILD
sed -e 's/_VERSION_/$(patsubst %a,%.1,$(patsubst %b,%.2,$(TC_VERSION)))/' ../Build/Resources/MacOSX/Info.plist.legacy.xml >$(APPNAME).app/Contents/Info.plist
else
sed -e 's/_VERSION_/$(patsubst %a,%.1,$(patsubst %b,%.2,$(TC_VERSION)))/' ../Build/Resources/MacOSX/Info.plist.xml >$(APPNAME).app/Contents/Info.plist sed -e 's/_VERSION_/$(patsubst %a,%.1,$(patsubst %b,%.2,$(TC_VERSION)))/' ../Build/Resources/MacOSX/Info.plist.xml >$(APPNAME).app/Contents/Info.plist
endif
codesign -s "Developer ID Application: IDRIX (Z933746L2S)" --timestamp $(APPNAME).app codesign -s "Developer ID Application: IDRIX (Z933746L2S)" --timestamp $(APPNAME).app
install: prepare install: prepare
cp -R $(APPNAME).app /Applications/. cp -R $(APPNAME).app /Applications/.
package: prepare package: prepare
ifdef VC_LEGACY_BUILD
/usr/local/bin/packagesbuild $(BASE_DIR)/Setup/MacOSX/veracrypt_Legacy.pkgproj
productsign --sign "Developer ID Installer: IDRIX (Z933746L2S)" --timestamp "$(BASE_DIR)/Setup/MacOSX/VeraCrypt Legacy $(TC_VERSION).pkg" $(BASE_DIR)/Setup/MacOSX/VeraCrypt_$(TC_VERSION).pkg
rm -f $(APPNAME)_Legacy_$(TC_VERSION).dmg
else
/usr/local/bin/packagesbuild $(BASE_DIR)/Setup/MacOSX/veracrypt.pkgproj /usr/local/bin/packagesbuild $(BASE_DIR)/Setup/MacOSX/veracrypt.pkgproj
productsign --sign "Developer ID Installer: IDRIX (Z933746L2S)" --timestamp "$(BASE_DIR)/Setup/MacOSX/VeraCrypt $(TC_VERSION).pkg" $(BASE_DIR)/Setup/MacOSX/VeraCrypt_$(TC_VERSION).pkg productsign --sign "Developer ID Installer: IDRIX (Z933746L2S)" --timestamp "$(BASE_DIR)/Setup/MacOSX/VeraCrypt $(TC_VERSION).pkg" $(BASE_DIR)/Setup/MacOSX/VeraCrypt_$(TC_VERSION).pkg
rm -f $(APPNAME)_$(TC_VERSION).dmg rm -f $(APPNAME)_$(TC_VERSION).dmg
endif
rm -f "$(BASE_DIR)/Setup/MacOSX/template.dmg" rm -f "$(BASE_DIR)/Setup/MacOSX/template.dmg"
rm -fr "$(BASE_DIR)/Setup/MacOSX/VeraCrypt_dmg" rm -fr "$(BASE_DIR)/Setup/MacOSX/VeraCrypt_dmg"
mkdir -p "$(BASE_DIR)/Setup/MacOSX/VeraCrypt_dmg" mkdir -p "$(BASE_DIR)/Setup/MacOSX/VeraCrypt_dmg"
@@ -227,7 +237,11 @@ package: prepare
hdiutil attach "$(BASE_DIR)/Setup/MacOSX/template.dmg" -noautoopen -quiet -mountpoint "$(BASE_DIR)/Setup/MacOSX/VeraCrypt_dmg" hdiutil attach "$(BASE_DIR)/Setup/MacOSX/template.dmg" -noautoopen -quiet -mountpoint "$(BASE_DIR)/Setup/MacOSX/VeraCrypt_dmg"
cp "$(BASE_DIR)/Setup/MacOSX/VeraCrypt_$(TC_VERSION).pkg" "$(BASE_DIR)/Setup/MacOSX/VeraCrypt_dmg/VeraCrypt_Installer.pkg" cp "$(BASE_DIR)/Setup/MacOSX/VeraCrypt_$(TC_VERSION).pkg" "$(BASE_DIR)/Setup/MacOSX/VeraCrypt_dmg/VeraCrypt_Installer.pkg"
hdiutil detach "$(BASE_DIR)/Setup/MacOSX/VeraCrypt_dmg" -quiet -force hdiutil detach "$(BASE_DIR)/Setup/MacOSX/VeraCrypt_dmg" -quiet -force
ifdef VC_LEGACY_BUILD
hdiutil convert "$(BASE_DIR)/Setup/MacOSX/template.dmg" -quiet -format UDZO -imagekey zlib-level=9 -o $(APPNAME)_Legacy_$(TC_VERSION).dmg
else
hdiutil convert "$(BASE_DIR)/Setup/MacOSX/template.dmg" -quiet -format UDZO -imagekey zlib-level=9 -o $(APPNAME)_$(TC_VERSION).dmg hdiutil convert "$(BASE_DIR)/Setup/MacOSX/template.dmg" -quiet -format UDZO -imagekey zlib-level=9 -o $(APPNAME)_$(TC_VERSION).dmg
endif
rm -f "$(BASE_DIR)/Setup/MacOSX/template.dmg" rm -f "$(BASE_DIR)/Setup/MacOSX/template.dmg"
rm -fr "$(BASE_DIR)/Setup/MacOSX/VeraCrypt_dmg" rm -fr "$(BASE_DIR)/Setup/MacOSX/VeraCrypt_dmg"
endif endif
src/Main/TextUserInterface.cpp
+6
View File
@@ -20,6 +20,7 @@
#include "Platform/Unix/Process.h" #include "Platform/Unix/Process.h"
#endif #endif
#include <wx/platinfo.h>
#include "Common/SecurityToken.h" #include "Common/SecurityToken.h"
#include "Core/RandomNumberGenerator.h" #include "Core/RandomNumberGenerator.h"
#include "Application.h" #include "Application.h"
@@ -785,6 +786,10 @@ namespace VeraCrypt
#elif defined (TC_MACOSX) #elif defined (TC_MACOSX)
ShowInfo (L" 3) Mac OS Extended"); filesystems.push_back (VolumeCreationOptions::FilesystemType::MacOsExt); ShowInfo (L" 3) Mac OS Extended"); filesystems.push_back (VolumeCreationOptions::FilesystemType::MacOsExt);
ShowInfo (L" 4) exFAT"); filesystems.push_back (VolumeCreationOptions::FilesystemType::exFAT); ShowInfo (L" 4) exFAT"); filesystems.push_back (VolumeCreationOptions::FilesystemType::exFAT);
if (wxPlatformInfo::Get().CheckOSVersion (10, 13))
{
ShowInfo (L" 5) APFS"); filesystems.push_back (VolumeCreationOptions::FilesystemType::APFS);
}
#elif defined (TC_FREEBSD) || defined (TC_SOLARIS) #elif defined (TC_FREEBSD) || defined (TC_SOLARIS)
ShowInfo (L" 3) UFS"); filesystems.push_back (VolumeCreationOptions::FilesystemType::UFS); ShowInfo (L" 3) UFS"); filesystems.push_back (VolumeCreationOptions::FilesystemType::UFS);
#endif #endif
@@ -881,6 +886,7 @@ namespace VeraCrypt
#elif defined (TC_MACOSX) #elif defined (TC_MACOSX)
case VolumeCreationOptions::FilesystemType::MacOsExt: fsFormatter = "newfs_hfs"; break; case VolumeCreationOptions::FilesystemType::MacOsExt: fsFormatter = "newfs_hfs"; break;
case VolumeCreationOptions::FilesystemType::exFAT: fsFormatter = "newfs_exfat"; break; case VolumeCreationOptions::FilesystemType::exFAT: fsFormatter = "newfs_exfat"; break;
case VolumeCreationOptions::FilesystemType::APFS: fsFormatter = "newfs_apfs"; break;
#elif defined (TC_FREEBSD) || defined (TC_SOLARIS) #elif defined (TC_FREEBSD) || defined (TC_SOLARIS)
case VolumeCreationOptions::FilesystemType::UFS: fsFormatter = "newfs" ; break; case VolumeCreationOptions::FilesystemType::UFS: fsFormatter = "newfs" ; break;
#endif #endif
src/Makefile
+39 -14
View File
@@ -91,6 +91,9 @@ ifeq "$(origin WXSTATIC)" "command line"
export VC_WX_STATIC := 1 export VC_WX_STATIC := 1
WX_CONFIG = $(WX_BUILD_DIR)/wx-config WX_CONFIG = $(WX_BUILD_DIR)/wx-config
WX_CONFIG_ARGS += --static WX_CONFIG_ARGS += --static
ifneq "$(WXSTATIC)" "FULL"
export VC_WX_MINIMAL := 1
endif
endif endif
@@ -225,6 +228,10 @@ ifeq "$(shell uname -s)" "Linux"
WXCONFIG_CXXFLAGS += -mno-sse2 WXCONFIG_CXXFLAGS += -mno-sse2
endif endif
ifeq "$(origin WITHGTK3)" "command line"
WX_CONFIGURE_FLAGS += --with-gtk=3
endif
endif endif
#------ Mac OS X configuration ------ #------ Mac OS X configuration ------
@@ -235,19 +242,25 @@ ifeq "$(shell uname -s)" "Darwin"
APPNAME := VeraCrypt APPNAME := VeraCrypt
export VC_OSX_TARGET ?= 10.7 export VC_OSX_TARGET ?= 10.7
export VC_OSX_SDK ?= $(VC_OSX_TARGET)
#check to see if XCode 3 path exists.Otherwise, use XCode 4 path #check to see if XCode 3 path exists.Otherwise, use XCode 4 path
VC_OSX_SDK := /Developer/SDKs/MacOSX$(VC_OSX_TARGET).sdk VC_OSX_SDK_PATH := /Developer/SDKs/MacOSX$(VC_OSX_SDK).sdk
ifeq ($(wildcard $(VC_OSX_SDK)/SDKSettings.plist),) ifeq ($(wildcard $(VC_OSX_SDK_PATH)/SDKSettings.plist),)
VC_OSX_SDK := /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX$(VC_OSX_TARGET).sdk VC_OSX_SDK_PATH := /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX$(VC_OSX_SDK).sdk
endif
#----- Legacy build if OSX <= 10.8: we build both 32-bit and 64-bit ----
ifneq (,$(filter 10.6 10.7 10.8,$(VC_OSX_TARGET)))
export VC_LEGACY_BUILD := 1
endif endif
CC := gcc CC := gcc
CXX := g++ CXX := g++
C_CXX_FLAGS += -DTC_UNIX -DTC_BSD -DTC_MACOSX -mmacosx-version-min=$(VC_OSX_TARGET) -isysroot $(VC_OSX_SDK) C_CXX_FLAGS += -DTC_UNIX -DTC_BSD -DTC_MACOSX -mmacosx-version-min=$(VC_OSX_TARGET) -isysroot $(VC_OSX_SDK_PATH)
LFLAGS += -mmacosx-version-min=$(VC_OSX_TARGET) -Wl,-syslibroot $(VC_OSX_SDK) LFLAGS += -mmacosx-version-min=$(VC_OSX_TARGET) -Wl,-syslibroot $(VC_OSX_SDK_PATH)
WX_CONFIGURE_FLAGS += --with-macosx-version-min=$(VC_OSX_TARGET) --with-macosx-sdk=$(VC_OSX_SDK) WX_CONFIGURE_FLAGS += --with-macosx-version-min=$(VC_OSX_TARGET) --with-macosx-sdk=$(VC_OSX_SDK_PATH)
ifeq "$(CPU_ARCH)" "x64" ifeq "$(CPU_ARCH)" "x64"
CPU_ARCH = x86 CPU_ARCH = x86
@@ -277,10 +290,18 @@ ifeq "$(shell uname -s)" "Darwin"
S := $(C_CXX_FLAGS) S := $(C_CXX_FLAGS)
C_CXX_FLAGS = $(subst -MMD,,$(S)) C_CXX_FLAGS = $(subst -MMD,,$(S))
C_CXX_FLAGS += -gfull -arch i386 -arch x86_64 C_CXX_FLAGS += -gfull -arch x86_64
LFLAGS += -Wl,-dead_strip -arch i386 -arch x86_64 LFLAGS += -Wl,-dead_strip -arch x86_64
#----- Legacy build: we build both 32-bit and 64-bit ----
ifdef VC_LEGACY_BUILD
C_CXX_FLAGS += -arch i386
LFLAGS += -arch i386
WX_CONFIGURE_FLAGS += --enable-universal_binary=i386,x86_64
else
WX_CONFIGURE_FLAGS += --disable-universal_binary
endif
WX_CONFIGURE_FLAGS += --enable-universal_binary=i386,x86_64
WXCONFIG_CFLAGS += -gfull WXCONFIG_CFLAGS += -gfull
WXCONFIG_CXXFLAGS += -gfull WXCONFIG_CXXFLAGS += -gfull
@@ -359,8 +380,10 @@ CFLAGS := $(C_CXX_FLAGS) $(CFLAGS) $(TC_EXTRA_CFLAGS)
CXXFLAGS := $(C_CXX_FLAGS) $(CXXFLAGS) $(TC_EXTRA_CXXFLAGS) CXXFLAGS := $(C_CXX_FLAGS) $(CXXFLAGS) $(TC_EXTRA_CXXFLAGS)
LFLAGS := $(LFLAGS) $(TC_EXTRA_LFLAGS) LFLAGS := $(LFLAGS) $(TC_EXTRA_LFLAGS)
WX_CONFIGURE_FLAGS += --enable-unicode -disable-shared --disable-dependency-tracking --disable-compat26 --enable-exceptions --enable-std_string --enable-dataobj --enable-mimetype \ WX_CONFIGURE_FLAGS += --enable-unicode -disable-shared --disable-dependency-tracking --enable-exceptions --enable-std_string --enable-dataobj --enable-mimetype
--disable-protocol --disable-protocols --disable-url --disable-ipc --disable-sockets --disable-fs_inet --disable-ole --disable-docview --disable-clipboard \
ifdef VC_WX_MINIMAL
WX_CONFIGURE_FLAGS += --disable-protocol --disable-protocols --disable-url --disable-ipc --disable-sockets --disable-fs_inet --disable-ole --disable-docview --disable-clipboard \
--disable-help --disable-html --disable-mshtmlhelp --disable-htmlhelp --disable-mdi --disable-metafile --disable-webkit --disable-webview \ --disable-help --disable-html --disable-mshtmlhelp --disable-htmlhelp --disable-mdi --disable-metafile --disable-webkit --disable-webview \
--disable-xrc --disable-aui --disable-postscript --disable-printarch \ --disable-xrc --disable-aui --disable-postscript --disable-printarch \
--disable-arcstream --disable-fs_archive --disable-fs_zip --disable-tarstream --disable-zipstream \ --disable-arcstream --disable-fs_archive --disable-fs_zip --disable-tarstream --disable-zipstream \
@@ -379,13 +402,15 @@ WX_CONFIGURE_FLAGS += --enable-unicode -disable-shared --disable-dependency-trac
ifeq "$(PLATFORM)" "Linux" ifeq "$(PLATFORM)" "Linux"
WX_CONFIGURE_FLAGS += --disable-tooltips WX_CONFIGURE_FLAGS += --disable-tooltips
ifeq "$(origin WITHGTK3)" "command line" ifneq "$(origin WITHGTK3)" "command line"
WX_CONFIGURE_FLAGS += --with-gtk=3 WX_CONFIGURE_FLAGS += --disable-graphics_ctx
endif
else else
WX_CONFIGURE_FLAGS += --disable-graphics_ctx WX_CONFIGURE_FLAGS += --disable-graphics_ctx
endif endif
endif endif
#------ Project build ------ #------ Project build ------
PROJ_DIRS := Platform Volume Driver/Fuse Core Main PROJ_DIRS := Platform Volume Driver/Fuse Core Main
@@ -428,4 +453,4 @@ endif
cd "$(WX_BUILD_DIR)" && "$(WX_ROOT)/configure" $(WX_CONFIGURE_FLAGS) >/dev/null cd "$(WX_BUILD_DIR)" && "$(WX_ROOT)/configure" $(WX_CONFIGURE_FLAGS) >/dev/null
@echo Building wxWidgets library... @echo Building wxWidgets library...
cd "$(WX_BUILD_DIR)" && $(MAKE) cd "$(WX_BUILD_DIR)" && $(MAKE) -j 4
src/Mount/Favorites.cpp
+7
View File
@@ -260,6 +260,13 @@ namespace VeraCrypt
if (reqConfig != (ReadDriverConfigurationFlags() & TC_DRIVER_CONFIG_CACHE_BOOT_PASSWORD_FOR_SYS_FAVORITES)) if (reqConfig != (ReadDriverConfigurationFlags() & TC_DRIVER_CONFIG_CACHE_BOOT_PASSWORD_FOR_SYS_FAVORITES))
BootEncObj.SetDriverConfigurationFlag (TC_DRIVER_CONFIG_CACHE_BOOT_PASSWORD_FOR_SYS_FAVORITES, reqConfig ? true : false); BootEncObj.SetDriverConfigurationFlag (TC_DRIVER_CONFIG_CACHE_BOOT_PASSWORD_FOR_SYS_FAVORITES, reqConfig ? true : false);
if (!BootEncObj.IsSystemFavoritesServiceRunning())
{
// The system favorites service should be always running
// If it is stopped for some reason, we reconfigure it
BootEncObj.RegisterSystemFavoritesService (TRUE);
}
SetDriverConfigurationFlag (TC_DRIVER_CONFIG_DISABLE_NONADMIN_SYS_FAVORITES_ACCESS, IsDlgButtonChecked (hwndDlg, IDC_FAVORITE_DISABLE_HOTKEY)); SetDriverConfigurationFlag (TC_DRIVER_CONFIG_DISABLE_NONADMIN_SYS_FAVORITES_ACCESS, IsDlgButtonChecked (hwndDlg, IDC_FAVORITE_DISABLE_HOTKEY));
} }
catch (Exception &e) catch (Exception &e)
src/Mount/Mount.c
+73 -40
View File
@@ -9422,25 +9422,24 @@ static DWORD WINAPI SystemFavoritesServiceCtrlHandler ( DWORD dwControl,
case SERVICE_CONTROL_STOP: case SERVICE_CONTROL_STOP:
SystemFavoritesServiceSetStatus (SERVICE_STOP_PENDING); SystemFavoritesServiceSetStatus (SERVICE_STOP_PENDING);
if (bSystemIsGPT) if (!(BootEncObj->ReadServiceConfigurationFlags () & VC_SYSTEM_FAVORITES_SERVICE_CONFIG_DONT_UPDATE_LOADER))
{ {
uint32 serviceFlags = BootEncObj->ReadServiceConfigurationFlags (); try
if (!(serviceFlags & VC_SYSTEM_FAVORITES_SERVICE_CONFIG_DONT_UPDATE_LOADER))
{ {
try BootEncryption::UpdateSetupConfigFile (true);
{ if (!BootEncStatus.HiddenSystem)
BootEncryption::UpdateSetupConfigFile (true);
if (!BootEncStatus.HiddenSystem)
{
// re-install our bootloader again in case the update process has removed it.
BootEncryption bootEnc (NULL, true);
bootEnc.InstallBootLoader (true);
}
}
catch (...)
{ {
// re-install our bootloader again in case the update process has removed it.
bool bForceSetNextBoot = false;
if (BootEncObj->ReadServiceConfigurationFlags () & VC_SYSTEM_FAVORITES_SERVICE_CONFIG_FORCE_SET_BOOTNEXT)
bForceSetNextBoot = true;
BootEncryption bootEnc (NULL, true, bForceSetNextBoot);
bootEnc.InstallBootLoader (true);
} }
} }
catch (...)
{
}
} }
/* clear VC_DRIVER_CONFIG_CLEAR_KEYS_ON_NEW_DEVICE_INSERTION flag */ /* clear VC_DRIVER_CONFIG_CLEAR_KEYS_ON_NEW_DEVICE_INSERTION flag */
@@ -11600,6 +11599,8 @@ static BOOL CALLBACK BootLoaderPreferencesDlgProc (HWND hwndDlg, UINT msg, WPARA
{ {
WORD lw = LOWORD (wParam); WORD lw = LOWORD (wParam);
static std::string platforminfo; static std::string platforminfo;
static byte currentUserConfig;
static string currentCustomUserMessage;
switch (msg) switch (msg)
{ {
@@ -11626,6 +11627,14 @@ static BOOL CALLBACK BootLoaderPreferencesDlgProc (HWND hwndDlg, UINT msg, WPARA
BOOL bClearKeysEnabled = (driverConfig & VC_DRIVER_CONFIG_CLEAR_KEYS_ON_NEW_DEVICE_INSERTION)? TRUE : FALSE; BOOL bClearKeysEnabled = (driverConfig & VC_DRIVER_CONFIG_CLEAR_KEYS_ON_NEW_DEVICE_INSERTION)? TRUE : FALSE;
BOOL bIsHiddenOS = IsHiddenOSRunning (); BOOL bIsHiddenOS = IsHiddenOSRunning ();
if (bClearKeysEnabled)
{
// the clear keys option works only if the service is running
if (!BootEncObj->IsSystemFavoritesServiceRunning())
bClearKeysEnabled = false;
}
if (!BootEncObj->ReadBootSectorConfig (nullptr, 0, &userConfig, &customUserMessage, &bootLoaderVersion)) if (!BootEncObj->ReadBootSectorConfig (nullptr, 0, &userConfig, &customUserMessage, &bootLoaderVersion))
{ {
// operations canceled // operations canceled
@@ -11633,6 +11642,10 @@ static BOOL CALLBACK BootLoaderPreferencesDlgProc (HWND hwndDlg, UINT msg, WPARA
return 1; return 1;
} }
// we store current configuration in order to be able to detect if user changed it or not after clicking OK
currentUserConfig = userConfig;
currentCustomUserMessage = customUserMessage;
if (bootLoaderVersion != VERSION_NUM) if (bootLoaderVersion != VERSION_NUM)
Warning ("BOOT_LOADER_VERSION_INCORRECT_PREFERENCES", hwndDlg); Warning ("BOOT_LOADER_VERSION_INCORRECT_PREFERENCES", hwndDlg);
@@ -11702,11 +11715,16 @@ static BOOL CALLBACK BootLoaderPreferencesDlgProc (HWND hwndDlg, UINT msg, WPARA
{ {
try try
{ {
std::string dcsprop = ReadESPFile (L"\\EFI\\VeraCrypt\\DcsProp", true); std::string currentDcsprop = ReadESPFile (L"\\EFI\\VeraCrypt\\DcsProp", true);
std::string dcsprop = currentDcsprop;
while (TextEditDialogBox(FALSE, hwndDlg, GetString ("BOOT_LOADER_CONFIGURATION_FILE"), dcsprop) == IDOK) while (TextEditDialogBox(FALSE, hwndDlg, GetString ("BOOT_LOADER_CONFIGURATION_FILE"), dcsprop) == IDOK)
{ {
if (validateDcsPropXml (dcsprop.c_str())) if (0 == strcmp(dcsprop.c_str(), currentDcsprop.c_str()))
{
break;
}
else if (validateDcsPropXml (dcsprop.c_str()))
{ {
WriteESPFile (L"\\EFI\\VeraCrypt\\DcsProp", (LPBYTE) dcsprop.c_str(), (DWORD) dcsprop.size(), true); WriteESPFile (L"\\EFI\\VeraCrypt\\DcsProp", (LPBYTE) dcsprop.c_str(), (DWORD) dcsprop.size(), true);
break; break;
@@ -11746,17 +11764,7 @@ static BOOL CALLBACK BootLoaderPreferencesDlgProc (HWND hwndDlg, UINT msg, WPARA
if (!bSystemIsGPT) if (!bSystemIsGPT)
GetDlgItemTextA (hwndDlg, IDC_CUSTOM_BOOT_LOADER_MESSAGE, customUserMessage, sizeof (customUserMessage)); GetDlgItemTextA (hwndDlg, IDC_CUSTOM_BOOT_LOADER_MESSAGE, customUserMessage, sizeof (customUserMessage));
byte userConfig; byte userConfig = currentUserConfig;
try
{
if (!BootEncObj->ReadBootSectorConfig (nullptr, 0, &userConfig))
return 1;
}
catch (Exception &e)
{
e.Show (hwndDlg);
return 1;
}
if (IsDlgButtonChecked (hwndDlg, IDC_DISABLE_BOOT_LOADER_PIM_PROMPT)) if (IsDlgButtonChecked (hwndDlg, IDC_DISABLE_BOOT_LOADER_PIM_PROMPT))
userConfig |= TC_BOOT_USER_CFG_FLAG_DISABLE_PIM; userConfig |= TC_BOOT_USER_CFG_FLAG_DISABLE_PIM;
@@ -11765,22 +11773,22 @@ static BOOL CALLBACK BootLoaderPreferencesDlgProc (HWND hwndDlg, UINT msg, WPARA
if (bSystemIsGPT) if (bSystemIsGPT)
{ {
if (IsDlgButtonChecked (hwndDlg, IDC_DISABLE_BOOT_LOADER_HASH_PROMPT)) if (IsDlgButtonChecked (hwndDlg, IDC_DISABLE_BOOT_LOADER_HASH_PROMPT))
userConfig |= TC_BOOT_USER_CFG_FLAG_STORE_HASH; userConfig |= TC_BOOT_USER_CFG_FLAG_STORE_HASH;
else else
userConfig &= ~TC_BOOT_USER_CFG_FLAG_STORE_HASH; userConfig &= ~TC_BOOT_USER_CFG_FLAG_STORE_HASH;
} }
else else
{ {
if (IsDlgButtonChecked (hwndDlg, IDC_DISABLE_BOOT_LOADER_OUTPUT)) if (IsDlgButtonChecked (hwndDlg, IDC_DISABLE_BOOT_LOADER_OUTPUT))
userConfig |= TC_BOOT_USER_CFG_FLAG_SILENT_MODE; userConfig |= TC_BOOT_USER_CFG_FLAG_SILENT_MODE;
else else
userConfig &= ~TC_BOOT_USER_CFG_FLAG_SILENT_MODE; userConfig &= ~TC_BOOT_USER_CFG_FLAG_SILENT_MODE;
if (!IsDlgButtonChecked (hwndDlg, IDC_ALLOW_ESC_PBA_BYPASS)) if (!IsDlgButtonChecked (hwndDlg, IDC_ALLOW_ESC_PBA_BYPASS))
userConfig |= TC_BOOT_USER_CFG_FLAG_DISABLE_ESC; userConfig |= TC_BOOT_USER_CFG_FLAG_DISABLE_ESC;
else else
userConfig &= ~TC_BOOT_USER_CFG_FLAG_DISABLE_ESC; userConfig &= ~TC_BOOT_USER_CFG_FLAG_DISABLE_ESC;
} }
try try
@@ -11789,7 +11797,21 @@ static BOOL CALLBACK BootLoaderPreferencesDlgProc (HWND hwndDlg, UINT msg, WPARA
BOOL bPimCacheEnabled = IsDlgButtonChecked (hwndDlg, IDC_BOOT_LOADER_CACHE_PIM); BOOL bPimCacheEnabled = IsDlgButtonChecked (hwndDlg, IDC_BOOT_LOADER_CACHE_PIM);
BOOL bBlockSysEncTrimEnabled = IsDlgButtonChecked (hwndDlg, IDC_BLOCK_SYSENC_TRIM); BOOL bBlockSysEncTrimEnabled = IsDlgButtonChecked (hwndDlg, IDC_BLOCK_SYSENC_TRIM);
BOOL bClearKeysEnabled = IsDlgButtonChecked (hwndDlg, IDC_CLEAR_KEYS_ON_NEW_DEVICE_INSERTION); BOOL bClearKeysEnabled = IsDlgButtonChecked (hwndDlg, IDC_CLEAR_KEYS_ON_NEW_DEVICE_INSERTION);
BootEncObj->WriteBootSectorUserConfig (userConfig, customUserMessage, prop.volumePim, prop.pkcs5);
if (bClearKeysEnabled && !BootEncObj->IsSystemFavoritesServiceRunning())
{
// the system favorite service service should be running
// if it is not the case, report a failure and quit
std::string techInfo = SRC_POS;
techInfo += "\nIsSystemFavoritesServiceRunning = False.";
ReportUnexpectedState (techInfo.c_str());
return 1;
}
// only write boot configuration if something changed
if ((userConfig != currentUserConfig) || (!bSystemIsGPT && (customUserMessage != currentCustomUserMessage)))
BootEncObj->WriteBootSectorUserConfig (userConfig, customUserMessage, prop.volumePim, prop.pkcs5);
SetDriverConfigurationFlag (TC_DRIVER_CONFIG_CACHE_BOOT_PASSWORD, bPasswordCacheEnabled); SetDriverConfigurationFlag (TC_DRIVER_CONFIG_CACHE_BOOT_PASSWORD, bPasswordCacheEnabled);
SetDriverConfigurationFlag (TC_DRIVER_CONFIG_CACHE_BOOT_PIM, (bPasswordCacheEnabled && bPimCacheEnabled)? TRUE : FALSE); SetDriverConfigurationFlag (TC_DRIVER_CONFIG_CACHE_BOOT_PIM, (bPasswordCacheEnabled && bPimCacheEnabled)? TRUE : FALSE);
SetDriverConfigurationFlag (TC_DRIVER_CONFIG_DISABLE_EVIL_MAID_ATTACK_DETECTION, IsDlgButtonChecked (hwndDlg, IDC_DISABLE_EVIL_MAID_ATTACK_DETECTION)); SetDriverConfigurationFlag (TC_DRIVER_CONFIG_DISABLE_EVIL_MAID_ATTACK_DETECTION, IsDlgButtonChecked (hwndDlg, IDC_DISABLE_EVIL_MAID_ATTACK_DETECTION));
@@ -11841,7 +11863,18 @@ static BOOL CALLBACK BootLoaderPreferencesDlgProc (HWND hwndDlg, UINT msg, WPARA
case IDC_CLEAR_KEYS_ON_NEW_DEVICE_INSERTION: case IDC_CLEAR_KEYS_ON_NEW_DEVICE_INSERTION:
if (IsDlgButtonChecked (hwndDlg, IDC_CLEAR_KEYS_ON_NEW_DEVICE_INSERTION)) if (IsDlgButtonChecked (hwndDlg, IDC_CLEAR_KEYS_ON_NEW_DEVICE_INSERTION))
{ {
Warning ("CLEAR_KEYS_ON_DEVICE_INSERTION_WARNING", hwndDlg); if (!BootEncObj->IsSystemFavoritesServiceRunning())
{
// the system favorite service service should be running
// if it is not the case, report a failure
std::string techInfo = SRC_POS;
techInfo += "\nIsSystemFavoritesServiceRunning = False.";
ReportUnexpectedState (techInfo.c_str());
CheckDlgButton (hwndDlg, IDC_CLEAR_KEYS_ON_NEW_DEVICE_INSERTION, BST_UNCHECKED);
}
else
Warning ("CLEAR_KEYS_ON_DEVICE_INSERTION_WARNING", hwndDlg);
} }
break; break;
src/Mount/Mount.rc
+4 -4
View File
@@ -548,8 +548,8 @@ END
// //
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,24,6,0 FILEVERSION 1,24,7,1
PRODUCTVERSION 1,24,6,0 PRODUCTVERSION 1,24,7,1
FILEFLAGSMASK 0x17L FILEFLAGSMASK 0x17L
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x1L FILEFLAGS 0x1L
@@ -566,11 +566,11 @@ BEGIN
BEGIN BEGIN
VALUE "CompanyName", "IDRIX" VALUE "CompanyName", "IDRIX"
VALUE "FileDescription", "VeraCrypt" VALUE "FileDescription", "VeraCrypt"
VALUE "FileVersion", "1.24" VALUE "FileVersion", "1.24-Hotfix1"
VALUE "LegalTrademarks", "VeraCrypt" VALUE "LegalTrademarks", "VeraCrypt"
VALUE "OriginalFilename", "VeraCrypt.exe" VALUE "OriginalFilename", "VeraCrypt.exe"
VALUE "ProductName", "VeraCrypt" VALUE "ProductName", "VeraCrypt"
VALUE "ProductVersion", "1.24" VALUE "ProductVersion", "1.24-Hotfix1"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"
src/Setup/MacOSX/veracrypt.pkgproj
+88 -29
View File
@@ -5,6 +5,10 @@
<key>PACKAGES</key> <key>PACKAGES</key>
<array> <array>
<dict> <dict>
<key>MUST-CLOSE-APPLICATION-ITEMS</key>
<array/>
<key>MUST-CLOSE-APPLICATIONS</key>
<false/>
<key>PACKAGE_FILES</key> <key>PACKAGE_FILES</key>
<dict> <dict>
<key>DEFAULT_INSTALL_LOCATION</key> <key>DEFAULT_INSTALL_LOCATION</key>
@@ -253,7 +257,7 @@
<key>PATH_TYPE</key> <key>PATH_TYPE</key>
<integer>0</integer> <integer>0</integer>
<key>PERMISSIONS</key> <key>PERMISSIONS</key>
<integer>493</integer> <integer>1005</integer>
<key>TYPE</key> <key>TYPE</key>
<integer>1</integer> <integer>1</integer>
<key>UID</key> <key>UID</key>
@@ -355,6 +359,38 @@
<key>UID</key> <key>UID</key>
<integer>0</integer> <integer>0</integer>
</dict> </dict>
<dict>
<key>CHILDREN</key>
<array/>
<key>GID</key>
<integer>0</integer>
<key>PATH</key>
<string>Automator</string>
<key>PATH_TYPE</key>
<integer>0</integer>
<key>PERMISSIONS</key>
<integer>493</integer>
<key>TYPE</key>
<integer>1</integer>
<key>UID</key>
<integer>0</integer>
</dict>
<dict>
<key>CHILDREN</key>
<array/>
<key>GID</key>
<integer>0</integer>
<key>PATH</key>
<string>Extensions</string>
<key>PATH_TYPE</key>
<integer>0</integer>
<key>PERMISSIONS</key>
<integer>493</integer>
<key>TYPE</key>
<integer>1</integer>
<key>UID</key>
<integer>0</integer>
</dict>
</array> </array>
<key>GID</key> <key>GID</key>
<integer>0</integer> <integer>0</integer>
@@ -468,15 +504,29 @@
</dict> </dict>
<key>PAYLOAD_TYPE</key> <key>PAYLOAD_TYPE</key>
<integer>0</integer> <integer>0</integer>
<key>PRESERVE_EXTENDED_ATTRIBUTES</key>
<false/>
<key>SHOW_INVISIBLE</key>
<false/>
<key>SPLIT_FORKS</key>
<true/>
<key>TREAT_MISSING_FILES_AS_WARNING</key>
<false/>
<key>VERSION</key> <key>VERSION</key>
<integer>2</integer> <integer>5</integer>
</dict> </dict>
<key>PACKAGE_SCRIPTS</key> <key>PACKAGE_SCRIPTS</key>
<dict> <dict>
<key>POSTINSTALL_PATH</key> <key>POSTINSTALL_PATH</key>
<dict/> <dict>
<key>PATH_TYPE</key>
<integer>0</integer>
</dict>
<key>PREINSTALL_PATH</key> <key>PREINSTALL_PATH</key>
<dict/> <dict>
<key>PATH_TYPE</key>
<integer>0</integer>
</dict>
<key>RESOURCES</key> <key>RESOURCES</key>
<array/> <array/>
</dict> </dict>
@@ -486,6 +536,8 @@
<integer>1</integer> <integer>1</integer>
<key>CONCLUSION_ACTION</key> <key>CONCLUSION_ACTION</key>
<integer>0</integer> <integer>0</integer>
<key>FOLLOW_SYMBOLIC_LINKS</key>
<false/>
<key>IDENTIFIER</key> <key>IDENTIFIER</key>
<string>com.idrix.pkg.veracrypt</string> <string>com.idrix.pkg.veracrypt</string>
<key>LOCATION</key> <key>LOCATION</key>
@@ -494,9 +546,19 @@
<string>veracrypt</string> <string>veracrypt</string>
<key>OVERWRITE_PERMISSIONS</key> <key>OVERWRITE_PERMISSIONS</key>
<false/> <false/>
<key>PAYLOAD_SIZE</key>
<integer>-1</integer>
<key>REFERENCE_PATH</key>
<string></string>
<key>RELOCATABLE</key>
<false/>
<key>USE_HFS+_COMPRESSION</key>
<false/>
<key>VERSION</key> <key>VERSION</key>
<string>1.24.6</string> <string>1.24.7</string>
</dict> </dict>
<key>TYPE</key>
<integer>0</integer>
<key>UUID</key> <key>UUID</key>
<string>B14381D9-EC5F-43E4-B971-82AB3D132A64</string> <string>B14381D9-EC5F-43E4-B971-82AB3D132A64</string>
</dict> </dict>
@@ -524,14 +586,15 @@
<dict> <dict>
<key>BACKGROUND</key> <key>BACKGROUND</key>
<dict> <dict>
<key>ALIGNMENT</key> <key>APPAREANCES</key>
<integer>4</integer> <dict>
<key>BACKGROUND_PATH</key> <key>DARK_AQUA</key>
<dict/> <dict/>
<key>CUSTOM</key> <key>LIGHT_AQUA</key>
<false/> <dict/>
<key>SCALING</key> </dict>
<integer>0</integer> <key>SHARED_SETTINGS_FOR_ALL_APPAREANCES</key>
<true/>
</dict> </dict>
<key>INSTALLATION TYPE</key> <key>INSTALLATION TYPE</key>
<dict> <dict>
@@ -567,7 +630,7 @@
<dict/> <dict/>
</dict> </dict>
</dict> </dict>
<key>INSTALLATION TYPE</key> <key>MODE</key>
<integer>0</integer> <integer>0</integer>
</dict> </dict>
<key>INSTALLATION_STEPS</key> <key>INSTALLATION_STEPS</key>
@@ -636,8 +699,6 @@
</dict> </dict>
<key>LICENSE</key> <key>LICENSE</key>
<dict> <dict>
<key>KEYWORDS</key>
<dict/>
<key>LOCALIZATIONS</key> <key>LOCALIZATIONS</key>
<array> <array>
<dict> <dict>
@@ -690,7 +751,7 @@
<key>IC_REQUIREMENT_CPU_ARCHITECTURE_FAMILY</key> <key>IC_REQUIREMENT_CPU_ARCHITECTURE_FAMILY</key>
<integer>2</integer> <integer>2</integer>
<key>IC_REQUIREMENT_CPU_INTEL_ARCHITECTURE_TYPE</key> <key>IC_REQUIREMENT_CPU_INTEL_ARCHITECTURE_TYPE</key>
<integer>0</integer> <integer>2</integer>
<key>IC_REQUIREMENT_CPU_MINIMUM_CPU_CORES_COUNT</key> <key>IC_REQUIREMENT_CPU_MINIMUM_CPU_CORES_COUNT</key>
<integer>1</integer> <integer>1</integer>
<key>IC_REQUIREMENT_CPU_MINIMUM_FREQUENCY</key> <key>IC_REQUIREMENT_CPU_MINIMUM_FREQUENCY</key>
@@ -710,7 +771,7 @@
<key>SECONDARY_VALUE</key> <key>SECONDARY_VALUE</key>
<string></string> <string></string>
<key>VALUE</key> <key>VALUE</key>
<string>VeraCrypt runs only on Intel platforms.</string> <string>VeraCrypt runs only on Intel 64-bit platforms.</string>
</dict> </dict>
<dict> <dict>
<key>LANGUAGE</key> <key>LANGUAGE</key>
@@ -718,7 +779,7 @@
<key>SECONDARY_VALUE</key> <key>SECONDARY_VALUE</key>
<string></string> <string></string>
<key>VALUE</key> <key>VALUE</key>
<string>VeraCrypt supporte seulement les platformes Intel.</string> <string>VeraCrypt supporte seulement les platformes Intel 64 bit.</string>
</dict> </dict>
</array> </array>
<key>NAME</key> <key>NAME</key>
@@ -736,7 +797,7 @@
<key>IC_REQUIREMENT_OS_DISTRIBUTION_TYPE</key> <key>IC_REQUIREMENT_OS_DISTRIBUTION_TYPE</key>
<integer>0</integer> <integer>0</integer>
<key>IC_REQUIREMENT_OS_MINIMUM_VERSION</key> <key>IC_REQUIREMENT_OS_MINIMUM_VERSION</key>
<integer>100701</integer> <integer>100900</integer>
</dict> </dict>
<key>IC_REQUIREMENT_CHECK_TYPE</key> <key>IC_REQUIREMENT_CHECK_TYPE</key>
<integer>0</integer> <integer>0</integer>
@@ -748,13 +809,13 @@
<key>LANGUAGE</key> <key>LANGUAGE</key>
<string>English</string> <string>English</string>
<key>VALUE</key> <key>VALUE</key>
<string>VeraCrypt requires MacOSX 10.7.1 and above.</string> <string>VeraCrypt requires MacOSX 10.9 and above.</string>
</dict> </dict>
<dict> <dict>
<key>LANGUAGE</key> <key>LANGUAGE</key>
<string>French</string> <string>French</string>
<key>VALUE</key> <key>VALUE</key>
<string>VeraCrypt nécessite MacOSX 10.7.1 et supérieur.</string> <string>VeraCrypt nécessite MacOSX 10.9 et supérieur.</string>
</dict> </dict>
</array> </array>
<key>NAME</key> <key>NAME</key>
@@ -813,10 +874,6 @@ https://osxfuse.github.io/
<true/> <true/>
</dict> </dict>
</array> </array>
<key>POSTINSTALL_PATH</key>
<dict/>
<key>PREINSTALL_PATH</key>
<dict/>
<key>RESOURCES</key> <key>RESOURCES</key>
<array/> <array/>
<key>ROOT_VOLUME_ONLY</key> <key>ROOT_VOLUME_ONLY</key>
@@ -824,8 +881,6 @@ https://osxfuse.github.io/
</dict> </dict>
<key>PROJECT_SETTINGS</key> <key>PROJECT_SETTINGS</key>
<dict> <dict>
<key>ADVANCED_OPTIONS</key>
<dict/>
<key>BUILD_FORMAT</key> <key>BUILD_FORMAT</key>
<integer>0</integer> <integer>0</integer>
<key>BUILD_PATH</key> <key>BUILD_PATH</key>
@@ -1004,7 +1059,11 @@ https://osxfuse.github.io/
</dict> </dict>
</array> </array>
<key>NAME</key> <key>NAME</key>
<string>VeraCrypt 1.24</string> <string>VeraCrypt 1.24-Hotfix1</string>
<key>PAYLOAD_ONLY</key>
<false/>
<key>TREAT_MISSING_PRESENTATION_DOCUMENTS_AS_WARNING</key>
<false/>
</dict> </dict>
</dict> </dict>
<key>SHARED_GLOBAL_DATA</key> <key>SHARED_GLOBAL_DATA</key>
src/Setup/MacOSX/veracrypt_Legacy.pkgproj
Executable
+1079
View File
File diff suppressed because it is too large Load Diff
src/Setup/Portable.rc
+4 -4
View File
@@ -26,8 +26,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
// //
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,24,6,0 FILEVERSION 1,24,7,1
PRODUCTVERSION 1,24,6,0 PRODUCTVERSION 1,24,7,1
FILEFLAGSMASK 0x17L FILEFLAGSMASK 0x17L
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x1L FILEFLAGS 0x1L
@@ -44,11 +44,11 @@ BEGIN
BEGIN BEGIN
VALUE "CompanyName", "IDRIX" VALUE "CompanyName", "IDRIX"
VALUE "FileDescription", "VeraCrypt Portable" VALUE "FileDescription", "VeraCrypt Portable"
VALUE "FileVersion", "1.24" VALUE "FileVersion", "1.24-Hotfix1"
VALUE "LegalTrademarks", "VeraCrypt" VALUE "LegalTrademarks", "VeraCrypt"
VALUE "OriginalFilename", "VeraCrypt Portable.exe" VALUE "OriginalFilename", "VeraCrypt Portable.exe"
VALUE "ProductName", "VeraCrypt" VALUE "ProductName", "VeraCrypt"
VALUE "ProductVersion", "1.24" VALUE "ProductVersion", "1.24-Hotfix1"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"
src/Setup/Setup.rc
+4 -4
View File
@@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
// //
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,24,6,0 FILEVERSION 1,24,7,1
PRODUCTVERSION 1,24,6,0 PRODUCTVERSION 1,24,7,1
FILEFLAGSMASK 0x17L FILEFLAGSMASK 0x17L
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x1L FILEFLAGS 0x1L
@@ -46,11 +46,11 @@ BEGIN
BEGIN BEGIN
VALUE "CompanyName", "IDRIX" VALUE "CompanyName", "IDRIX"
VALUE "FileDescription", "VeraCrypt Setup" VALUE "FileDescription", "VeraCrypt Setup"
VALUE "FileVersion", "1.24" VALUE "FileVersion", "1.24-Hotfix1"
VALUE "LegalTrademarks", "VeraCrypt" VALUE "LegalTrademarks", "VeraCrypt"
VALUE "OriginalFilename", "VeraCrypt Setup.exe" VALUE "OriginalFilename", "VeraCrypt Setup.exe"
VALUE "ProductName", "VeraCrypt" VALUE "ProductName", "VeraCrypt"
VALUE "ProductVersion", "1.24" VALUE "ProductVersion", "1.24-Hotfix1"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"
src/Signing/sign.bat
+1 -1
View File
@@ -1,6 +1,6 @@
PATH=%PATH%;%WSDK81%\bin\x86;C:\Program Files\7-Zip;C:\Program Files (x86)\7-Zip PATH=%PATH%;%WSDK81%\bin\x86;C:\Program Files\7-Zip;C:\Program Files (x86)\7-Zip
set VC_VERSION=1.24 set VC_VERSION=1.24-Hotfix1
set SIGNINGPATH=%~dp0 set SIGNINGPATH=%~dp0
cd %SIGNINGPATH% cd %SIGNINGPATH%
src/Signing/sign_test.bat
+1 -1
View File
@@ -1,5 +1,5 @@
PATH=%PATH%;%WSDK81%\bin\x86;C:\Program Files\7-Zip;C:\Program Files (x86)\7-Zip PATH=%PATH%;%WSDK81%\bin\x86;C:\Program Files\7-Zip;C:\Program Files (x86)\7-Zip
set VC_VERSION=1.24 set VC_VERSION=1.24-Hotfix1
set PFXNAME=TestCertificate\idrix_codeSign.pfx set PFXNAME=TestCertificate\idrix_codeSign.pfx
set PFXPASSWORD=idrix set PFXPASSWORD=idrix
set PFXCA=TestCertificate\idrix_TestRootCA.crt set PFXCA=TestCertificate\idrix_TestRootCA.crt
src/Signing/sign_test_debug.bat
+1 -1
View File
@@ -1,5 +1,5 @@
PATH=%PATH%;%WSDK81%\bin\x86;C:\Program Files\7-Zip;C:\Program Files (x86)\7-Zip PATH=%PATH%;%WSDK81%\bin\x86;C:\Program Files\7-Zip;C:\Program Files (x86)\7-Zip
set VC_VERSION=1.24 set VC_VERSION=1.24-Hotfix1
set PFXNAME=TestCertificate\idrix_codeSign.pfx set PFXNAME=TestCertificate\idrix_codeSign.pfx
set PFXPASSWORD=idrix set PFXPASSWORD=idrix
set PFXCA=TestCertificate\idrix_TestRootCA.crt set PFXCA=TestCertificate\idrix_TestRootCA.crt
src/Volume/Volume.make
+3
View File
@@ -12,6 +12,7 @@
OBJS := OBJS :=
OBJSEX := OBJSEX :=
OBJSNOOPT :=
OBJS += Cipher.o OBJS += Cipher.o
OBJS += EncryptionAlgorithm.o OBJS += EncryptionAlgorithm.o
OBJS += EncryptionMode.o OBJS += EncryptionMode.o
@@ -81,6 +82,8 @@ OBJS += ../Crypto/Streebog.o
OBJS += ../Crypto/kuznyechik.o OBJS += ../Crypto/kuznyechik.o
OBJS += ../Crypto/kuznyechik_simd.o OBJS += ../Crypto/kuznyechik_simd.o
OBJSNOOPT += ../Crypto/jitterentropy-base.o0
OBJS += ../Common/Crc.o OBJS += ../Common/Crc.o
OBJS += ../Common/Endian.o OBJS += ../Common/Endian.o
OBJS += ../Common/GfMul.o OBJS += ../Common/GfMul.o