diff options
author | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2016-05-10 22:34:27 +0200 |
---|---|---|
committer | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2016-05-10 22:34:27 +0200 |
commit | 268ef2d8e904db5068dbdc0fdc7ce3940d6452ea (patch) | |
tree | b1afa687c97fbf5e1ba2c92c5a10479ae5f832f5 /src/Common/Common.h | |
parent | 6d61f06a5348aebe7dbc0bf44d3e2729c20f7fd0 (diff) | |
parent | 5f47d8b6f11cdb3c4c2f43e04e5acfc6ffcb3035 (diff) | |
download | VeraCrypt-268ef2d8e904db5068dbdc0fdc7ce3940d6452ea.tar.gz VeraCrypt-268ef2d8e904db5068dbdc0fdc7ce3940d6452ea.zip |
Merge pull request #61 from davidfoerster/normalize-line-terminators
Normalize line terminators
Diffstat (limited to 'src/Common/Common.h')
-rw-r--r-- | src/Common/Common.h | 190 |
1 files changed, 95 insertions, 95 deletions
diff --git a/src/Common/Common.h b/src/Common/Common.h index 180cbffb..cd88882f 100644 --- a/src/Common/Common.h +++ b/src/Common/Common.h @@ -1,95 +1,95 @@ -/*
- Derived from source code of TrueCrypt 7.1a, which is
- 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)
- 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
- code distribution packages.
-*/
-
-#ifndef COMMON_H
-#define COMMON_H
-
-#include "Crypto.h"
-
-#define MIN_MOUNTED_VOLUME_DRIVE_NUMBER ('A' - 'A')
-#define MAX_MOUNTED_VOLUME_DRIVE_NUMBER ('Z' - 'A')
-
-#define MAX_HOST_DRIVE_NUMBER 64
-#define MAX_HOST_PARTITION_NUMBER 32
-
-#define VOLUME_ID_SIZE SHA256_DIGESTSIZE
-
-typedef enum
-{
- // IMPORTANT: If you add a new item here, update IsOSVersionAtLeast().
-
- WIN_UNKNOWN = 0,
- WIN_31,
- WIN_95,
- WIN_98,
- WIN_ME,
- WIN_NT3,
- WIN_NT4,
- WIN_2000,
- WIN_XP,
- WIN_XP64,
- WIN_SERVER_2003,
- WIN_VISTA,
- WIN_SERVER_2008,
- WIN_7,
- WIN_SERVER_2008_R2,
- WIN_8,
- WIN_SERVER_2012,
- WIN_8_1,
- WIN_SERVER_2012_R2,
- WIN_10,
- WIN_SERVER_2016
-} OSVersionEnum;
-
-/* Volume types */
-enum
-{
- TC_VOLUME_TYPE_NORMAL = 0,
- TC_VOLUME_TYPE_HIDDEN,
- TC_VOLUME_TYPE_COUNT
-};
-
-/* Prop volume types */
-enum
-{
- PROP_VOL_TYPE_NORMAL = 0,
- PROP_VOL_TYPE_HIDDEN,
- PROP_VOL_TYPE_OUTER, /* Outer/normal (hidden volume protected) */
- PROP_VOL_TYPE_OUTER_VOL_WRITE_PREVENTED, /* Outer/normal (hidden volume protected AND write already prevented) */
- PROP_VOL_TYPE_SYSTEM,
- PROP_NBR_VOLUME_TYPES
-};
-
-/* Hidden volume protection status */
-enum
-{
- HIDVOL_PROT_STATUS_NONE = 0,
- HIDVOL_PROT_STATUS_ACTIVE,
- HIDVOL_PROT_STATUS_ACTION_TAKEN /* Active + action taken (write operation has already been denied) */
-};
-
-typedef struct
-{
- BOOL ReadOnly;
- BOOL Removable;
- BOOL ProtectHiddenVolume;
- BOOL PreserveTimestamp;
- BOOL PartitionInInactiveSysEncScope; /* If TRUE, we are to attempt to mount a partition located on an encrypted system drive without pre-boot authentication. */
- Password ProtectedHidVolPassword; /* Password of hidden volume to protect against overwriting */
- BOOL UseBackupHeader;
- BOOL RecoveryMode;
- int ProtectedHidVolPkcs5Prf;
- int ProtectedHidVolPim;
- wchar_t Label[33]; /* maximum label length is 32 for NTFS and 11 for FAT32 */
-} MountOptions;
-
-#endif
+/* + Derived from source code of TrueCrypt 7.1a, which is + 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) + 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 + code distribution packages. +*/ + +#ifndef COMMON_H +#define COMMON_H + +#include "Crypto.h" + +#define MIN_MOUNTED_VOLUME_DRIVE_NUMBER ('A' - 'A') +#define MAX_MOUNTED_VOLUME_DRIVE_NUMBER ('Z' - 'A') + +#define MAX_HOST_DRIVE_NUMBER 64 +#define MAX_HOST_PARTITION_NUMBER 32 + +#define VOLUME_ID_SIZE SHA256_DIGESTSIZE + +typedef enum +{ + // IMPORTANT: If you add a new item here, update IsOSVersionAtLeast(). + + WIN_UNKNOWN = 0, + WIN_31, + WIN_95, + WIN_98, + WIN_ME, + WIN_NT3, + WIN_NT4, + WIN_2000, + WIN_XP, + WIN_XP64, + WIN_SERVER_2003, + WIN_VISTA, + WIN_SERVER_2008, + WIN_7, + WIN_SERVER_2008_R2, + WIN_8, + WIN_SERVER_2012, + WIN_8_1, + WIN_SERVER_2012_R2, + WIN_10, + WIN_SERVER_2016 +} OSVersionEnum; + +/* Volume types */ +enum +{ + TC_VOLUME_TYPE_NORMAL = 0, + TC_VOLUME_TYPE_HIDDEN, + TC_VOLUME_TYPE_COUNT +}; + +/* Prop volume types */ +enum +{ + PROP_VOL_TYPE_NORMAL = 0, + PROP_VOL_TYPE_HIDDEN, + PROP_VOL_TYPE_OUTER, /* Outer/normal (hidden volume protected) */ + PROP_VOL_TYPE_OUTER_VOL_WRITE_PREVENTED, /* Outer/normal (hidden volume protected AND write already prevented) */ + PROP_VOL_TYPE_SYSTEM, + PROP_NBR_VOLUME_TYPES +}; + +/* Hidden volume protection status */ +enum +{ + HIDVOL_PROT_STATUS_NONE = 0, + HIDVOL_PROT_STATUS_ACTIVE, + HIDVOL_PROT_STATUS_ACTION_TAKEN /* Active + action taken (write operation has already been denied) */ +}; + +typedef struct +{ + BOOL ReadOnly; + BOOL Removable; + BOOL ProtectHiddenVolume; + BOOL PreserveTimestamp; + BOOL PartitionInInactiveSysEncScope; /* If TRUE, we are to attempt to mount a partition located on an encrypted system drive without pre-boot authentication. */ + Password ProtectedHidVolPassword; /* Password of hidden volume to protect against overwriting */ + BOOL UseBackupHeader; + BOOL RecoveryMode; + int ProtectedHidVolPkcs5Prf; + int ProtectedHidVolPim; + wchar_t Label[33]; /* maximum label length is 32 for NTFS and 11 for FAT32 */ +} MountOptions; + +#endif |