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/Volume/EncryptionAlgorithm.cpp | |
| 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/Volume/EncryptionAlgorithm.cpp')
| -rw-r--r-- | src/Volume/EncryptionAlgorithm.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/Volume/EncryptionAlgorithm.cpp b/src/Volume/EncryptionAlgorithm.cpp index 18d12602..77ed8807 100644 --- a/src/Volume/EncryptionAlgorithm.cpp +++ b/src/Volume/EncryptionAlgorithm.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 @@ -60,7 +60,7 @@ namespace VeraCrypt EncryptionAlgorithmList EncryptionAlgorithm::GetAvailableAlgorithms () { EncryptionAlgorithmList l; - + l.push_back (shared_ptr <EncryptionAlgorithm> (new AES ())); l.push_back (shared_ptr <EncryptionAlgorithm> (new Serpent ())); l.push_back (shared_ptr <EncryptionAlgorithm> (new Twofish ())); @@ -98,7 +98,7 @@ namespace VeraCrypt return keySize; } - + size_t EncryptionAlgorithm::GetMaxBlockSize () const { size_t blockSize = 0; @@ -148,10 +148,10 @@ namespace VeraCrypt name += wstring (L"("); else name += wstring (L"-"); - name += c.GetName(); + name += c.GetName(); } } - + if (forGuiDisplay && depth) { for (int i = 0; i < depth; i++) @@ -177,7 +177,7 @@ namespace VeraCrypt return supported; } - + bool EncryptionAlgorithm::IsModeSupported (const shared_ptr <EncryptionMode> mode) const { return IsModeSupported (*mode); @@ -191,7 +191,7 @@ namespace VeraCrypt mode->SetCiphers (Ciphers); Mode = mode; } - + void EncryptionAlgorithm::SetKey (const ConstBufferPtr &key) { if (Ciphers.size() < 1) |