From 17d807bbb3fea6e3b4d4f5583746a8ffedfcc81e Mon Sep 17 00:00:00 2001
From: LoRd_MuldeR <mulder2@gmx.de>
Date: Sun, 7 Nov 2021 21:18:33 +0100
Subject: [PATCH] Added runtime CPU detection for SSE2 capability to the GUI
 front-end.

---
 .../cpu-capabilities/cpu-capabilities-x64.dll | Bin 0 -> 7168 bytes
 .../cpu-capabilities/cpu-capabilities-x86.dll | Bin 0 -> 6656 bytes
 frontend/SlunkCrypt.vcxproj                   |   5 +-
 gui/Process/SlunkCryptRunner.cs               |  18 +-
 gui/Properties/AssemblyInfo.cs                |   4 +-
 gui/SlunkCryptGUI.csproj                      |   5 +
 gui/SlunkCryptGUI.xaml.cs                     |  15 +-
 gui/Utilities/CPU/CPUCapabilities.cs          | 378 ++++++++++++++++++
 gui/Utilities/CPUFeatures.cs                  |  41 ++
 gui/Utilities/ProcessRunner.cs                |   1 -
 libslunkcrypt/libSlunkCrypt.vcxproj           |   5 +-
 libslunkcrypt/src/version.h                   |   2 +-
 mk-profiled.cmd                               |   7 +-
 mk-profiled.sh                                |   1 -
 14 files changed, 454 insertions(+), 28 deletions(-)
 create mode 100644 etc/deps/cpu-capabilities/cpu-capabilities-x64.dll
 create mode 100644 etc/deps/cpu-capabilities/cpu-capabilities-x86.dll
 create mode 100644 gui/Utilities/CPU/CPUCapabilities.cs
 create mode 100644 gui/Utilities/CPUFeatures.cs

diff --git a/etc/deps/cpu-capabilities/cpu-capabilities-x64.dll b/etc/deps/cpu-capabilities/cpu-capabilities-x64.dll
new file mode 100644
index 0000000000000000000000000000000000000000..d483af3c91e7a8e26739e97b84b0664a0cd280c2
GIT binary patch
literal 7168
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

literal 0
HcmV?d00001

diff --git a/etc/deps/cpu-capabilities/cpu-capabilities-x86.dll b/etc/deps/cpu-capabilities/cpu-capabilities-x86.dll
new file mode 100644
index 0000000000000000000000000000000000000000..7a47a83cb799a097f0104dd2b6057f475fa77a9c
GIT binary patch
literal 6656
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

literal 0
HcmV?d00001

diff --git a/frontend/SlunkCrypt.vcxproj b/frontend/SlunkCrypt.vcxproj
index 4a01308..89b4589 100644
--- a/frontend/SlunkCrypt.vcxproj
+++ b/frontend/SlunkCrypt.vcxproj
@@ -209,7 +209,7 @@
     <LinkIncremental>false</LinkIncremental>
     <OutDir>$(SolutionDir)bin\$(Configuration)\</OutDir>
     <IntDir>$(SolutionDir)obj\$(Configuration)\$(PlatformShortName)\$(ProjectName)\</IntDir>
-    <TargetName>slunkcrypt-cli-$(PlatformShortName)</TargetName>
+    <TargetName>slunkcrypt-cli-$(PlatformShortName)-sse2</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WithDbgInfo|Win32'">
     <LinkIncremental>false</LinkIncremental>
@@ -239,7 +239,7 @@
     <LinkIncremental>false</LinkIncremental>
     <OutDir>$(SolutionDir)bin\$(Configuration)\</OutDir>
     <IntDir>$(SolutionDir)obj\$(Configuration)\$(PlatformShortName)\$(ProjectName)\</IntDir>
-    <TargetName>slunkcrypt-cli-$(PlatformShortName)</TargetName>
+    <TargetName>slunkcrypt-cli-$(PlatformShortName)-sse2</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WithDbgInfo|x64'">
     <LinkIncremental>false</LinkIncremental>
@@ -421,6 +421,7 @@
       <FloatingPointModel>Fast</FloatingPointModel>
       <DisableSpecificWarnings>4706;4204</DisableSpecificWarnings>
       <CreateHotpatchableImage>false</CreateHotpatchableImage>
