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/Keyfiles.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/Keyfiles.h')
| -rw-r--r-- | src/Common/Keyfiles.h | 108 |
1 files changed, 54 insertions, 54 deletions
diff --git a/src/Common/Keyfiles.h b/src/Common/Keyfiles.h index 899cd9e4..c94f1378 100644 --- a/src/Common/Keyfiles.h +++ b/src/Common/Keyfiles.h @@ -1,54 +1,54 @@ -/*
- 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 KEYFILES_H
-#define KEYFILES_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "Common.h"
-
-#define KEYFILE_POOL_SIZE 64
-#define KEYFILE_MAX_READ_LEN (1024*1024)
-
-typedef struct KeyFileStruct
-{
- wchar_t FileName[MAX_PATH + 1];
- struct KeyFileStruct *Next;
-} KeyFile;
-
-typedef struct
-{
- wchar_t VolumeFileName[MAX_PATH + 1];
- BOOL EnableKeyFiles;
- KeyFile *FirstKeyFile;
-} KeyFilesDlgParam;
-
-KeyFile *KeyFileAdd (KeyFile *firstKeyFile, KeyFile *keyFile);
-void KeyFileRemoveAll (KeyFile **firstKeyFile);
-KeyFile *KeyFileClone (KeyFile *keyFile);
-void KeyFileCloneAll (KeyFile *firstKeyFile, KeyFile **outputKeyFile);
-BOOL KeyFilesApply (HWND hwndDlg, Password *password, KeyFile *firstKeyFilem, const wchar_t* volumeFileName);
-BOOL KeyFilesApplyWithPin (HWND hwndDlg, Password *password, char* pin, KeyFile *firstKeyFilem, const wchar_t* volumeFileName);
-
-BOOL CALLBACK KeyFilesDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);
-BOOL KeyfilesPopupMenu (HWND hwndDlg, POINT popupPosition, KeyFilesDlgParam *dialogParam);
-
-extern BOOL HiddenFilesPresentInKeyfilePath;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* #ifndef KEYFILES_H */
+/* + 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 KEYFILES_H +#define KEYFILES_H + +#ifdef __cplusplus +extern "C" { +#endif + +#include "Common.h" + +#define KEYFILE_POOL_SIZE 64 +#define KEYFILE_MAX_READ_LEN (1024*1024) + +typedef struct KeyFileStruct +{ + wchar_t FileName[MAX_PATH + 1]; + struct KeyFileStruct *Next; +} KeyFile; + +typedef struct +{ + wchar_t VolumeFileName[MAX_PATH + 1]; + BOOL EnableKeyFiles; + KeyFile *FirstKeyFile; +} KeyFilesDlgParam; + +KeyFile *KeyFileAdd (KeyFile *firstKeyFile, KeyFile *keyFile); +void KeyFileRemoveAll (KeyFile **firstKeyFile); +KeyFile *KeyFileClone (KeyFile *keyFile); +void KeyFileCloneAll (KeyFile *firstKeyFile, KeyFile **outputKeyFile); +BOOL KeyFilesApply (HWND hwndDlg, Password *password, KeyFile *firstKeyFilem, const wchar_t* volumeFileName); +BOOL KeyFilesApplyWithPin (HWND hwndDlg, Password *password, char* pin, KeyFile *firstKeyFilem, const wchar_t* volumeFileName); + +BOOL CALLBACK KeyFilesDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam); +BOOL KeyfilesPopupMenu (HWND hwndDlg, POINT popupPosition, KeyFilesDlgParam *dialogParam); + +extern BOOL HiddenFilesPresentInKeyfilePath; + +#ifdef __cplusplus +} +#endif + +#endif /* #ifndef KEYFILES_H */ |