From 11716ed2dacbb104f8f59867fe66f2c0a6984291 Mon Sep 17 00:00:00 2001 From: David Foerster Date: Tue, 10 May 2016 22:16:32 +0200 Subject: Remove trailing whitespace --- src/Core/Core.h | 4 ++-- src/Core/Core.make | 2 +- src/Core/CoreBase.cpp | 8 ++++---- src/Core/CoreBase.h | 4 ++-- src/Core/CoreException.cpp | 2 +- src/Core/CoreException.h | 2 +- src/Core/FatFormatter.cpp | 36 +++++++++++++++++------------------ src/Core/FatFormatter.h | 2 +- src/Core/HostDevice.cpp | 4 ++-- src/Core/HostDevice.h | 2 +- src/Core/MountOptions.cpp | 12 ++++++------ src/Core/MountOptions.h | 2 +- src/Core/RandomNumberGenerator.cpp | 6 +++--- src/Core/RandomNumberGenerator.h | 2 +- src/Core/Unix/CoreService.cpp | 18 +++++++++--------- src/Core/Unix/CoreService.h | 2 +- src/Core/Unix/CoreServiceProxy.h | 4 ++-- src/Core/Unix/CoreServiceRequest.cpp | 6 +++--- src/Core/Unix/CoreServiceRequest.h | 2 +- src/Core/Unix/CoreServiceResponse.cpp | 4 ++-- src/Core/Unix/CoreServiceResponse.h | 2 +- src/Core/Unix/CoreUnix.cpp | 30 ++++++++++++++--------------- src/Core/Unix/CoreUnix.h | 6 +++--- src/Core/Unix/FreeBSD/CoreFreeBSD.cpp | 6 +++--- src/Core/Unix/FreeBSD/CoreFreeBSD.h | 4 ++-- src/Core/Unix/FreeBSD/System.h | 2 +- src/Core/Unix/Linux/CoreLinux.cpp | 12 ++++++------ src/Core/Unix/Linux/CoreLinux.h | 4 ++-- src/Core/Unix/Linux/System.h | 2 +- src/Core/Unix/MacOSX/CoreMacOSX.cpp | 8 ++++---- src/Core/Unix/MacOSX/CoreMacOSX.h | 4 ++-- src/Core/Unix/MacOSX/System.h | 2 +- src/Core/Unix/MountedFilesystem.h | 2 +- src/Core/Unix/Solaris/CoreSolaris.cpp | 8 ++++---- src/Core/Unix/Solaris/CoreSolaris.h | 4 ++-- src/Core/Unix/Solaris/System.h | 2 +- src/Core/Unix/System.h | 2 +- src/Core/VolumeCreator.cpp | 4 ++-- src/Core/VolumeCreator.h | 4 ++-- 39 files changed, 116 insertions(+), 116 deletions(-) (limited to 'src/Core') diff --git a/src/Core/Core.h b/src/Core/Core.h index 07a055a0..50c00e91 100644 --- a/src/Core/Core.h +++ b/src/Core/Core.h @@ -3,7 +3,7 @@ Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed by the TrueCrypt License 3.0. - Modifications and additions to the original source code (contained in this file) + Modifications and additions to the original source code (contained in this file) and all other portions of this file are Copyright (c) 2013-2016 IDRIX and are 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 @@ -157,7 +157,7 @@ namespace VeraCrypt public: WaitThreadUI(WaitThreadRoutine* pRoutine): m_pRoutine(pRoutine) {} virtual ~WaitThreadUI() {} - virtual void Run(void) { m_pRoutine->ExecutionCode();} + virtual void Run(void) { m_pRoutine->ExecutionCode();} WaitThreadRoutine* m_pRoutine; }; } diff --git a/src/Core/Core.make b/src/Core/Core.make index 9764f34d..f3fc3406 100644 --- a/src/Core/Core.make +++ b/src/Core/Core.make @@ -3,7 +3,7 @@ # Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed # by the TrueCrypt License 3.0. # -# Modifications and additions to the original source code (contained in this file) +# Modifications and additions to the original source code (contained in this file) # and all other portions of this file are Copyright (c) 2013-2016 IDRIX # and are 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 diff --git a/src/Core/CoreBase.cpp b/src/Core/CoreBase.cpp index b39e56d8..1703feea 100644 --- a/src/Core/CoreBase.cpp +++ b/src/Core/CoreBase.cpp @@ -3,7 +3,7 @@ Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed by the TrueCrypt License 3.0. - Modifications and additions to the original source code (contained in this file) + Modifications and additions to the original source code (contained in this file) and all other portions of this file are Copyright (c) 2013-2016 IDRIX and are 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 @@ -79,7 +79,7 @@ namespace VeraCrypt backupHeader = true; } } - + void CoreBase::ChangePassword (shared_ptr volumePath, bool preserveTimestamps, shared_ptr password, int pim, shared_ptr kdf, bool truecryptMode, shared_ptr keyfiles, shared_ptr newPassword, int newPim, shared_ptr newKeyfiles, shared_ptr newPkcs5Kdf, int wipeCount) const { shared_ptr volume = OpenVolume (volumePath, preserveTimestamps, password, pim, kdf, truecryptMode, keyfiles); @@ -147,7 +147,7 @@ namespace VeraCrypt outerVolume->ReadSectors (bootSectorBuffer, 0); int fatType; - byte *bootSector = bootSectorBuffer.Ptr(); + byte *bootSector = bootSectorBuffer.Ptr(); if (memcmp (bootSector + 54, "FAT12", 5) == 0) fatType = 12; @@ -260,7 +260,7 @@ namespace VeraCrypt volume->Open (*volumePath, preserveTimestamps, password, pim, kdf, truecryptMode, keyfiles, protection, protectionPassword, protectionPim, protectionKdf, protectionKeyfiles, sharedAccessAllowed, volumeType, useBackupHeaders, partitionInSystemEncryptionScope); return volume; } - + void CoreBase::RandomizeEncryptionAlgorithmKey (shared_ptr encryptionAlgorithm) const { SecureBuffer eaKey (encryptionAlgorithm->GetKeySize()); diff --git a/src/Core/CoreBase.h b/src/Core/CoreBase.h index 15bfce3f..34ce9b42 100644 --- a/src/Core/CoreBase.h +++ b/src/Core/CoreBase.h @@ -3,7 +3,7 @@ Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed by the TrueCrypt License 3.0. - Modifications and additions to the original source code (contained in this file) + Modifications and additions to the original source code (contained in this file) and all other portions of this file are Copyright (c) 2013-2016 IDRIX and are 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 @@ -35,7 +35,7 @@ namespace VeraCrypt virtual void ChangePassword (shared_ptr openVolume, shared_ptr newPassword, int newPim, shared_ptr newKeyfiles, shared_ptr newPkcs5Kdf = shared_ptr (), int wipeCount = PRAND_HEADER_WIPE_PASSES) const; virtual void ChangePassword (shared_ptr volumePath, bool preserveTimestamps, shared_ptr password, int pim, shared_ptr kdf, bool truecryptMode, shared_ptr keyfiles, shared_ptr newPassword, int newPim, shared_ptr newKeyfiles, shared_ptr newPkcs5Kdf = shared_ptr (), int wipeCount = PRAND_HEADER_WIPE_PASSES) const; - virtual void CheckFilesystem (shared_ptr mountedVolume, bool repair = false) const = 0; + virtual void CheckFilesystem (shared_ptr mountedVolume, bool repair = false) const = 0; virtual void CoalesceSlotNumberAndMountPoint (MountOptions &options) const; virtual void CreateKeyfile (const FilePath &keyfilePath) const; virtual void DismountFilesystem (const DirectoryPath &mountPoint, bool force) const = 0; diff --git a/src/Core/CoreException.cpp b/src/Core/CoreException.cpp index fd4ea2af..9f0bf04b 100644 --- a/src/Core/CoreException.cpp +++ b/src/Core/CoreException.cpp @@ -3,7 +3,7 @@ Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed by the TrueCrypt License 3.0. - Modifications and additions to the original source code (contained in this file) + Modifications and additions to the original source code (contained in this file) and all other portions of this file are Copyright (c) 2013-2016 IDRIX and are 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 diff --git a/src/Core/CoreException.h b/src/Core/CoreException.h index 62c56661..36dc1822 100644 --- a/src/Core/CoreException.h +++ b/src/Core/CoreException.h @@ -3,7 +3,7 @@ Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed by the TrueCrypt License 3.0. - Modifications and additions to the original source code (contained in this file) + Modifications and additions to the original source code (contained in this file) and all other portions of this file are Copyright (c) 2013-2016 IDRIX and are 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 diff --git a/src/Core/FatFormatter.cpp b/src/Core/FatFormatter.cpp index 807fa30c..9fb54ff7 100644 --- a/src/Core/FatFormatter.cpp +++ b/src/Core/FatFormatter.cpp @@ -1,11 +1,11 @@ /* Legal Notice: Some portions of the source code contained in this file were - derived from the source code of TrueCrypt 7.1a, which is - Copyright (c) 2003-2012 TrueCrypt Developers Association and which is + derived from the source code of TrueCrypt 7.1a, which is + Copyright (c) 2003-2012 TrueCrypt Developers Association and which is governed by the TrueCrypt License 3.0, also from the source code of Encryption for the Masses 2.02a, which is Copyright (c) 1998-2000 Paul Le Roux - and which is governed by the 'License Agreement for Encryption for the Masses' - Modifications and additions to the original source code (contained in this file) + and which is governed by the 'License Agreement for Encryption for the Masses' + Modifications and additions to the original source code (contained in this file) and all other portions of this file are Copyright (c) 2013-2016 IDRIX and are 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 @@ -89,8 +89,8 @@ namespace VeraCrypt ft->cluster_size = 1; // Geometry always set to SECTORS/1/1 - ft->secs_track = 1; - ft->heads = 1; + ft->secs_track = 1; + ft->heads = 1; ft->dir_entries = 512; ft->fats = 2; @@ -180,13 +180,13 @@ namespace VeraCrypt cnt += 2; boot[cnt++] = (int8) ft->media; /* media byte */ - if(ft->size_fat == 32) + if(ft->size_fat == 32) { boot[cnt++] = 0x00; boot[cnt++] = 0x00; } - else - { + else + { *(uint16 *)(boot + cnt) = Endian::Little ((uint16) ft->fat_length); /* fat size */ cnt += 2; } @@ -248,13 +248,13 @@ namespace VeraCrypt { memset (sector, 0, ft->sector_size); sector[3] = 0x41; /* LeadSig */ - sector[2] = 0x61; - sector[1] = 0x52; - sector[0] = 0x52; + sector[2] = 0x61; + sector[1] = 0x52; + sector[0] = 0x52; sector[484+3] = 0x61; /* StrucSig */ - sector[484+2] = 0x41; - sector[484+1] = 0x72; - sector[484+0] = 0x72; + sector[484+2] = 0x41; + sector[484+1] = 0x72; + sector[484+0] = 0x72; // Free cluster count *(uint32 *)(sector + 488) = Endian::Little (ft->cluster_count - ft->size_root_dir / ft->sector_size / ft->cluster_size); @@ -283,7 +283,7 @@ namespace VeraCrypt fatParams.num_sectors = (uint32) (deviceSize / fatParams.sector_size); fatParams.cluster_size = clusterSize / fatParams.sector_size; memcpy (fatParams.volume_name, "NO NAME ", 11); - GetFatParams (&fatParams); + GetFatParams (&fatParams); fatparams *ft = &fatParams; SecureBuffer sector (ft->sector_size); @@ -300,7 +300,7 @@ namespace VeraCrypt writeSector (sector); ++sectorNumber; /* fat32 boot area */ - if (ft->size_fat == 32) + if (ft->size_fat == 32) { /* fsinfo */ PutFSInfo((byte *) sector, ft); @@ -351,7 +351,7 @@ namespace VeraCrypt fat_sig[8] = fat_sig[9] = fat_sig[10] = 0xff; fat_sig[11] = 0x0f; memcpy (sector, fat_sig, 12); - } + } else if (ft->size_fat == 16) { fat_sig[0] = (byte) ft->media; diff --git a/src/Core/FatFormatter.h b/src/Core/FatFormatter.h index 520e58b1..3b129527 100644 --- a/src/Core/FatFormatter.h +++ b/src/Core/FatFormatter.h @@ -3,7 +3,7 @@ Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed by the TrueCrypt License 3.0. - Modifications and additions to the original source code (contained in this file) + Modifications and additions to the original source code (contained in this file) and all other portions of this file are Copyright (c) 2013-2016 IDRIX and are 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 diff --git a/src/Core/HostDevice.cpp b/src/Core/HostDevice.cpp index 61229983..69788095 100644 --- a/src/Core/HostDevice.cpp +++ b/src/Core/HostDevice.cpp @@ -3,7 +3,7 @@ Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed by the TrueCrypt License 3.0. - Modifications and additions to the original source code (contained in this file) + Modifications and additions to the original source code (contained in this file) and all other portions of this file are Copyright (c) 2013-2016 IDRIX and are 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 @@ -41,7 +41,7 @@ namespace VeraCrypt sr.Serialize ("Removable", Removable); sr.Serialize ("Size", Size); sr.Serialize ("SystemNumber", SystemNumber); - + sr.Serialize ("Partitions", (uint32) Partitions.size()); foreach_ref (const HostDevice &partition, Partitions) partition.Serialize (stream); diff --git a/src/Core/HostDevice.h b/src/Core/HostDevice.h index 47e478c6..a790878e 100644 --- a/src/Core/HostDevice.h +++ b/src/Core/HostDevice.h @@ -3,7 +3,7 @@ Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed by the TrueCrypt License 3.0. - Modifications and additions to the original source code (contained in this file) + Modifications and additions to the original source code (contained in this file) and all other portions of this file are Copyright (c) 2013-2016 IDRIX and are 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 diff --git a/src/Core/MountOptions.cpp b/src/Core/MountOptions.cpp index c3529efb..29f554e6 100644 --- a/src/Core/MountOptions.cpp +++ b/src/Core/MountOptions.cpp @@ -3,7 +3,7 @@ Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed by the TrueCrypt License 3.0. - Modifications and additions to the original source code (contained in this file) + Modifications and additions to the original source code (contained in this file) and all other portions of this file are Copyright (c) 2013-2016 IDRIX and are 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 @@ -102,14 +102,14 @@ namespace VeraCrypt sr.Deserialize ("UseBackupHeaders", UseBackupHeaders); sr.Deserialize ("TrueCryptMode", TrueCryptMode); - + try { if (!sr.DeserializeBool ("KdfNull")) { sr.Deserialize ("Kdf", nameValue); Kdf = Pkcs5Kdf::GetAlgorithm (nameValue, TrueCryptMode); - } + } } catch(...) {} @@ -122,7 +122,7 @@ namespace VeraCrypt } } catch(...) {} - + sr.Deserialize ("Pim", Pim); sr.Deserialize ("ProtectionPim", ProtectionPim); } @@ -144,7 +144,7 @@ namespace VeraCrypt sr.Serialize ("NoFilesystem", NoFilesystem); sr.Serialize ("NoHardwareCrypto", NoHardwareCrypto); sr.Serialize ("NoKernelCrypto", NoKernelCrypto); - + sr.Serialize ("PasswordNull", Password == nullptr); if (Password) Password->Serialize (stream); @@ -176,7 +176,7 @@ namespace VeraCrypt sr.Serialize ("ProtectionKdfNull", ProtectionKdf == nullptr); if (ProtectionKdf) sr.Serialize ("ProtectionKdf", ProtectionKdf->GetName()); - + sr.Serialize ("Pim", Pim); sr.Serialize ("ProtectionPim", ProtectionPim); } diff --git a/src/Core/MountOptions.h b/src/Core/MountOptions.h index b9319b55..2dcc5e1b 100644 --- a/src/Core/MountOptions.h +++ b/src/Core/MountOptions.h @@ -3,7 +3,7 @@ Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed by the TrueCrypt License 3.0. - Modifications and additions to the original source code (contained in this file) + Modifications and additions to the original source code (contained in this file) and all other portions of this file are Copyright (c) 2013-2016 IDRIX and are 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 diff --git a/src/Core/RandomNumberGenerator.cpp b/src/Core/RandomNumberGenerator.cpp index 403eb288..9551f585 100644 --- a/src/Core/RandomNumberGenerator.cpp +++ b/src/Core/RandomNumberGenerator.cpp @@ -3,7 +3,7 @@ Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed by the TrueCrypt License 3.0. - Modifications and additions to the original source code (contained in this file) + Modifications and additions to the original source code (contained in this file) and all other portions of this file are Copyright (c) 2013-2016 IDRIX and are 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 @@ -124,7 +124,7 @@ namespace VeraCrypt if (ReadOffset >= PoolSize) ReadOffset = 0; } - + pbBuffer += loopLen; } } @@ -186,7 +186,7 @@ namespace VeraCrypt } void RandomNumberGenerator::Stop () - { + { ScopeLock lock (AccessMutex); if (Pool.IsAllocated()) diff --git a/src/Core/RandomNumberGenerator.h b/src/Core/RandomNumberGenerator.h index c7608a1a..53482301 100644 --- a/src/Core/RandomNumberGenerator.h +++ b/src/Core/RandomNumberGenerator.h @@ -3,7 +3,7 @@ Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed by the TrueCrypt License 3.0. - Modifications and additions to the original source code (contained in this file) + Modifications and additions to the original source code (contained in this file) and all other portions of this file are Copyright (c) 2013-2016 IDRIX and are 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 diff --git a/src/Core/Unix/CoreService.cpp b/src/Core/Unix/CoreService.cpp index a4f85ba7..caa8c2b0 100644 --- a/src/Core/Unix/CoreService.cpp +++ b/src/Core/Unix/CoreService.cpp @@ -3,7 +3,7 @@ Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed by the TrueCrypt License 3.0. - Modifications and additions to the original source code (contained in this file) + Modifications and additions to the original source code (contained in this file) and all other portions of this file are Copyright (c) 2013-2016 IDRIX and are 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 @@ -30,7 +30,7 @@ namespace VeraCrypt auto_ptr CoreService::GetResponse () { auto_ptr deserializedObject (Serializable::DeserializeNew (ServiceOutputStream)); - + Exception *deserializedException = dynamic_cast (deserializedObject.get()); if (deserializedException) deserializedException->Throw(); @@ -60,11 +60,11 @@ namespace VeraCrypt throw_sys_if (read (STDIN_FILENO, &b, 1) != 1); if (b != 0x00) continue; - + throw_sys_if (read (STDIN_FILENO, &b, 1) != 1); if (b != 0x11) continue; - + throw_sys_if (read (STDIN_FILENO, &b, 1) != 1); if (b == 0x22) break; @@ -113,7 +113,7 @@ namespace VeraCrypt if (!ElevatedServiceAvailable) { finally_do_arg (string *, &request->AdminPassword, { StringConverter::Erase (*finally_arg); }); - + CoreService::StartElevated (*request); ElevatedServiceAvailable = true; } @@ -128,7 +128,7 @@ namespace VeraCrypt if (checkRequest) { Core->CheckFilesystem (checkRequest->MountedVolumeInfo, checkRequest->Repair); - + CheckFilesystemResponse().Serialize (outputStream); continue; } @@ -263,7 +263,7 @@ namespace VeraCrypt GetHostDevicesRequest request (pathListOnly); return SendRequest (request)->HostDevices; } - + shared_ptr CoreService::RequestMountVolume (MountOptions &options) { MountVolumeRequest request (&options); @@ -456,7 +456,7 @@ namespace VeraCrypt inPipe->Close(); outPipe->Close(); errPipe.Close(); - + if (request.FastElevation) { // Prevent defunct process @@ -532,7 +532,7 @@ namespace VeraCrypt ExitRequest exitRequest; exitRequest.Serialize (ServiceInputStream); } - + shared_ptr CoreService::AdminPasswordCallback; auto_ptr CoreService::AdminInputPipe; diff --git a/src/Core/Unix/CoreService.h b/src/Core/Unix/CoreService.h index da6d2321..4dce35a0 100644 --- a/src/Core/Unix/CoreService.h +++ b/src/Core/Unix/CoreService.h @@ -3,7 +3,7 @@ Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed by the TrueCrypt License 3.0. - Modifications and additions to the original source code (contained in this file) + Modifications and additions to the original source code (contained in this file) and all other portions of this file are Copyright (c) 2013-2016 IDRIX and are 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 diff --git a/src/Core/Unix/CoreServiceProxy.h b/src/Core/Unix/CoreServiceProxy.h index 9198dd56..33b2be01 100644 --- a/src/Core/Unix/CoreServiceProxy.h +++ b/src/Core/Unix/CoreServiceProxy.h @@ -3,7 +3,7 @@ Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed by the TrueCrypt License 3.0. - Modifications and additions to the original source code (contained in this file) + Modifications and additions to the original source code (contained in this file) and all other portions of this file are Copyright (c) 2013-2016 IDRIX and are 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 @@ -97,7 +97,7 @@ namespace VeraCrypt else { MountOptions newOptions = options; - + newOptions.Password = Keyfile::ApplyListToPassword (options.Keyfiles, options.Password); if (newOptions.Keyfiles) newOptions.Keyfiles->clear(); diff --git a/src/Core/Unix/CoreServiceRequest.cpp b/src/Core/Unix/CoreServiceRequest.cpp index b19f0f81..51e26c0c 100644 --- a/src/Core/Unix/CoreServiceRequest.cpp +++ b/src/Core/Unix/CoreServiceRequest.cpp @@ -3,7 +3,7 @@ Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed by the TrueCrypt License 3.0. - Modifications and additions to the original source code (contained in this file) + Modifications and additions to the original source code (contained in this file) and all other portions of this file are Copyright (c) 2013-2016 IDRIX and are 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 @@ -229,13 +229,13 @@ namespace VeraCrypt Serializer sr (stream); Options->Serialize (stream); } - + // SetFileOwnerRequest void SetFileOwnerRequest::Deserialize (shared_ptr stream) { CoreServiceRequest::Deserialize (stream); Serializer sr (stream); - + uint64 owner; sr.Deserialize ("Owner", owner); Owner.SystemId = static_cast (owner); diff --git a/src/Core/Unix/CoreServiceRequest.h b/src/Core/Unix/CoreServiceRequest.h index 61b673ec..b6798e41 100644 --- a/src/Core/Unix/CoreServiceRequest.h +++ b/src/Core/Unix/CoreServiceRequest.h @@ -3,7 +3,7 @@ Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed by the TrueCrypt License 3.0. - Modifications and additions to the original source code (contained in this file) + Modifications and additions to the original source code (contained in this file) and all other portions of this file are Copyright (c) 2013-2016 IDRIX and are 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 diff --git a/src/Core/Unix/CoreServiceResponse.cpp b/src/Core/Unix/CoreServiceResponse.cpp index 9980cc91..e56ac123 100644 --- a/src/Core/Unix/CoreServiceResponse.cpp +++ b/src/Core/Unix/CoreServiceResponse.cpp @@ -3,7 +3,7 @@ Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed by the TrueCrypt License 3.0. - Modifications and additions to the original source code (contained in this file) + Modifications and additions to the original source code (contained in this file) and all other portions of this file are Copyright (c) 2013-2016 IDRIX and are 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 @@ -75,7 +75,7 @@ namespace VeraCrypt Serializer sr (stream); sr.Serialize ("Size", Size); } - + // GetHostDevicesResponse void GetHostDevicesResponse::Deserialize (shared_ptr stream) { diff --git a/src/Core/Unix/CoreServiceResponse.h b/src/Core/Unix/CoreServiceResponse.h index d5956f8e..24c7b64c 100644 --- a/src/Core/Unix/CoreServiceResponse.h +++ b/src/Core/Unix/CoreServiceResponse.h @@ -3,7 +3,7 @@ Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed by the TrueCrypt License 3.0. - Modifications and additions to the original source code (contained in this file) + Modifications and additions to the original source code (contained in this file) and all other portions of this file are Copyright (c) 2013-2016 IDRIX and are 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 diff --git a/src/Core/Unix/CoreUnix.cpp b/src/Core/Unix/CoreUnix.cpp index 43c37a28..12287038 100644 --- a/src/Core/Unix/CoreUnix.cpp +++ b/src/Core/Unix/CoreUnix.cpp @@ -3,7 +3,7 @@ Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed by the TrueCrypt License 3.0. - Modifications and additions to the original source code (contained in this file) + Modifications and additions to the original source code (contained in this file) and all other portions of this file are Copyright (c) 2013-2016 IDRIX and are 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 @@ -27,7 +27,7 @@ namespace VeraCrypt CoreUnix::CoreUnix () { signal (SIGPIPE, SIG_IGN); - + char *loc = setlocale (LC_ALL, ""); if (!loc || string (loc) == "C") setlocale (LC_ALL, "en_US.UTF-8"); @@ -36,7 +36,7 @@ namespace VeraCrypt CoreUnix::~CoreUnix () { } - + void CoreUnix::CheckFilesystem (shared_ptr mountedVolume, bool repair) const { if (!mountedVolume->MountPoint.IsEmpty()) @@ -77,9 +77,9 @@ namespace VeraCrypt args.push_back ("fsck"); args.push_back ("--caption"); args.push_back ("fsck"); - args.push_back ("-e"); - args.push_back ("sh"); - args.push_back ("-c"); + args.push_back ("-e"); + args.push_back ("sh"); + args.push_back ("-c"); args.push_back (xargs); try { @@ -176,7 +176,7 @@ namespace VeraCrypt { string path = filePath; size_t pos; - + while ((pos = path.find_last_of ('/')) != string::npos) { path = path.substr (0, pos); @@ -224,7 +224,7 @@ namespace VeraCrypt device.SeekAt (0); device.ReadCompleteBuffer (bootSector); - byte *b = bootSector.Ptr(); + byte *b = bootSector.Ptr(); return memcmp (b + 3, "NTFS", 4) != 0 && memcmp (b + 54, "FAT", 3) != 0 @@ -237,13 +237,13 @@ namespace VeraCrypt const char *envPrefix = getenv ("VERACRYPT_MOUNT_PREFIX"); if (envPrefix && !string (envPrefix).empty()) return envPrefix; - + if (FilesystemPath ("/media").IsDirectory()) return "/media/veracrypt"; - + if (FilesystemPath ("/mnt").IsDirectory()) return "/mnt/veracrypt"; - + return GetTempDirectory() + "/veracrypt_mnt"; } @@ -298,7 +298,7 @@ namespace VeraCrypt { continue; } - + if (!volumePath.IsEmpty() && wstring (mountedVol->Path).compare (volumePath) != 0) continue; @@ -320,7 +320,7 @@ namespace VeraCrypt return volumes; } - + gid_t CoreUnix::GetRealGroupId () const { const char *env = getenv ("SUDO_GID"); @@ -352,7 +352,7 @@ namespace VeraCrypt return getuid(); } - + string CoreUnix::GetTempDirectory () const { char *envDir = getenv ("TMPDIR"); @@ -583,7 +583,7 @@ namespace VeraCrypt throw; } -#ifndef TC_MACOSX +#ifndef TC_MACOSX // set again correct ownership of the mount point to avoid any issues if (!options.NoFilesystem && options.MountPoint) { diff --git a/src/Core/Unix/CoreUnix.h b/src/Core/Unix/CoreUnix.h index e4c3aa3e..4d12d4b0 100644 --- a/src/Core/Unix/CoreUnix.h +++ b/src/Core/Unix/CoreUnix.h @@ -3,7 +3,7 @@ Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed by the TrueCrypt License 3.0. - Modifications and additions to the original source code (contained in this file) + Modifications and additions to the original source code (contained in this file) and all other portions of this file are Copyright (c) 2013-2016 IDRIX and are 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 @@ -26,7 +26,7 @@ namespace VeraCrypt CoreUnix (); virtual ~CoreUnix (); - virtual void CheckFilesystem (shared_ptr mountedVolume, bool repair = false) const; + virtual void CheckFilesystem (shared_ptr mountedVolume, bool repair = false) const; virtual void DismountFilesystem (const DirectoryPath &mountPoint, bool force) const; virtual shared_ptr DismountVolume (shared_ptr mountedVolume, bool ignoreOpenFiles = false, bool syncVolumeInfo = false); virtual bool FilesystemSupportsLargeFiles (const FilePath &filePath) const; @@ -63,7 +63,7 @@ namespace VeraCrypt virtual void MountFilesystem (const DevicePath &devicePath, const DirectoryPath &mountPoint, const string &filesystemType, bool readOnly, const string &systemMountOptions) const; virtual void MountAuxVolumeImage (const DirectoryPath &auxMountPoint, const MountOptions &options) const; virtual void MountVolumeNative (shared_ptr volume, MountOptions &options, const DirectoryPath &auxMountPoint) const { throw NotApplicable (SRC_POS); } - + private: CoreUnix (const CoreUnix &); CoreUnix &operator= (const CoreUnix &); diff --git a/src/Core/Unix/FreeBSD/CoreFreeBSD.cpp b/src/Core/Unix/FreeBSD/CoreFreeBSD.cpp index 20575067..2dd6be0b 100644 --- a/src/Core/Unix/FreeBSD/CoreFreeBSD.cpp +++ b/src/Core/Unix/FreeBSD/CoreFreeBSD.cpp @@ -3,7 +3,7 @@ Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed by the TrueCrypt License 3.0. - Modifications and additions to the original source code (contained in this file) + Modifications and additions to the original source code (contained in this file) and all other portions of this file are Copyright (c) 2013-2016 IDRIX and are 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 @@ -127,8 +127,8 @@ namespace VeraCrypt partition->Path = partPath.str(); if (!pathListOnly) { - try - { + try + { partition->Size = GetDeviceSize (partition->Path); } catch (...) diff --git a/src/Core/Unix/FreeBSD/CoreFreeBSD.h b/src/Core/Unix/FreeBSD/CoreFreeBSD.h index 6c6b8062..c7d496fb 100644 --- a/src/Core/Unix/FreeBSD/CoreFreeBSD.h +++ b/src/Core/Unix/FreeBSD/CoreFreeBSD.h @@ -3,7 +3,7 @@ Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed by the TrueCrypt License 3.0. - Modifications and additions to the original source code (contained in this file) + Modifications and additions to the original source code (contained in this file) and all other portions of this file are Copyright (c) 2013-2016 IDRIX and are 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 @@ -24,7 +24,7 @@ namespace VeraCrypt CoreFreeBSD (); virtual ~CoreFreeBSD (); - virtual HostDeviceList GetHostDevices (bool pathListOnly = false) const; + virtual HostDeviceList GetHostDevices (bool pathListOnly = false) const; protected: virtual DevicePath AttachFileToLoopDevice (const FilePath &filePath, bool readOnly) const; diff --git a/src/Core/Unix/FreeBSD/System.h b/src/Core/Unix/FreeBSD/System.h index c97f60d2..26daade0 100644 --- a/src/Core/Unix/FreeBSD/System.h +++ b/src/Core/Unix/FreeBSD/System.h @@ -3,7 +3,7 @@ Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed by the TrueCrypt License 3.0. - Modifications and additions to the original source code (contained in this file) + Modifications and additions to the original source code (contained in this file) and all other portions of this file are Copyright (c) 2013-2016 IDRIX and are 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 diff --git a/src/Core/Unix/Linux/CoreLinux.cpp b/src/Core/Unix/Linux/CoreLinux.cpp index 50d546d4..eb4545fd 100644 --- a/src/Core/Unix/Linux/CoreLinux.cpp +++ b/src/Core/Unix/Linux/CoreLinux.cpp @@ -3,7 +3,7 @@ Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed by the TrueCrypt License 3.0. - Modifications and additions to the original source code (contained in this file) + Modifications and additions to the original source code (contained in this file) and all other portions of this file are Copyright (c) 2013-2016 IDRIX and are 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 @@ -41,7 +41,7 @@ namespace VeraCrypt loopPaths.push_back ("/dev/loop"); loopPaths.push_back ("/dev/loop/"); loopPaths.push_back ("/dev/.static/dev/loop"); - + // On Fedora 23,"losetup -f" must be called first to create a default loop device list args; args.push_back ("-f"); @@ -171,7 +171,7 @@ namespace VeraCrypt while (tr.ReadLine (line)) { vector fields = StringConverter::Split (line); - + if (fields.size() != 4 || fields[3].find ("loop") == 0 // skip loop devices || fields[3].find ("cloop") == 0 @@ -390,10 +390,10 @@ namespace VeraCrypt stringstream nativeDevName; nativeDevName << "veracrypt" << options.SlotNumber; - + if (nativeDevCount != cipherCount - 1) nativeDevName << "_" << cipherCount - nativeDevCount - 2; - + nativeDevPath = "/dev/mapper/" + nativeDevName.str(); execArgs.clear(); @@ -401,7 +401,7 @@ namespace VeraCrypt execArgs.push_back (nativeDevName.str()); Process::Execute ("dmsetup", execArgs, -1, nullptr, &dmCreateArgsBuf); - + // Wait for the device to be created for (int t = 0; true; t++) { diff --git a/src/Core/Unix/Linux/CoreLinux.h b/src/Core/Unix/Linux/CoreLinux.h index 949313bf..d31ba570 100644 --- a/src/Core/Unix/Linux/CoreLinux.h +++ b/src/Core/Unix/Linux/CoreLinux.h @@ -3,7 +3,7 @@ Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed by the TrueCrypt License 3.0. - Modifications and additions to the original source code (contained in this file) + Modifications and additions to the original source code (contained in this file) and all other portions of this file are Copyright (c) 2013-2016 IDRIX and are 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 @@ -24,7 +24,7 @@ namespace VeraCrypt CoreLinux (); virtual ~CoreLinux (); - virtual HostDeviceList GetHostDevices (bool pathListOnly = false) const; + virtual HostDeviceList GetHostDevices (bool pathListOnly = false) const; protected: virtual DevicePath AttachFileToLoopDevice (const FilePath &filePath, bool readOnly) const; diff --git a/src/Core/Unix/Linux/System.h b/src/Core/Unix/Linux/System.h index df7d9ba7..3acfa166 100644 --- a/src/Core/Unix/Linux/System.h +++ b/src/Core/Unix/Linux/System.h @@ -3,7 +3,7 @@ Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed by the TrueCrypt License 3.0. - Modifications and additions to the original source code (contained in this file) + Modifications and additions to the original source code (contained in this file) and all other portions of this file are Copyright (c) 2013-2016 IDRIX and are 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 diff --git a/src/Core/Unix/MacOSX/CoreMacOSX.cpp b/src/Core/Unix/MacOSX/CoreMacOSX.cpp index b2a10017..e7572e68 100644 --- a/src/Core/Unix/MacOSX/CoreMacOSX.cpp +++ b/src/Core/Unix/MacOSX/CoreMacOSX.cpp @@ -3,7 +3,7 @@ Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed by the TrueCrypt License 3.0. - Modifications and additions to the original source code (contained in this file) + Modifications and additions to the original source code (contained in this file) and all other portions of this file are Copyright (c) 2013-2016 IDRIX and are 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 @@ -139,7 +139,7 @@ namespace VeraCrypt } else throw HigherFuseVersionRequired (SRC_POS); - + } vector fuseVersion = StringConverter::Split (string (fuseVersionString), "."); @@ -187,7 +187,7 @@ namespace VeraCrypt args.push_back ("-readonly"); string xml; - + while (true) { try @@ -202,7 +202,7 @@ namespace VeraCrypt args.remove ("-noautofsck"); continue; } - + throw; } } diff --git a/src/Core/Unix/MacOSX/CoreMacOSX.h b/src/Core/Unix/MacOSX/CoreMacOSX.h index f3bf6bf7..5b190e4a 100644 --- a/src/Core/Unix/MacOSX/CoreMacOSX.h +++ b/src/Core/Unix/MacOSX/CoreMacOSX.h @@ -3,7 +3,7 @@ Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed by the TrueCrypt License 3.0. - Modifications and additions to the original source code (contained in this file) + Modifications and additions to the original source code (contained in this file) and all other portions of this file are Copyright (c) 2013-2016 IDRIX and are 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 @@ -24,7 +24,7 @@ namespace VeraCrypt CoreMacOSX (); virtual ~CoreMacOSX (); - virtual void CheckFilesystem (shared_ptr mountedVolume, bool repair = false) const; + virtual void CheckFilesystem (shared_ptr mountedVolume, bool repair = false) const; virtual shared_ptr DismountVolume (shared_ptr mountedVolume, bool ignoreOpenFiles = false, bool syncVolumeInfo = false); virtual string GetDefaultMountPointPrefix () const { return "/Volumes/veracrypt"; } diff --git a/src/Core/Unix/MacOSX/System.h b/src/Core/Unix/MacOSX/System.h index 04d08a57..5931628b 100644 --- a/src/Core/Unix/MacOSX/System.h +++ b/src/Core/Unix/MacOSX/System.h @@ -3,7 +3,7 @@ Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed by the TrueCrypt License 3.0. - Modifications and additions to the original source code (contained in this file) + Modifications and additions to the original source code (contained in this file) and all other portions of this file are Copyright (c) 2013-2016 IDRIX and are 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 diff --git a/src/Core/Unix/MountedFilesystem.h b/src/Core/Unix/MountedFilesystem.h index 741c49d6..f47fc946 100644 --- a/src/Core/Unix/MountedFilesystem.h +++ b/src/Core/Unix/MountedFilesystem.h @@ -3,7 +3,7 @@ Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed by the TrueCrypt License 3.0. - Modifications and additions to the original source code (contained in this file) + Modifications and additions to the original source code (contained in this file) and all other portions of this file are Copyright (c) 2013-2016 IDRIX and are 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 diff --git a/src/Core/Unix/Solaris/CoreSolaris.cpp b/src/Core/Unix/Solaris/CoreSolaris.cpp index 9101e4f8..1e99d98f 100644 --- a/src/Core/Unix/Solaris/CoreSolaris.cpp +++ b/src/Core/Unix/Solaris/CoreSolaris.cpp @@ -3,7 +3,7 @@ Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed by the TrueCrypt License 3.0. - Modifications and additions to the original source code (contained in this file) + Modifications and additions to the original source code (contained in this file) and all other portions of this file are Copyright (c) 2013-2016 IDRIX and are 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 @@ -80,7 +80,7 @@ namespace VeraCrypt { device->Size = 0; } - + if (device->Size == 0) continue; @@ -99,8 +99,8 @@ namespace VeraCrypt make_shared_auto (HostDevice, partition); partition->Path = partPath.str(); - try - { + try + { partition->Size = GetDeviceSize (partition->Path); } catch (...) diff --git a/src/Core/Unix/Solaris/CoreSolaris.h b/src/Core/Unix/Solaris/CoreSolaris.h index 26543220..2e9dbc1c 100644 --- a/src/Core/Unix/Solaris/CoreSolaris.h +++ b/src/Core/Unix/Solaris/CoreSolaris.h @@ -3,7 +3,7 @@ Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed by the TrueCrypt License 3.0. - Modifications and additions to the original source code (contained in this file) + Modifications and additions to the original source code (contained in this file) and all other portions of this file are Copyright (c) 2013-2016 IDRIX and are 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 @@ -24,7 +24,7 @@ namespace VeraCrypt CoreSolaris (); virtual ~CoreSolaris (); - virtual HostDeviceList GetHostDevices (bool pathListOnly = false) const; + virtual HostDeviceList GetHostDevices (bool pathListOnly = false) const; protected: virtual DevicePath AttachFileToLoopDevice (const FilePath &filePath, bool readOnly) const; diff --git a/src/Core/Unix/Solaris/System.h b/src/Core/Unix/Solaris/System.h index 5bff4c5e..e8b05dac 100644 --- a/src/Core/Unix/Solaris/System.h +++ b/src/Core/Unix/Solaris/System.h @@ -3,7 +3,7 @@ Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed by the TrueCrypt License 3.0. - Modifications and additions to the original source code (contained in this file) + Modifications and additions to the original source code (contained in this file) and all other portions of this file are Copyright (c) 2013-2016 IDRIX and are 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 diff --git a/src/Core/Unix/System.h b/src/Core/Unix/System.h index e322d331..30384907 100644 --- a/src/Core/Unix/System.h +++ b/src/Core/Unix/System.h @@ -3,7 +3,7 @@ Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed by the TrueCrypt License 3.0. - Modifications and additions to the original source code (contained in this file) + Modifications and additions to the original source code (contained in this file) and all other portions of this file are Copyright (c) 2013-2016 IDRIX and are 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 diff --git a/src/Core/VolumeCreator.cpp b/src/Core/VolumeCreator.cpp index a920eba1..94aba4bc 100644 --- a/src/Core/VolumeCreator.cpp +++ b/src/Core/VolumeCreator.cpp @@ -3,7 +3,7 @@ Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed by the TrueCrypt License 3.0. - Modifications and additions to the original source code (contained in this file) + Modifications and additions to the original source code (contained in this file) and all other portions of this file are Copyright (c) 2013-2016 IDRIX and are 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 @@ -33,7 +33,7 @@ namespace VeraCrypt VolumeCreator::~VolumeCreator () { } - + void VolumeCreator::Abort () { AbortRequested = true; diff --git a/src/Core/VolumeCreator.h b/src/Core/VolumeCreator.h index 2c9fff3a..55f51e50 100644 --- a/src/Core/VolumeCreator.h +++ b/src/Core/VolumeCreator.h @@ -3,7 +3,7 @@ Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed by the TrueCrypt License 3.0. - Modifications and additions to the original source code (contained in this file) + Modifications and additions to the original source code (contained in this file) and all other portions of this file are Copyright (c) 2013-2016 IDRIX and are 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 @@ -19,7 +19,7 @@ namespace VeraCrypt { - + struct VolumeCreationOptions { VolumePath Path; -- cgit v1.2.3