+      <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
diff --git a/gui/Process/SlunkCryptRunner.cs b/gui/Process/SlunkCryptRunner.cs
index 15c6722..68294a6 100644
--- a/gui/Process/SlunkCryptRunner.cs
+++ b/gui/Process/SlunkCryptRunner.cs
@@ -25,6 +25,7 @@ namespace com.muldersoft.slunkcrypt.gui.process
         private const string COMMAND_DECRYPT = "-d";
 
         private static readonly Regex RX_PROGRESS = new Regex(@"(\d+)\.(\d)%", RegexOptions.Compiled);
+
         private readonly FileStream m_executableFile;
 
         // =============================================================================
@@ -77,15 +78,20 @@ namespace com.muldersoft.slunkcrypt.gui.process
         {
             FileStream executableFile = null;
             string appBaseDirectory = AppDomain.CurrentDomain.BaseDirectory;
-            if (Environment.Is64BitOperatingSystem)
+            CPUFeatures cpuFeatures = CPUFeatures.Features;
+            if (cpuFeatures.x64 && CheckExecutableFile(ref executableFile, appBaseDirectory, "x64"))
             {
-                if (CheckExecutableFile(ref executableFile, appBaseDirectory, "x64"))
-                {
-                    return executableFile;
-                }
+                Trace.Assert(executableFile != null);
+                return executableFile;
+            }
+            if (cpuFeatures.sse2 && CheckExecutableFile(ref executableFile, appBaseDirectory, "x86-sse2"))
+            {
+                Trace.Assert(executableFile != null);
+                return executableFile;
             }
             if (CheckExecutableFile(ref executableFile, appBaseDirectory, "x86"))
             {
+                Trace.Assert(executableFile != null);
                 return executableFile;
             }
             throw new ExecutableNotFoundException("SlunkCrypt executable file not found!", FILENAME_FORMAT);
@@ -140,7 +146,7 @@ namespace com.muldersoft.slunkcrypt.gui.process
             return double.NaN;
         }
 
-        private string GetCommandString(Mode mode)
+        private static string GetCommandString(Mode mode)
         {
             switch(mode)
             {
diff --git a/gui/Properties/AssemblyInfo.cs b/gui/Properties/AssemblyInfo.cs
index 18fe4fc..c8c31b5 100644
--- a/gui/Properties/AssemblyInfo.cs
+++ b/gui/Properties/AssemblyInfo.cs
@@ -19,5 +19,5 @@ using System.Windows;
 [assembly: ComVisible(false)]
 [assembly: ThemeInfo(ResourceDictionaryLocation.None, ResourceDictionaryLocation.SourceAssembly)]
 
-[assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.1.*")]
+[assembly: AssemblyFileVersion("1.1.0.0")]
diff --git a/gui/SlunkCryptGUI.csproj b/gui/SlunkCryptGUI.csproj
index 55426de..9c7ae44 100644
--- a/gui/SlunkCryptGUI.csproj
+++ b/gui/SlunkCryptGUI.csproj
@@ -79,8 +79,10 @@
     <Compile Include="Controls\PasswordToggleBox.xaml.cs">
       <DependentUpon>PasswordToggleBox.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Utilities\CPUFeatures.cs" />
     <Compile Include="Process\SlunkCryptRunner.cs" />
     <Compile Include="Utilities\BusyManager.cs" />
+    <Compile Include="Utilities\CPU\CPUCapabilities.cs" />
     <Compile Include="Utilities\PathUtils.cs" />
     <Compile Include="Utilities\SecureRandom.cs" />
     <Compile Include="Utilities\SystemMenu.cs" />
@@ -187,6 +189,9 @@
     <Resource Include="Resources\Refresh.png" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PostBuildEvent>copy /Y "$(SolutionDir)\etc\deps\cpu-capabilities\*.dll" "$(TargetDir)"</PostBuildEvent>
+  </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/gui/SlunkCryptGUI.xaml.cs b/gui/SlunkCryptGUI.xaml.cs
index 20a89bc..d7a098a 100644
--- a/gui/SlunkCryptGUI.xaml.cs
+++ b/gui/SlunkCryptGUI.xaml.cs
@@ -58,9 +58,9 @@ namespace com.muldersoft.slunkcrypt.gui
         {
             InitializeComponent();
             m_defaultStatusText = Label_Status.Text;
-            m_dispatcherTimer = new DispatcherTimer(DispatcherPriority.ApplicationIdle, Dispatcher);
+            m_dispatcherTimer = new DispatcherTimer(DispatcherPriority.SystemIdle, Dispatcher);
             m_dispatcherTimer.Tick += DispatcherTimer_Tick;
-            m_dispatcherTimer.Interval = TimeSpan.FromMilliseconds(150);
+            m_dispatcherTimer.Interval = TimeSpan.FromMilliseconds(125);
             m_logFileReadOnly = new ReadOnlyObservableCollection<string>(m_logFile);
         }
 
@@ -794,6 +794,7 @@ namespace com.muldersoft.slunkcrypt.gui
 
         private static string CreateAboutText()
         {
+            CPUFeatures cpuFeatures = CPUFeatures.Features;
             return new StringBuilder()
                 .AppendLine("SlunkCrypt, by LoRd_MuldeR <MuldeR2@GMX.de>")
                 .AppendLine(VersionInfo.VersionStr)
@@ -803,10 +804,11 @@ namespace com.muldersoft.slunkcrypt.gui
                 .AppendLine("https://gitlab.com/lord_mulder/slunkcrypt/")
                 .AppendLine()
                 .AppendLine("Operating System: " + Environment.OSVersion.VersionString)
+                .AppendLine(string.Format("Operating System Bitness: {0:D}, Process Bitness: {1:D}", Environment.Is64BitOperatingSystem ? 64 : 32, Environment.Is64BitProcess ? 64 : 32))
                 .AppendLine(".NET Runtime Version: " + Environment.Version)
-                .AppendLine(string.Format("Processor Count: {0:D}, System Bitness: {1:D}, Process Bitness: {2:D}", Environment.ProcessorCount, Environment.Is64BitOperatingSystem ? 64 : 32, Environment.Is64BitProcess ? 64 : 32))
+                .AppendLine(string.Format("CPU Count: {0:D}, Architecture: {1}, SSE2 Supported: {2}", Environment.ProcessorCount, cpuFeatures.x64 ? "x64" : "x86", cpuFeatures.sse2 ? "Yes" : "No"))
                 .AppendLine()
-                .AppendLine("Using “Silk” icons, by Mark James (famfamfam.com)")
+                .AppendLine("Using “Silk” icons, by Mark James")
                 .ToString();
         }
 
@@ -976,10 +978,5 @@ namespace com.muldersoft.slunkcrypt.gui
             Keyboard.ClearFocus();
             element.Focus();
         }
-
-        private static string TrimToEmpty(string str)
-        {
-            return string.IsNullOrEmpty(str) ? string.Empty : str.Trim();
-        }
     }
 }
