[debian-edu-commits] debian-edu/ 20/50: Merge tag 'upstream/1.12'

Unit 193 unit193-guest at moszumanska.debian.org
Wed Dec 21 05:05:56 UTC 2016


This is an automated email from the git hooks/post-receive script.

unit193-guest pushed a commit to branch master
in repository veracrypt.

commit 1e77360b40c1c1df49e57de1d5d3cb3b3456ff71
Merge: ffc4f6f ab9dc91
Author: Unit 193 <unit193 at ubuntu.com>
Date:   Thu Aug 6 20:34:48 2015 -0400

    Merge tag 'upstream/1.12'
    
    Upstream version 1.12
    
    Conflicts:
    	Translations/Language.ar.xml
    	Translations/Language.be.xml
    	Translations/Language.bg.xml
    	Translations/Language.ca.xml
    	Translations/Language.cs.xml
    	Translations/Language.da.xml
    	Translations/Language.de.xml
    	Translations/Language.el.xml
    	Translations/Language.es.xml
    	Translations/Language.et.xml
    	Translations/Language.eu.xml
    	Translations/Language.fa.xml
    	Translations/Language.fi.xml
    	Translations/Language.fr.xml
    	Translations/Language.hu.xml
    	Translations/Language.id.xml
    	Translations/Language.it.xml
    	Translations/Language.ja.xml
    	Translations/Language.ka.xml
    	Translations/Language.ko.xml
    	Translations/Language.lv.xml
    	Translations/Language.my.xml
    	Translations/Language.nl.xml
    	Translations/Language.nn.xml
    	Translations/Language.pl.xml
    	Translations/Language.pt-br.xml
    	Translations/Language.ru.xml
    	Translations/Language.sk.xml
    	Translations/Language.sl.xml
    	Translations/Language.sv.xml
    	Translations/Language.tr.xml
    	Translations/Language.uk.xml
    	Translations/Language.uz.xml
    	Translations/Language.vi.xml
    	Translations/Language.zh-cn.xml
    	Translations/Language.zh-hk.xml
    	Translations/Language.zh-tw.xml
    	src/Boot/Windows/BootCommon.h
    	src/Boot/Windows/BootMain.cpp
    	src/Build/Resources/MacOSX/Info.plist.xml
    	src/Common/Apidrvr.h
    	src/Common/BaseCom.cpp
    	src/Common/BootEncryption.cpp
    	src/Common/BootEncryption.h
    	src/Common/Cmdline.c
    	src/Common/Combo.c
    	src/Common/Crypto.c
    	src/Common/Crypto.h
    	src/Common/Dictionary.c
    	src/Common/Dlgcode.c
    	src/Common/Dlgcode.h
    	src/Common/Endian.h
    	src/Common/Exception.h
    	src/Common/Fat.c
    	src/Common/Fat.h
    	src/Common/Format.h
    	src/Common/Inflate.c
    	src/Common/Language.c
    	src/Common/Language.xml
    	src/Common/Password.c
    	src/Common/Pkcs5.c
    	src/Common/Pkcs5.h
    	src/Common/Random.c
    	src/Common/Random.h
    	src/Common/SecurityToken.cpp
    	src/Common/Tcdefs.h
    	src/Common/Tests.c
    	src/Common/Volumes.c
    	src/Crypto/Aeskey.c
    	src/Driver/DriveFilter.c
    	src/Driver/Driver.rc
    	src/Driver/Ntdriver.c
    	src/Driver/Ntvol.c
    	src/ExpandVolume/DlgExpandVolume.cpp
    	src/ExpandVolume/ExpandVolume.c
    	src/ExpandVolume/ExpandVolume.h
    	src/ExpandVolume/ExpandVolume.rc
    	src/ExpandVolume/ExpandVolume.vcproj
    	src/ExpandVolume/InitDataArea.c
    	src/ExpandVolume/InitDataArea.h
    	src/ExpandVolume/WinMain.cpp
    	src/ExpandVolume/resource.h
    	src/Format/Format.rc
    	src/Format/InPlace.c
    	src/Format/Tcformat.c
    	src/Main/Forms/BenchmarkDialog.cpp
    	src/Main/Forms/ChangePasswordDialog.cpp
    	src/Main/Forms/Forms.cpp
    	src/Main/Forms/Forms.h
    	src/Main/Forms/MainFrame.cpp
    	src/Main/Forms/TrueCrypt.fbp
    	src/Main/Forms/VolumePasswordPanel.cpp
    	src/Main/Main.make
    	src/Mount/MainCom.cpp
    	src/Mount/Mount.c
    	src/Mount/Mount.h
    	src/Mount/Mount.rc
    	src/Mount/Resource.h
    	src/Readme.txt
    	src/Release/Setup Files/VeraCrypt User Guide.pdf
    	src/Setup/ComSetup.cpp
    	src/Setup/Dir.c
    	src/Setup/Linux/veracrypt_install_template.sh
    	src/Setup/MacOSX/veracrypt.pkgproj
    	src/Setup/SelfExtract.c
    	src/Setup/Setup.c
    	src/Setup/Setup.h
    	src/Setup/Setup.rc
    	src/Setup/Wizard.c
    	src/Signing/sign.bat
    	src/VeraCrypt.sln

 Tests/bench.bat                                    |   286 +
 Tests/test.ripemd160.hc                            |   Bin 0 -> 524288 bytes
 Tests/test.sha256.hc                               |   Bin 0 -> 524288 bytes
 Tests/test.sha512.hc                               |   Bin 0 -> 524288 bytes
 Tests/test.whirlpool.hc                            |   Bin 0 -> 524288 bytes
 Translations/Language.ar.xml                       |  2778 +-
 Translations/Language.be.xml                       |  2778 +-
 Translations/Language.bg.xml                       |  2778 +-
 Translations/Language.ca.xml                       |  2778 +-
 Translations/Language.cs.xml                       |  2778 +-
 Translations/Language.da.xml                       |  2778 +-
 Translations/Language.de.xml                       |  2780 +-
 Translations/Language.el.xml                       |  2776 +-
 Translations/Language.es.xml                       |  2780 +-
 Translations/Language.et.xml                       |  2778 +-
 Translations/Language.eu.xml                       |  2784 +-
 Translations/Language.fa.xml                       |  2778 +-
 Translations/Language.fi.xml                       |  2778 +-
 Translations/Language.fr.xml                       |  2780 +-
 Translations/Language.hu.xml                       |  2778 +-
 Translations/Language.id.xml                       |  2778 +-
 Translations/Language.it.xml                       |  2780 +-
 Translations/Language.ja.xml                       |  2780 +-
 Translations/Language.ka.xml                       |  2778 +-
 Translations/Language.ko.xml                       |  2778 +-
 Translations/Language.lv.xml                       |  2778 +-
 Translations/Language.my.xml                       |  2784 +-
 Translations/Language.nl.xml                       |  2778 +-
 Translations/Language.nn.xml                       |  2778 +-
 Translations/Language.pl.xml                       |  2781 +-
 Translations/Language.pt-br.xml                    |  2778 +-
 Translations/Language.ru.xml                       |  2780 +-
 Translations/Language.sk.xml                       |  2778 +-
 Translations/Language.sl.xml                       |  2778 +-
 Translations/Language.sv.xml                       |  2780 +-
 Translations/Language.tr.xml                       |  2778 +-
 Translations/Language.uk.xml                       |  2780 +-
 Translations/Language.uz.xml                       |  2778 +-
 Translations/Language.vi.xml                       |  2778 +-
 Translations/Language.zh-cn.xml                    |  2780 +-
 Translations/Language.zh-hk.xml                    |  2778 +-
 Translations/Language.zh-tw.xml                    |  2776 +-
 src/Boot/Windows/Bios.h                            |    60 +-
 src/Boot/Windows/BootCommon.h                      |   160 +-
 src/Boot/Windows/BootConfig.cpp                    |   184 +-
 src/Boot/Windows/BootConfig.h                      |    88 +-
 src/Boot/Windows/BootConsoleIo.cpp                 |   669 +-
 src/Boot/Windows/BootConsoleIo.h                   |   139 +-
 src/Boot/Windows/BootCrt.asm                       |    12 +-
 src/Boot/Windows/BootDebug.cpp                     |   358 +-
 src/Boot/Windows/BootDebug.h                       |   116 +-
 src/Boot/Windows/BootDefs.h                        |   380 +-
 src/Boot/Windows/BootDiskIo.cpp                    |   978 +-
 src/Boot/Windows/BootDiskIo.h                      |   236 +-
 src/Boot/Windows/BootEncryptedIo.cpp               |   260 +-
 src/Boot/Windows/BootEncryptedIo.h                 |    40 +-
 src/Boot/Windows/BootMain.cpp                      |  2382 +-
 src/Boot/Windows/BootMain.h                        |    64 +-
 src/Boot/Windows/BootMemory.cpp                    |   168 +-
 src/Boot/Windows/BootMemory.h                      |    52 +-
 src/Boot/Windows/BootSector.asm                    |    12 +-
 src/Boot/Windows/BootStrings.h                     |    36 +-
 src/Boot/Windows/Decompressor.c                    |   131 +-
 src/Boot/Windows/IntFilter.cpp                     |  1286 +-
 src/Boot/Windows/IntFilter.h                       |    36 +-
 src/Boot/Windows/Makefile                          |   393 +-
 src/Boot/Windows/Platform.cpp                      |   456 +-
 src/Boot/Windows/Platform.h                        |   228 +-
 src/Build/Include/Makefile.inc                     |    12 +-
 src/Build/Resources/MacOSX/Info.plist.xml          |     2 +-
 src/Build/build_veracrypt_linux.sh                 |    24 +-
 src/Build/build_veracrypt_macosx.sh                |     7 +
 src/Common/Apidrvr.h                               |   651 +-
 src/Common/BaseCom.cpp                             |   502 +-
 src/Common/BaseCom.h                               |   234 +-
 src/Common/BootEncryption.cpp                      |  5397 +-
 src/Common/BootEncryption.h                        |   499 +-
 src/Common/Cache.c                                 |   190 +-
 src/Common/Cache.h                                 |    48 +-
 src/Common/Cmdline.c                               |   441 +-
 src/Common/Cmdline.h                               |    84 +-
 src/Common/Combo.c                                 |   467 +-
 src/Common/Combo.h                                 |    56 +-
 src/Common/Common.h                                |   167 +-
 src/Common/Common.rc                               |    48 +-
 src/Common/Crc.c                                   |   268 +-
 src/Common/Crc.h                                   |    72 +-
 src/Common/Crypto.c                                |  2126 +-
 src/Common/Crypto.h                                |   692 +-
 src/Common/Dictionary.c                            |   170 +-
 src/Common/Dictionary.h                            |    64 +-
 src/Common/Dlgcode.c                               | 21286 +++----
 src/Common/Dlgcode.h                               |  1109 +-
 src/Common/EncryptionThreadPool.c                  |  1018 +-
 src/Common/EncryptionThreadPool.h                  |    80 +-
 src/Common/Endian.c                                |   116 +-
 src/Common/Endian.h                                |   296 +-
 src/Common/Exception.h                             |   237 +-
 src/Common/Fat.c                                   |   896 +-
 src/Common/Fat.h                                   |   136 +-
 src/Common/Format.c                                |  2106 +-
 src/Common/Format.h                                |   158 +-
 src/Common/GfMul.c                                 |  1536 +-
 src/Common/GfMul.h                                 |   148 +-
 src/Common/Inflate.c                               |  2642 +-
 src/Common/Inflate.h                               |   102 +-
 src/Common/Keyfiles.c                              |  1424 +-
 src/Common/Keyfiles.h                              |   100 +-
 src/Common/Language.c                              |  1117 +-
 src/Common/Language.h                              |    80 +-
 src/Common/Language.xml                            |  2780 +-
 src/Common/Makefile                                |     2 +-
 src/Common/Password.c                              |   914 +-
 src/Common/Password.h                              |    97 +-
 src/Common/Pkcs5.c                                 |  1587 +-
 src/Common/Pkcs5.h                                 |    90 +-
 src/Common/Progress.c                              |   266 +-
 src/Common/Progress.h                              |    46 +-
 src/Common/Random.c                                |  1747 +-
 src/Common/Random.h                                |   146 +-
 src/Common/Registry.c                              |   630 +-
 src/Common/Registry.h                              |    70 +-
 src/Common/Resource.h                              |   408 +-
 src/Common/SecurityToken.cpp                       |  1526 +-
 src/Common/SecurityToken.h                         |   438 +-
 src/Common/Tcdefs.h                                |   620 +-
 src/Common/Tests.c                                 |  2308 +-
 src/Common/Tests.h                                 |    60 +-
 src/Common/Volumes.c                               |  2476 +-
 src/Common/Volumes.h                               |   301 +-
 src/Common/Wipe.c                                  |   392 +-
 src/Common/Wipe.h                                  |    86 +-
 src/Common/Xml.c                                   |   466 +-
 src/Common/Xml.h                                   |    56 +-
 src/Common/Xts.c                                   |  1496 +-
 src/Common/Xts.h                                   |   164 +-
 src/Core/Core.h                                    |    44 +-
 src/Core/Core.make                                 |    12 +-
 src/Core/CoreBase.cpp                              |    32 +-
 src/Core/CoreBase.h                                |    20 +-
 src/Core/CoreException.cpp                         |    12 +-
 src/Core/CoreException.h                           |    14 +-
 src/Core/FatFormatter.cpp                          |    16 +-
 src/Core/FatFormatter.h                            |    12 +-
 src/Core/HostDevice.cpp                            |    12 +-
 src/Core/HostDevice.h                              |    14 +-
 src/Core/MountOptions.cpp                          |    22 +-
 src/Core/MountOptions.h                            |    16 +-
 src/Core/RandomNumberGenerator.cpp                 |    14 +-
 src/Core/RandomNumberGenerator.h                   |    14 +-
 src/Core/Unix/CoreService.cpp                      |    14 +-
 src/Core/Unix/CoreService.h                        |    12 +-
 src/Core/Unix/CoreServiceProxy.h                   |    14 +-
 src/Core/Unix/CoreServiceRequest.cpp               |    14 +-
 src/Core/Unix/CoreServiceRequest.h                 |    14 +-
 src/Core/Unix/CoreServiceResponse.cpp              |    14 +-
 src/Core/Unix/CoreServiceResponse.h                |    14 +-
 src/Core/Unix/CoreUnix.cpp                         |    41 +-
 src/Core/Unix/CoreUnix.h                           |    12 +-
 src/Core/Unix/FreeBSD/CoreFreeBSD.cpp              |    14 +-
 src/Core/Unix/FreeBSD/CoreFreeBSD.h                |    14 +-
 src/Core/Unix/FreeBSD/System.h                     |    12 +-
 src/Core/Unix/Linux/CoreLinux.cpp                  |    14 +-
 src/Core/Unix/Linux/CoreLinux.h                    |    14 +-
 src/Core/Unix/Linux/System.h                       |    12 +-
 src/Core/Unix/MacOSX/CoreMacOSX.cpp                |    14 +-
 src/Core/Unix/MacOSX/CoreMacOSX.h                  |    14 +-
 src/Core/Unix/MacOSX/System.h                      |    12 +-
 src/Core/Unix/MountedFilesystem.h                  |    12 +-
 src/Core/Unix/Solaris/CoreSolaris.cpp              |    14 +-
 src/Core/Unix/Solaris/CoreSolaris.h                |    14 +-
 src/Core/Unix/Solaris/System.h                     |    12 +-
 src/Core/Unix/System.h                             |    12 +-
 src/Core/VolumeCreator.cpp                         |    18 +-
 src/Core/VolumeCreator.h                           |    15 +-
 src/Crypto/Aes.h                                   |   430 +-
 src/Crypto/AesSmall.c                              |  1906 +-
 src/Crypto/AesSmall.h                              |   338 +-
 src/Crypto/Aes_hw_cpu.h                            |    64 +-
 src/Crypto/Aescrypt.c                              |   622 +-
 src/Crypto/Aeskey.c                                |  1146 +-
 src/Crypto/Aesopt.h                                |  1468 +-
 src/Crypto/Aestab.c                                |   856 +-
 src/Crypto/Aestab.h                                |   348 +-
 src/Crypto/Crypto.vcproj                           |   215 +
 src/Crypto/Makefile                                |     2 +-
 src/Crypto/Rmd160.c                                |   991 +-
 src/Crypto/Rmd160.h                                |    66 +-
 src/Crypto/Serpent.c                               |  1875 +-
 src/Crypto/Serpent.h                               |    40 +-
 src/Crypto/Sha2.c                                  |  1540 +-
 src/Crypto/Sha2.h                                  |   310 +-
 src/Crypto/Sha2Small.c                             |   468 +-
 src/Crypto/Sha2Small.h                             |    26 +-
 src/Crypto/Twofish.c                               |  1097 +-
 src/Crypto/Twofish.h                               |   112 +-
 src/Crypto/Whirlpool.c                             |  2116 +-
 src/Crypto/Whirlpool.h                             |   302 +-
 src/Driver/BuildDriver.cmd                         |    12 +-
 src/Driver/DriveFilter.c                           |  4148 +-
 src/Driver/DriveFilter.h                           |   175 +-
 src/Driver/Driver.rc                               |     8 +-
 src/Driver/DumpFilter.c                            |   492 +-
 src/Driver/DumpFilter.h                            |    46 +-
 src/Driver/EncryptedIoQueue.c                      |  2094 +-
 src/Driver/EncryptedIoQueue.h                      |   326 +-
 src/Driver/Fuse/Driver.make                        |    12 +-
 src/Driver/Fuse/FuseService.cpp                    |    14 +-
 src/Driver/Fuse/FuseService.h                      |    12 +-
 src/Driver/Makefile                                |     2 +-
 src/Driver/Ntdriver.c                              |  6706 +--
 src/Driver/Ntdriver.h                              |   352 +-
 src/Driver/Ntvol.c                                 |  1751 +-
 src/Driver/Ntvol.h                                 |    41 +-
 src/Driver/Resource.h                              |    32 +-
 src/Driver/VolumeFilter.c                          |   589 +-
 src/Driver/VolumeFilter.h                          |    42 +-
 src/ExpandVolume/DlgExpandVolume.cpp               |  1454 +-
 src/ExpandVolume/ExpandVolume.c                    |    81 +-
 src/ExpandVolume/ExpandVolume.h                    |    49 +-
 src/ExpandVolume/ExpandVolume.rc                   |    32 +-
 src/ExpandVolume/ExpandVolume.vcproj               |   305 +-
 src/ExpandVolume/InitDataArea.c                    |    59 +-
 src/ExpandVolume/InitDataArea.h                    |    34 +-
 src/ExpandVolume/WinMain.cpp                       |   818 +-
 src/ExpandVolume/resource.h                        |     7 +-
 src/Format/Format.rc                               |   213 +-
 src/Format/Format.vcproj                           |   290 +-
 src/Format/FormatCom.cpp                           |   448 +-
 src/Format/FormatCom.h                             |    66 +-
 src/Format/FormatCom.idl                           |    12 +-
 src/Format/InPlace.c                               |  4004 +-
 src/Format/InPlace.h                               |    97 +-
 src/Format/Resource.h                              |   307 +-
 src/Format/Tcformat.c                              | 18787 ++++---
 src/Format/Tcformat.h                              |   213 +-
 src/License.txt                                    |  1228 +-
 src/Main/Application.cpp                           |    12 +-
 src/Main/Application.h                             |    12 +-
 src/Main/CommandLineInterface.cpp                  |    94 +-
 src/Main/CommandLineInterface.h                    |    16 +-
 src/Main/FatalErrorHandler.cpp                     |    14 +-
 src/Main/FatalErrorHandler.h                       |    12 +-
 src/Main/FavoriteVolume.cpp                        |    12 +-
 src/Main/FavoriteVolume.h                          |    14 +-
 src/Main/Forms/AboutDialog.cpp                     |    14 +-
 src/Main/Forms/AboutDialog.h                       |    12 +-
 src/Main/Forms/BenchmarkDialog.cpp                 |    14 +-
 src/Main/Forms/BenchmarkDialog.h                   |    14 +-
 src/Main/Forms/ChangePasswordDialog.cpp            |    57 +-
 src/Main/Forms/ChangePasswordDialog.h              |    14 +-
 src/Main/Forms/DeviceSelectionDialog.cpp           |    14 +-
 src/Main/Forms/DeviceSelectionDialog.h             |    14 +-
 src/Main/Forms/EncryptionOptionsWizardPage.cpp     |    14 +-
 src/Main/Forms/EncryptionOptionsWizardPage.h       |    14 +-
 src/Main/Forms/EncryptionTestDialog.cpp            |    14 +-
 src/Main/Forms/EncryptionTestDialog.h              |    12 +-
 src/Main/Forms/FavoriteVolumesDialog.cpp           |    14 +-
 src/Main/Forms/FavoriteVolumesDialog.h             |    14 +-
 src/Main/Forms/Forms.cpp                           |  6897 +--
 src/Main/Forms/Forms.h                             |  2150 +-
 src/Main/Forms/InfoWizardPage.cpp                  |    12 +-
 src/Main/Forms/InfoWizardPage.h                    |    14 +-
 src/Main/Forms/KeyfileGeneratorDialog.cpp          |    16 +-
 src/Main/Forms/KeyfileGeneratorDialog.h            |    12 +-
 src/Main/Forms/KeyfilesDialog.cpp                  |    14 +-
 src/Main/Forms/KeyfilesDialog.h                    |    12 +-
 src/Main/Forms/KeyfilesPanel.cpp                   |    14 +-
 src/Main/Forms/KeyfilesPanel.h                     |    12 +-
 src/Main/Forms/LegalNoticesDialog.cpp              |    12 +-
 src/Main/Forms/LegalNoticesDialog.h                |    12 +-
 src/Main/Forms/MainFrame.cpp                       |    31 +-
 src/Main/Forms/MainFrame.h                         |    12 +-
 src/Main/Forms/MountOptionsDialog.cpp              |    17 +-
 src/Main/Forms/MountOptionsDialog.h                |    12 +-
 src/Main/Forms/NewSecurityTokenKeyfileDialog.cpp   |    14 +-
 src/Main/Forms/NewSecurityTokenKeyfileDialog.h     |    12 +-
 src/Main/Forms/PreferencesDialog.cpp               |    14 +-
 src/Main/Forms/PreferencesDialog.h                 |    12 +-
 src/Main/Forms/ProgressWizardPage.cpp              |    12 +-
 src/Main/Forms/ProgressWizardPage.h                |    14 +-
 src/Main/Forms/RandomPoolEnrichmentDialog.cpp      |    14 +-
 src/Main/Forms/RandomPoolEnrichmentDialog.h        |    12 +-
 src/Main/Forms/SecurityTokenKeyfilesDialog.cpp     |    14 +-
 src/Main/Forms/SecurityTokenKeyfilesDialog.h       |    14 +-
 src/Main/Forms/SelectDirectoryWizardPage.cpp       |    12 +-
 src/Main/Forms/SelectDirectoryWizardPage.h         |    12 +-
 src/Main/Forms/SingleChoiceWizardPage.h            |    14 +-
 src/Main/Forms/TrueCrypt.fbp                       | 55863 ++++++++++---------
 .../Forms/VolumeCreationProgressWizardPage.cpp     |    14 +-
 src/Main/Forms/VolumeCreationProgressWizardPage.h  |    14 +-
 src/Main/Forms/VolumeCreationWizard.cpp            |   102 +-
 src/Main/Forms/VolumeCreationWizard.h              |    14 +-
 src/Main/Forms/VolumeFormatOptionsWizardPage.cpp   |    12 +-
 src/Main/Forms/VolumeFormatOptionsWizardPage.h     |    12 +-
 src/Main/Forms/VolumeLocationWizardPage.cpp        |    14 +-
 src/Main/Forms/VolumeLocationWizardPage.h          |    14 +-
 src/Main/Forms/VolumePasswordPanel.cpp             |   125 +-
 src/Main/Forms/VolumePasswordPanel.h               |    23 +-
 src/Main/Forms/VolumePasswordWizardPage.cpp        |    14 +-
 src/Main/Forms/VolumePasswordWizardPage.h          |    18 +-
 src/Main/Forms/VolumePimWizardPage.cpp             |    90 +
 src/Main/Forms/VolumePimWizardPage.h               |    42 +
 src/Main/Forms/VolumePropertiesDialog.cpp          |    19 +-
 src/Main/Forms/VolumePropertiesDialog.h            |    12 +-
 src/Main/Forms/VolumeSizeWizardPage.cpp            |    14 +-
 src/Main/Forms/VolumeSizeWizardPage.h              |    14 +-
 src/Main/Forms/WaitDialog.cpp                      |     8 +-
 src/Main/Forms/WaitDialog.h                        |     8 +-
 src/Main/Forms/WizardFrame.cpp                     |    14 +-
 src/Main/Forms/WizardFrame.h                       |    14 +-
 src/Main/Forms/WizardPage.h                        |    14 +-
 src/Main/GraphicUserInterface.cpp                  |    35 +-
 src/Main/GraphicUserInterface.h                    |    16 +-
 src/Main/Hotkey.cpp                                |    14 +-
 src/Main/Hotkey.h                                  |    12 +-
 src/Main/LanguageStrings.cpp                       |    12 +-
 src/Main/LanguageStrings.h                         |    14 +-
 src/Main/Main.h                                    |    12 +-
 src/Main/Main.make                                 |    19 +-
 src/Main/Resources.cpp                             |    14 +-
 src/Main/Resources.h                               |    12 +-
 src/Main/StringFormatter.cpp                       |    12 +-
 src/Main/StringFormatter.h                         |    12 +-
 src/Main/System.cpp                                |    12 +-
 src/Main/System.h                                  |    14 +-
 src/Main/SystemPrecompiled.h                       |    12 +-
 src/Main/TextUserInterface.cpp                     |   102 +-
 src/Main/TextUserInterface.h                       |    15 +-
 src/Main/Unix/Main.cpp                             |    14 +-
 src/Main/UserInterface.cpp                         |    18 +-
 src/Main/UserInterface.h                           |    14 +-
 src/Main/UserInterfaceException.h                  |    14 +-
 src/Main/UserInterfaceType.h                       |    12 +-
 src/Main/UserPreferences.cpp                       |    12 +-
 src/Main/UserPreferences.h                         |    12 +-
 src/Main/VolumeHistory.cpp                         |    14 +-
 src/Main/VolumeHistory.h                           |    14 +-
 src/Main/Xml.cpp                                   |    14 +-
 src/Main/Xml.h                                     |    12 +-
 src/Makefile                                       |    13 +-
 src/Mount/Favorites.cpp                            |  1766 +-
 src/Mount/Favorites.h                              |   155 +-
 src/Mount/Hotkeys.c                                |  1064 +-
 src/Mount/Hotkeys.h                                |   100 +-
 src/Mount/MainCom.cpp                              |   662 +-
 src/Mount/MainCom.h                                |    67 +-
 src/Mount/MainCom.idl                              |    15 +-
 src/Mount/Mount.c                                  | 19998 +++----
 src/Mount/Mount.h                                  |   263 +-
 src/Mount/Mount.rc                                 |   124 +-
 src/Mount/Mount.vcproj                             |   278 +-
 src/Mount/Resource.h                               |   492 +-
 src/PKCS11/cryptoki.h                              |   132 +-
 src/PKCS11/pkcs11.h                                |   598 +-
 src/PKCS11/pkcs11f.h                               |  1824 +-
 src/PKCS11/pkcs11t.h                               |  3770 +-
 src/Platform/Buffer.cpp                            |   288 +-
 src/Platform/Buffer.h                              |   234 +-
 src/Platform/Directory.h                           |    62 +-
 src/Platform/Event.cpp                             |    98 +-
 src/Platform/Event.h                               |   176 +-
 src/Platform/Exception.cpp                         |   108 +-
 src/Platform/Exception.h                           |   224 +-
 src/Platform/File.h                                |   224 +-
 src/Platform/FileCommon.cpp                        |   178 +-
 src/Platform/FileStream.h                          |   120 +-
 src/Platform/FilesystemPath.h                      |   150 +-
 src/Platform/Finally.h                             |    96 +-
 src/Platform/ForEach.h                             |   240 +-
 src/Platform/Functor.h                             |    62 +-
 src/Platform/Memory.cpp                            |   120 +-
 src/Platform/Memory.h                              |   352 +-
 src/Platform/MemoryStream.cpp                      |    98 +-
 src/Platform/MemoryStream.h                        |    76 +-
 src/Platform/Mutex.h                               |   126 +-
 src/Platform/Platform.h                            |    60 +-
 src/Platform/Platform.make                         |    74 +-
 src/Platform/PlatformBase.h                        |   272 +-
 src/Platform/PlatformTest.cpp                      |   704 +-
 src/Platform/PlatformTest.h                        |    90 +-
 src/Platform/Serializable.cpp                      |    82 +-
 src/Platform/Serializable.h                        |   168 +-
 src/Platform/Serializer.cpp                        |   602 +-
 src/Platform/Serializer.h                          |   152 +-
 src/Platform/SerializerFactory.cpp                 |   112 +-
 src/Platform/SerializerFactory.h                   |   190 +-
 src/Platform/SharedPtr.h                           |   328 +-
 src/Platform/SharedVal.h                           |   146 +-
 src/Platform/Stream.h                              |    72 +-
 src/Platform/StringConverter.cpp                   |   786 +-
 src/Platform/StringConverter.h                     |   128 +-
 src/Platform/SyncEvent.h                           |    98 +-
 src/Platform/System.h                              |    36 +-
 src/Platform/SystemException.h                     |    96 +-
 src/Platform/SystemInfo.h                          |    60 +-
 src/Platform/SystemLog.h                           |    88 +-
 src/Platform/TextReader.cpp                        |    78 +-
 src/Platform/TextReader.h                          |    74 +-
 src/Platform/Thread.h                              |   152 +-
 src/Platform/Time.h                                |    64 +-
 src/Platform/Unix/Directory.cpp                    |    12 +-
 src/Platform/Unix/File.cpp                         |    14 +-
 src/Platform/Unix/FilesystemPath.cpp               |    14 +-
 src/Platform/Unix/Mutex.cpp                        |    12 +-
 src/Platform/Unix/Pipe.cpp                         |    12 +-
 src/Platform/Unix/Pipe.h                           |    14 +-
 src/Platform/Unix/Poller.cpp                       |    14 +-
 src/Platform/Unix/Poller.h                         |    14 +-
 src/Platform/Unix/Process.cpp                      |    14 +-
 src/Platform/Unix/Process.h                        |    14 +-
 src/Platform/Unix/SyncEvent.cpp                    |    12 +-
 src/Platform/Unix/System.h                         |    12 +-
 src/Platform/Unix/SystemException.cpp              |    12 +-
 src/Platform/Unix/SystemInfo.cpp                   |    12 +-
 src/Platform/Unix/SystemLog.cpp                    |    12 +-
 src/Platform/Unix/Thread.cpp                       |    14 +-
 src/Platform/Unix/Time.cpp                         |    12 +-
 src/Platform/User.h                                |    68 +-
 src/Readme.txt                                     |   518 +-
 src/Release/Setup Files/License.txt                |  1228 +-
 src/Release/Setup Files/VeraCrypt User Guide.pdf   |   Bin 2690354 -> 2873305 bytes
 src/Resources/Texts/License.rtf                    |   541 +-
 src/Setup/ComSetup.cpp                             |   196 +-
 src/Setup/ComSetup.h                               |    40 +-
 src/Setup/Dir.c                                    |   218 +-
 src/Setup/Dir.h                                    |    44 +-
 src/Setup/Linux/veracrypt_install_template.sh      |   209 +-
 src/Setup/MacOSX/veracrypt.pkgproj                 |     4 +-
 src/Setup/Resource.h                               |   128 +-
 src/Setup/SelfExtract.c                            |  1544 +-
 src/Setup/SelfExtract.h                            |    82 +-
 src/Setup/Setup.c                                  |  4920 +-
 src/Setup/Setup.h                                  |   363 +-
 src/Setup/Setup.rc                                 |    12 +-
 src/Setup/Setup.vcproj                             |     4 +-
 src/Setup/Wizard.c                                 |  2386 +-
 src/Setup/Wizard.h                                 |    60 +-
 src/Signing/TestCertificate/idrix_TestRootCA.crt   |    35 +
 src/Signing/TestCertificate/idrix_codeSign.pfx     |   Bin 0 -> 3204 bytes
 src/Signing/sign.bat                               |     6 +-
 src/Signing/sign_test.bat                          |    29 +
 src/VeraCrypt.sln                                  |   219 +
 src/Volume/Cipher.cpp                              |    14 +-
 src/Volume/Cipher.h                                |    14 +-
 src/Volume/Crc32.h                                 |    14 +-
 src/Volume/EncryptionAlgorithm.cpp                 |    14 +-
 src/Volume/EncryptionAlgorithm.h                   |    12 +-
 src/Volume/EncryptionMode.cpp                      |    14 +-
 src/Volume/EncryptionMode.h                        |    12 +-
 src/Volume/EncryptionModeXTS.cpp                   |    14 +-
 src/Volume/EncryptionModeXTS.h                     |    14 +-
 src/Volume/EncryptionTest.cpp                      |    14 +-
 src/Volume/EncryptionTest.h                        |    14 +-
 src/Volume/EncryptionThreadPool.cpp                |    14 +-
 src/Volume/EncryptionThreadPool.h                  |    12 +-
 src/Volume/Hash.cpp                                |    14 +-
 src/Volume/Hash.h                                  |    19 +-
 src/Volume/Keyfile.cpp                             |    14 +-
 src/Volume/Keyfile.h                               |    14 +-
 src/Volume/Pkcs5Kdf.cpp                            |    16 +-
 src/Volume/Pkcs5Kdf.h                              |    30 +-
 src/Volume/Version.h                               |    12 +-
 src/Volume/Volume.cpp                              |    35 +-
 src/Volume/Volume.h                                |    20 +-
 src/Volume/Volume.make                             |    12 +-
 src/Volume/VolumeException.cpp                     |    12 +-
 src/Volume/VolumeException.h                       |    14 +-
 src/Volume/VolumeHeader.cpp                        |    18 +-
 src/Volume/VolumeHeader.h                          |    16 +-
 src/Volume/VolumeInfo.cpp                          |    17 +-
 src/Volume/VolumeInfo.h                            |    13 +-
 src/Volume/VolumeLayout.cpp                        |    14 +-
 src/Volume/VolumeLayout.h                          |    14 +-
 src/Volume/VolumePassword.cpp                      |    14 +-
 src/Volume/VolumePassword.h                        |    14 +-
 src/Volume/VolumePasswordCache.cpp                 |    14 +-
 src/Volume/VolumePasswordCache.h                   |    14 +-
 src/Volume/VolumeSlot.h                            |    12 +-
 479 files changed, 184880 insertions(+), 174945 deletions(-)

diff --cc src/Main/Forms/PreferencesDialog.cpp
index 7e47b40,d0795fd..d0795fd
mode 100755,100644..100755
--- a/src/Main/Forms/PreferencesDialog.cpp
+++ b/src/Main/Forms/PreferencesDialog.cpp
diff --cc src/Main/Forms/VolumeCreationWizard.cpp
index 12dc745,177e405..177e405
mode 100755,100644..100755
--- a/src/Main/Forms/VolumeCreationWizard.cpp
+++ b/src/Main/Forms/VolumeCreationWizard.cpp
diff --cc src/Main/UserPreferences.cpp
index f66d8be,6714bb1..6714bb1
mode 100755,100644..100755
--- a/src/Main/UserPreferences.cpp
+++ b/src/Main/UserPreferences.cpp

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/pkg-team/veracrypt.git



More information about the debian-edu-commits mailing list