VeraCrypt
aboutsummaryrefslogtreecommitdiff
path: root/src/Main/UserInterface.cpp
diff options
context:
space:
mode:
authorMounir IDRASSI <mounir.idrassi@idrix.fr>2015-12-30 05:57:34 (GMT)
committerMounir IDRASSI <mounir.idrassi@idrix.fr>2015-12-31 00:56:19 (GMT)
commit0c2c0a846d42b05b44d62a3c3fcaf410660f8a4d (patch)
treeedd8f33dae61b4d1ae304a1ef613b23186bc3dc8 /src/Main/UserInterface.cpp
parentd462806ea970434ab9f09748f74a86608e1fb31e (diff)
downloadVeraCrypt-0c2c0a846d42b05b44d62a3c3fcaf410660f8a4d.zip
VeraCrypt-0c2c0a846d42b05b44d62a3c3fcaf410660f8a4d.tar.gz
Cryptography: Optimize Whirlpool implementation by using public domain assembly code developed by Wei Dai
Diffstat (limited to 'src/Main/UserInterface.cpp')
-rw-r--r--src/Main/UserInterface.cpp10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/Main/UserInterface.cpp b/src/Main/UserInterface.cpp
index 2be5bc7..1648d94 100644
--- a/src/Main/UserInterface.cpp
+++ b/src/Main/UserInterface.cpp
@@ -15,6 +15,7 @@
#include <typeinfo>
#include <wx/apptrait.h>
#include <wx/cmdline.h>
+#include "Crypto/cpu.h"
#include "Platform/PlatformTest.h"
#ifdef TC_UNIX
#include <errno.h>
@@ -504,6 +505,9 @@ namespace VeraCrypt
SetAppName (Application::GetName());
SetClassName (Application::GetName());
+#ifdef CRYPTOPP_CPUID_AVAILABLE
+ DetectX86Features ();
+#endif
LangString.Init();
Core->Init();
@@ -834,10 +838,8 @@ namespace VeraCrypt
#else
// MIME handler for directory seems to be unavailable through wxWidgets
wxString desktop = GetTraits()->GetDesktopEnvironment();
- bool xdgOpenPresent = wxFileName::IsFileExecutable (wxT("/usr/bin/xdg-open"));
- bool nautilusPresent = wxFileName::IsFileExecutable (wxT("/usr/bin/nautilus"));
- if (desktop == L"GNOME" || (desktop.empty() && !xdgOpenPresent && nautilusPresent))
+ if (desktop == L"GNOME")
{
args.push_back ("--no-default-window");
args.push_back ("--no-desktop");
@@ -870,7 +872,7 @@ namespace VeraCrypt
catch (exception &e) { ShowError (e); }
}
}
- else if (xdgOpenPresent)
+ else if (wxFileName::IsFileExecutable (wxT("/usr/bin/xdg-open")))
{
// Fallback on the standard xdg-open command
// which is not always available by default