diff --git a/gui/Utilities/CPU/CPUCapabilities.cs b/gui/Utilities/CPU/CPUCapabilities.cs
new file mode 100644
index 0000000..a9df899
--- /dev/null
+++ b/gui/Utilities/CPU/CPUCapabilities.cs
@@ -0,0 +1,378 @@
+/******************************************************************************/
+/* CPUCapabilities.NET, by LoRd_MuldeR <MuldeR2@GMX.de>                       */
+/* This work has been released under the CC0 1.0 Universal license!           */
+/******************************************************************************/
+
+using System;
+using System.Runtime.InteropServices;
+using System.Text;
+
+namespace com.muldersoft.slunkcrypt.gui.utils.cpu
+{
+    // ==================================================================
+    // CPU Flags
+    // ==================================================================
+
+    public enum CPUArchitecture : uint
+    {
+        CPU_ARCH_X86 = 0x00000001,
+        CPU_ARCH_X64 = 0x00000002
+    }
+
+    [Flags]
+    public enum CPUCapabilities : ulong
+    {
+        CPU_3DNOW            = 0x0000000000000001,
+        CPU_3DNOWEXT         = 0x0000000000000002,
+        CPU_ADX              = 0x0000000000000004,
+        CPU_AES              = 0x0000000000000008,
+        CPU_AVX              = 0x0000000000000010,
+        CPU_AVX2             = 0x0000000000000020,
+        CPU_AVX512_BITALG    = 0x0000000000000040,
+        CPU_AVX512_BW        = 0x0000000000000080,
+        CPU_AVX512_CD        = 0x0000000000000100,
+        CPU_AVX512_DQ        = 0x0000000000000200,
+        CPU_AVX512_ER        = 0x0000000000000400,
+        CPU_AVX512_F         = 0x0000000000000800,
+        CPU_AVX512_IFMA      = 0x0000000000001000,
+        CPU_AVX512_PF        = 0x0000000000002000,
+        CPU_AVX512_VBMI      = 0x0000000000004000,
+        CPU_AVX512_VBMI2     = 0x0000000000008000,
+        CPU_AVX512_VL        = 0x0000000000010000,
+        CPU_AVX512_VNNI      = 0x0000000000020000,
+        CPU_AVX512_VPOPCNTDQ = 0x0000000000040000,
+        CPU_BMI1             = 0x0000000000080000,
+        CPU_BMI2             = 0x0000000000100000,
+        CPU_CLFSH            = 0x0000000000200000,
+        CPU_CMOV             = 0x0000000000400000,
+        CPU_CX16             = 0x0000000000800000,
+        CPU_CX8              = 0x0000000001000000,
+        CPU_ERMS             = 0x0000000002000000,
+        CPU_FMA3             = 0x0000000004000000,
+        CPU_FMA4             = 0x0000000008000000,
+        CPU_FPU              = 0x0000000010000000,
+        CPU_FSGSBASE         = 0x0000000020000000,
+        CPU_FXSR             = 0x0000000040000000,
+        CPU_HLE              = 0x0000000080000000,
+        CPU_HTT              = 0x0000000100000000,
+        CPU_INVPCID          = 0x0000000200000000,
+        CPU_LAHF             = 0x0000000400000000,
+        CPU_LZCNT            = 0x0000000800000000,
+        CPU_MMX              = 0x0000001000000000,
+        CPU_MMXEXT           = 0x0000002000000000,
+        CPU_MONITOR          = 0x0000004000000000,
+        CPU_MOVBE            = 0x0000008000000000,
+        CPU_MSR              = 0x0000010000000000,
+        CPU_OSXSAVE          = 0x0000020000000000,
+        CPU_PCLMULQDQ        = 0x0000040000000000,
+        CPU_POPCNT           = 0x0000080000000000,
+        CPU_PREFETCHWT1      = 0x0000100000000000,
+        CPU_RDRND            = 0x0000200000000000,
+        CPU_RDSEED           = 0x0000400000000000,
+        CPU_RDTSCP           = 0x0000800000000000,
+        CPU_RTM              = 0x0001000000000000,
+        CPU_SEP              = 0x0002000000000000,
+        CPU_SHA              = 0x0004000000000000,
+        CPU_SSE              = 0x0008000000000000,
+        CPU_SSE2             = 0x0010000000000000,
+        CPU_SSE3             = 0x0020000000000000,
+        CPU_SSE41            = 0x0040000000000000,
+        CPU_SSE42            = 0x0080000000000000,
+        CPU_SSE4a            = 0x0100000000000000,
+        CPU_SSSE3            = 0x0200000000000000,
+        CPU_SYSCALL          = 0x0400000000000000,
+        CPU_TBM              = 0x0800000000000000,
+        CPU_TSC              = 0x1000000000000000,
+        CPU_XOP              = 0x2000000000000000,
+        CPU_XSAVE            = 0x4000000000000000
+    }
+
+    // ==================================================================
+    // CPUInformation
+    // ==================================================================
+
+    public struct CPUInformation
+    {
+        public CPUInformation(byte type, byte familyExt, byte family, byte modelExt, byte model, byte stepping)
+        {
+            Type         = type;
+            RawFamily    = family;
+            RawFamilyExt = familyExt;
+            RawModel     = model;
+            RawModelExt  = modelExt;
+            Stepping     = stepping;
+        }
+
+        public byte Type         { get; }
+        public byte RawFamily    { get; }
+        public byte RawFamilyExt { get; }
+        public byte RawModel     { get; }
+        public byte RawModelExt  { get; }
+        public byte Stepping     { get; }
+
+        public uint Family
+        {
+            get { return (RawFamily == 15U) ? (((uint)RawFamilyExt) + RawFamily) : RawFamily; }
+        }
+
+        public uint Model
+        {
+            get { return ((RawFamily == 6U) || (RawFamily == 15U)) ? ((((uint)RawModelExt) << 4) + RawModel) : RawModel; }
+        }
+
+        public override String ToString()
+        {
+            return String.Format("Type={0}, Family={1}, Model={2}, Stepping={3}", Type, Family, Model, Stepping);
+        }
+    }
+
+    // ==================================================================
+    // CPU class
+    // ==================================================================
+
+    public static class CPU
+    {
+        private static readonly Lazy<bool> m_x64Process = new Lazy<bool>(() => Environment.Is64BitProcess);
+        private static readonly Lazy<CPUArchitecture> m_architecture = new Lazy<CPUArchitecture>(GetCPUArchitecture);
+        private static readonly Lazy<uint> m_count = new Lazy<uint>(GetCPUCount);
+        private static readonly Lazy<CPUInformation> m_information = new Lazy<CPUInformation>(GetCPUInformation);
+        private static readonly Lazy<string> m_vendor = new Lazy<string>(GetCPUVendorString);
+        private static readonly Lazy<CPUCapabilities> m_capabilities = new Lazy<CPUCapabilities>(GetCPUCapabilities);
+        private static readonly Lazy<Tuple<ushort, ushort>> m_libraryVersion = new Lazy<Tuple<ushort, ushort>>(GetCPULibraryVersion);
+        private static readonly Lazy<string> m_brand = new Lazy<string>(GetCPUBrandString);
+
+        private static readonly Tuple<ushort, ushort> REQUIRED_LIBRARY_VERSION = Tuple.Create<ushort, ushort>(2, 0);
+
+        // ------------------------------------------------------------------
+        // Properties
+        // ------------------------------------------------------------------
+
+        public static bool IsX64Process
+        {
+            get { return m_x64Process.Value; }
+        }
+
+        public static CPUArchitecture Architecture
+        {
+            get { return m_architecture.Value; }
+        }
+
+        public static uint Count
+        {
+            get { return m_count.Value; }
+        }
+
+        public static string Vendor
+        {
+            get { return m_vendor.Value; }
+        }
+
+        public static CPUInformation Information
+        {
+            get { return m_information.Value; }
+        }
+
+        public static CPUCapabilities Capabilities
+        {
+            get { return m_capabilities.Value; }
+        }
+
+        public static string Brand
+        {
+            get { return m_brand.Value; }
+        }
+
+        public static Tuple<ushort, ushort> LibraryVersion
+        {
+            get { return m_libraryVersion.Value; }
+        }
+
+        // ------------------------------------------------------------------
+        // Initialization methods
+        // ------------------------------------------------------------------
+
+        private static CPUArchitecture GetCPUArchitecture()
+        {
+            try
+            {
+                VerifyLibraryVersion();
+                uint value = IsX64Process ? Internal.GetCPUArchitectureX64() : Internal.GetCPUArchitectureX86();
+                return (CPUArchitecture)value;
+            }
+            catch (Exception e)
+            {
+                throw new SystemException("Failed to determine CPU architecture!", e);
+            }
+        }
+
+        private static uint GetCPUCount()
+        {
+            try
+            {
+                VerifyLibraryVersion();
+                return IsX64Process ? Internal.GetCPUCountX64() : Internal.GetCPUCountX86();
+            }
+            catch (Exception e)
+            {
+                throw new SystemException("Failed to determine CPU count!", e);
+            }
+        }
+
+        private static string GetCPUVendorString()
+        {
+            const uint BUFFER_SIZE = 13;
+            try
+            {
+                byte[] buffer = new byte[BUFFER_SIZE];
+                VerifyLibraryVersion();
+                if (IsX64Process ? Internal.GetCPUVendorStringX64(buffer, BUFFER_SIZE) : Internal.GetCPUVendorStringX86(buffer, BUFFER_SIZE))
+                {
+                    return AllocateAsciiString(buffer);
+                }
+                return string.Empty;
+            }
+            catch (Exception e)
+            {
+                throw new SystemException("Failed to determine CPU vendor string!", e);
+            }
+        }
+
+        private static CPUInformation GetCPUInformation()
+        {
+            try
+            {
+                byte type, familyExt, family, modelExt, model, stepping;
+                VerifyLibraryVersion();
+                if (IsX64Process ? Internal.GetCPUInformationX64(out type, out familyExt, out family, out modelExt, out model, out stepping) : Internal.GetCPUInformationX86(out type, out familyExt, out family, out modelExt, out model, out stepping))
+                {
+                    return new CPUInformation(type, familyExt, family, modelExt, model, stepping);
+                }
+                return new CPUInformation(0, 0, 0, 0, 0, 0);
+            }
+            catch (Exception e)
+            {
+                throw new SystemException("Failed to determine CPU family and model!", e);
+            }
+        }
+
+        private static CPUCapabilities GetCPUCapabilities()
+        {
+            try
+            {
+                VerifyLibraryVersion();
+                ulong value = IsX64Process ? Internal.GetCPUCapabilitiesX64() : Internal.GetCPUCapabilitiesX86();
+                return (CPUCapabilities)value;
+            }
+            catch (Exception e)
+            {
+                throw new SystemException("Failed to determine CPU capabilities!", e);
+            }
+        }
+
+        private static string GetCPUBrandString()
+        {
+            const uint BUFFER_SIZE = 48;
+            try
+            {
+                byte[] buffer = new byte[BUFFER_SIZE];
+                VerifyLibraryVersion();
+                if (IsX64Process ? Internal.GetCPUBrandStringX64(buffer, BUFFER_SIZE) : Internal.GetCPUBrandStringX86(buffer, BUFFER_SIZE))
+                {
+                    return AllocateAsciiString(buffer);
+                }
+                return string.Empty;
+            }
+            catch (Exception e)
+            {
+                throw new SystemException("Failed to determine CPU brand string!", e);
+            }
+        }
+
+        private static Tuple<ushort, ushort> GetCPULibraryVersion()
+        {
+            try
+            {
+                uint value = IsX64Process ? Internal.GetCPULibraryVersionX64() : Internal.GetCPULibraryVersionX86();
+                return Tuple.Create((ushort)((value >> 16) & 0xFFFF), (ushort)(value & 0xFFFF));
+            }
+            catch (Exception e)
+            {
+                throw new SystemException("Failed to determine CPU library version!", e);
+            }
+        }
+
+        // ------------------------------------------------------------------
+        // P/Invoke methods
+        // ------------------------------------------------------------------
+
+        private class Internal
+        {
+            const string DLL_NAME_X86 = "cpu-capabilities-x86.dll";
+            const string DLL_NAME_X64 = "cpu-capabilities-x64.dll";
+
+            /* GetCPUArchitecture() */
+            [DllImport(DLL_NAME_X64, CallingConvention = CallingConvention.Cdecl)]
+            public static extern uint GetCPUArchitectureX64();
+            [DllImport(DLL_NAME_X86, CallingConvention = CallingConvention.Cdecl)]
+            public static extern uint GetCPUArchitectureX86();
+
+            /* GetCPUCount() */
+            [DllImport(DLL_NAME_X64, CallingConvention = CallingConvention.Cdecl)]
+            public static extern uint GetCPUCountX64();
+            [DllImport(DLL_NAME_X86, CallingConvention = CallingConvention.Cdecl)]
+            public static extern uint GetCPUCountX86();
+
+            /* GetCPUVendorString() */
+            [DllImport(DLL_NAME_X64, CallingConvention = CallingConvention.Cdecl)]
+            public static extern bool GetCPUVendorStringX64([Out] byte[] buffer, uint size);
+            [DllImport(DLL_NAME_X86, CallingConvention = CallingConvention.Cdecl)]
+            public static extern bool GetCPUVendorStringX86([Out] byte[] buffer, uint size);
+
+            /* GetCPUInformation() */
+            [DllImport(DLL_NAME_X64, CallingConvention = CallingConvention.Cdecl)]
+            public static extern bool GetCPUInformationX64(out byte type, out byte familyExt, out byte family, out byte modelExt, out byte model, out byte stepping);
+            [DllImport(DLL_NAME_X86, CallingConvention = CallingConvention.Cdecl)]
+            public static extern bool GetCPUInformationX86(out byte type, out byte familyExt, out byte family, out byte modelExt, out byte model, out byte stepping);
+
+            /* GetCPUCapabilities() */
+            [DllImport(DLL_NAME_X64, CallingConvention = CallingConvention.Cdecl)]
+            public static extern ulong GetCPUCapabilitiesX64();
+            [DllImport(DLL_NAME_X86, CallingConvention = CallingConvention.Cdecl)]
+            public static extern ulong GetCPUCapabilitiesX86();
+
+            /* GetCPUBrandString() */
+            [DllImport(DLL_NAME_X64, CallingConvention = CallingConvention.Cdecl)]
+            public static extern bool GetCPUBrandStringX64([Out] byte[] buffer, uint size);
+            [DllImport(DLL_NAME_X86, CallingConvention = CallingConvention.Cdecl)]
+            public static extern bool GetCPUBrandStringX86([Out] byte[] buffer, uint size);
+
+            /* GetCPULibraryVersion() */
+            [DllImport(DLL_NAME_X64, CallingConvention = CallingConvention.Cdecl)]
+            public static extern uint GetCPULibraryVersionX64();
+            [DllImport(DLL_NAME_X86, CallingConvention = CallingConvention.Cdecl)]
+            public static extern uint GetCPULibraryVersionX86();
+        }
+
+        // ------------------------------------------------------------------
+        // Utility methods
+        // ------------------------------------------------------------------
+
+        private static void VerifyLibraryVersion()
+        {
+            if ((LibraryVersion.Item1 != REQUIRED_LIBRARY_VERSION.Item1) || (LibraryVersion.Item2 < REQUIRED_LIBRARY_VERSION.Item2))
+            {
+                throw new InvalidOperationException(string.Format("CPU library version {0} is not supported! (required version: {1})", m_libraryVersion.Value.Item1, REQUIRED_LIBRARY_VERSION));
+            }
+        }
+
+        private static string AllocateAsciiString(byte[] buffer)
+        {
+            int index = Array.IndexOf(buffer, (byte)0);
+            if (index >= 0)
+            {
+                return (index > 0) ? Encoding.ASCII.GetString(buffer, 0, index) : string.Empty;
+            }
+            return Encoding.ASCII.GetString(buffer);
+        }
+    }
+}
diff --git a/gui/Utilities/CPUFeatures.cs b/gui/Utilities/CPUFeatures.cs
new file mode 100644
index 0000000..bdf035e
--- /dev/null
+++ b/gui/Utilities/CPUFeatures.cs
@@ -0,0 +1,41 @@
+/******************************************************************************/
+/* SlunkCrypt, by LoRd_MuldeR <MuldeR2@GMX.de>                                */
+/* This work has been released under the CC0 1.0 Universal license!           */
+/******************************************************************************/
+
+using System;
+using com.muldersoft.slunkcrypt.gui.utils.cpu;
+
+namespace com.muldersoft.slunkcrypt.gui.process
+{
+    struct CPUFeatures
+    {
+        public readonly bool x64;
+        public readonly bool sse2;
+
+        private static readonly Lazy<CPUFeatures> cpuFeatures = new Lazy<CPUFeatures>(DetectFeatures);
+
+        public static CPUFeatures Features
+        {
+            get { return cpuFeatures.Value; }
+        }
+
+        public CPUFeatures(bool x64, bool sse2)
+        {
+            this.x64 = x64;
+            this.sse2 = sse2;
+        }
+
+        private static CPUFeatures DetectFeatures()
+        {
+            try
+            {
+                return new CPUFeatures(CPU.Architecture.Equals(CPUArchitecture.CPU_ARCH_X64), CPU.Capabilities.HasFlag(CPUCapabilities.CPU_SSE2));
+            }
+            catch
+            {
+                return new CPUFeatures(false, false); /*fallback*/
+            }
+        }
+    }
+}
diff --git a/gui/Utilities/ProcessRunner.cs b/gui/Utilities/ProcessRunner.cs
index 4f23b40..75f9c5e 100644
--- a/gui/Utilities/ProcessRunner.cs
+++ b/gui/Utilities/ProcessRunner.cs
@@ -8,7 +8,6 @@ using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.Diagnostics;
 using System.IO;
