VeraCrypt
aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMounir IDRASSI <mounir.idrassi@idrix.fr>2014-07-20 13:15:28 +0200
committerMounir IDRASSI <mounir.idrassi@idrix.fr>2014-11-08 23:21:38 +0100
commit1ddae209326858f1c244a4b52ba2bd068cc8985a (patch)
treea1d3d9f62334a59ca05194fe7b73c7297a7bfc33 /src
parenta5c1978eefe2fd0dbf1ab6b7cdcb019a9b913a40 (diff)
downloadVeraCrypt-1ddae209326858f1c244a4b52ba2bd068cc8985a.tar.gz
VeraCrypt-1ddae209326858f1c244a4b52ba2bd068cc8985a.zip
Correct Linux compilation after removing legacy cryptographic code.
Diffstat (limited to 'src')
-rw-r--r--src/Main/TextUserInterface.cpp2
-rw-r--r--src/Volume/Volume.make2
2 files changed, 1 insertions, 3 deletions
diff --git a/src/Main/TextUserInterface.cpp b/src/Main/TextUserInterface.cpp
index 12647707..d83515f3 100644
--- a/src/Main/TextUserInterface.cpp
+++ b/src/Main/TextUserInterface.cpp
@@ -1166,41 +1166,41 @@ namespace VeraCrypt
options.Password.reset();
}
}
else
{
ShowInfo (e);
options.Password.reset();
}
ShowString (L"\n");
}
catch (PasswordException &e)
{
ShowInfo (e);
options.Password.reset();
}
}
#ifdef TC_LINUX
if (!Preferences.NonInteractive && !Preferences.DisableKernelEncryptionModeWarning
- && volume->EncryptionModeName != L"XTS"
+ && volume->EncryptionModeName != L"XTS")
{
ShowWarning (LangString["ENCRYPTION_MODE_NOT_SUPPORTED_BY_KERNEL"]);
}
#endif
return volume;
}
bool TextUserInterface::OnInit ()
{
try
{
DefaultMessageOutput = new wxMessageOutputStderr;
wxMessageOutput::Set (DefaultMessageOutput);
InterfaceType = UserInterfaceType::Text;
Init();
}
catch (exception &e)
{
diff --git a/src/Volume/Volume.make b/src/Volume/Volume.make
index 528e8876..25c18441 100644
--- a/src/Volume/Volume.make
+++ b/src/Volume/Volume.make
@@ -1,34 +1,32 @@
#
# Copyright (c) 2008-2010 TrueCrypt Developers Association. All rights reserved.
#
# Governed by the TrueCrypt License 3.0 the full text of which is contained in
# the file License.txt included in TrueCrypt binary and source code distribution
# packages.
#
OBJS :=
OBJS += Cipher.o
OBJS += EncryptionAlgorithm.o
OBJS += EncryptionMode.o
-OBJS += EncryptionModeCBC.o
-OBJS += EncryptionModeLRW.o
OBJS += EncryptionModeXTS.o
OBJS += EncryptionTest.o
OBJS += EncryptionThreadPool.o
OBJS += Hash.o
OBJS += Keyfile.o
OBJS += Pkcs5Kdf.o
OBJS += Volume.o
OBJS += VolumeException.o
OBJS += VolumeHeader.o
OBJS += VolumeInfo.o
OBJS += VolumeLayout.o
OBJS += VolumePassword.o
OBJS += VolumePasswordCache.o
ifeq "$(CPU_ARCH)" "x86"
OBJS += ../Crypto/Aes_x86.o
OBJS += ../Crypto/Aes_hw_cpu.o
ifeq "$(PLATFORM)" "MacOSX"
OBJS += ../Crypto/Aescrypt.o
endif