-using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Threading;
diff --git a/libslunkcrypt/libSlunkCrypt.vcxproj b/libslunkcrypt/libSlunkCrypt.vcxproj
index 2d48896..a02c7af 100644
--- a/libslunkcrypt/libSlunkCrypt.vcxproj
+++ b/libslunkcrypt/libSlunkCrypt.vcxproj
@@ -192,7 +192,7 @@
     <LinkIncremental>false</LinkIncremental>
     <OutDir>$(SolutionDir)bin\$(Configuration)\</OutDir>
     <IntDir>$(SolutionDir)obj\$(Configuration)\$(PlatformShortName)\$(ProjectName)\</IntDir>
-    <TargetName>libslunkcrypt-1-$(PlatformShortName)</TargetName>
+    <TargetName>libslunkcrypt-1-$(PlatformShortName)-sse2</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WithDbgInfo|Win32'">
     <LinkIncremental>false</LinkIncremental>
@@ -222,7 +222,7 @@
     <LinkIncremental>false</LinkIncremental>
     <OutDir>$(SolutionDir)bin\$(Configuration)\</OutDir>
     <IntDir>$(SolutionDir)obj\$(Configuration)\$(PlatformShortName)\$(ProjectName)\</IntDir>
-    <TargetName>libslunkcrypt-1-$(PlatformShortName)</TargetName>
+    <TargetName>libslunkcrypt-1-$(PlatformShortName)-sse2</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WithDbgInfo|x64'">
     <LinkIncremental>false</LinkIncremental>
@@ -416,6 +416,7 @@
       <FloatingPointModel>Fast</FloatingPointModel>
       <DisableSpecificWarnings>4706;4204</DisableSpecificWarnings>
       <CreateHotpatchableImage>false</CreateHotpatchableImage>
+      <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
     </ClCompile>
     <Link>
       <SubSystem>
diff --git a/libslunkcrypt/src/version.h b/libslunkcrypt/src/version.h
index 5f95240..2041aa2 100644
--- a/libslunkcrypt/src/version.h
+++ b/libslunkcrypt/src/version.h
@@ -7,7 +7,7 @@
 #define INC_SLUNKCRYPT_VERSION_H
 
 #define LIB_VERSION_MAJOR 1
-#define LIB_VERSION_MINOR 0
+#define LIB_VERSION_MINOR 1
 #define LIB_VERSION_PATCH 0
 
 #endif
diff --git a/mk-profiled.cmd b/mk-profiled.cmd
index b3c77e0..a48fc7b 100644
--- a/mk-profiled.cmd
+++ b/mk-profiled.cmd
@@ -17,6 +17,7 @@ for %%p in (x86,x64) do (
 	for %%c in (Release,Release_SSE2) do (
 		if not "%%p::%%c" == "x64::Release_SSE2" (
 			set "TEMP_NAME=!RANDOM!-!RANDOM!"
+			if "%%c"=="Release_SSE2" (set "SUFFIX=-sse2") else (set "SUFFIX=")
 			%ECHO% white "\n------------------------------------------------------------------------------"
 			%ECHO% white "Clean [%%p:%%c]"
 			%ECHO% white "------------------------------------------------------------------------------\n"
@@ -32,11 +33,9 @@ for %%p in (x86,x64) do (
 			%ECHO% white "------------------------------------------------------------------------------\n"
 			"%~dp0.\etc\utils\win32\rand.exe" | "%~dp0.\etc\utils\win32\head.exe" -c 104857600 > "%TMP%\!TEMP_NAME!.dat"
 			if not "%ERRORLEVEL%"=="0" goto:BuildFailed
-			"%~dp0.\bin\%%p\%%c\slunkcrypt.exe" --self-test
+			"%~dp0.\bin\%%c\slunkcrypt-cli-%%p!SUFFIX!.exe" --encrypt pass:"KVeW9;z4$#]d9~}z>(WC?v&f" "%TMP%\!TEMP_NAME!.dat" "%TMP%\!TEMP_NAME!.enc"
 			if not "!ERRORLEVEL!"=="0" goto:BuildFailed
-			"%~dp0.\bin\%%p\%%c\slunkcrypt.exe" --encrypt pass:"KVeW9;z4$#]d9~}z>(WC?v&f" "%TMP%\!TEMP_NAME!.dat" "%TMP%\!TEMP_NAME!.enc"
-			if not "!ERRORLEVEL!"=="0" goto:BuildFailed
-			"%~dp0.\bin\%%p\%%c\slunkcrypt.exe" --decrypt pass:"KVeW9;z4$#]d9~}z>(WC?v&f" "%TMP%\!TEMP_NAME!.enc" "%TMP%\!TEMP_NAME!.out"
+			"%~dp0.\bin\%%c\slunkcrypt-cli-%%p!SUFFIX!.exe" --decrypt pass:"KVeW9;z4$#]d9~}z>(WC?v&f" "%TMP%\!TEMP_NAME!.enc" "%TMP%\!TEMP_NAME!.out"
 			if not "!ERRORLEVEL!"=="0" goto:BuildFailed
 			del /F "%TMP%\!TEMP_NAME!.dat" "%TMP%\!TEMP_NAME!.enc" "%TMP%\!TEMP_NAME!.out"
 			%ECHO% white "\n------------------------------------------------------------------------------"
diff --git a/mk-profiled.sh b/mk-profiled.sh
index e667671..90dda30 100755
--- a/mk-profiled.sh
+++ b/mk-profiled.sh
@@ -36,7 +36,6 @@ dd bs=1024 count=102400 < ${RANDOM_SOURCE} > /tmp/${TMP_NAME}.dat
 printf "\n"
 PASSWRD="$(./frontend/bin/slunkcrypt${SUFFIX} --make-pw)"
 
-./frontend/bin/slunkcrypt${SUFFIX} --self-test
 ./frontend/bin/slunkcrypt${SUFFIX} --encrypt pass:"${PASSWRD}" /tmp/${TMP_NAME}.dat /tmp/${TMP_NAME}.enc
 ./frontend/bin/slunkcrypt${SUFFIX} --decrypt pass:"${PASSWRD}" /tmp/${TMP_NAME}.enc /tmp/${TMP_NAME}.out