Use case-insensitive BlockName for Win32 GUI setups

Fixes issue #135
jetwhiz · Jan 27, 2020 · aea111d · aea111d
1 parent 34615cc
commit aea111d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/encfs/encfs.vcxproj b/encfs/encfs.vcxproj
@@ -112,7 +112,7 @@
       <SDLCheck>true</SDLCheck>
       <AdditionalIncludeDirectories>..\;$(OPENSSL_ROOT)\include;$(DOKAN_ROOT)\dokan_fuse\include;$(DOKAN_ROOT)\sys;..\deps\tinyxml2;..\deps\easyloggingpp\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
-      <PreprocessorDefinitions>WIN32;_WINDOWS;_USRDLL;ENCFS_EXPORTS;RLOG_COMPONENT=rlog;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_WINDOWS;_USRDLL;ENCFS_EXPORTS;RLOG_COMPONENT=rlog;_CRT_SECURE_NO_WARNINGS;DEFAULT_CASE_INSENSITIVE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>

diff --git a/encfs/encfsw.vcxproj b/encfs/encfsw.vcxproj
@@ -75,7 +75,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;DEFAULT_CASE_INSENSITIVE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader />

diff --git a/encfs/win/maingui.cpp b/encfs/win/maingui.cpp
@@ -276,7 +276,11 @@ static void createConfig(const std::string& rootDir, bool paranoid, const char*
     keySize = 256;
     blockSize = DefaultBlockSize;
     alg = findCipherAlgorithm("AES", keySize);
+#if defined(DEFAULT_CASE_INSENSITIVE)
+    nameIOIface = BlockNameIO::CurrentInterface(true);
+#else
     nameIOIface = BlockNameIO::CurrentInterface();
+#endif 
     blockMACBytes = 8;
     blockMACRandBytes = 0; // using uniqueIV, so this isn't necessary
     uniqueIV = true;
@@ -293,7 +297,11 @@ static void createConfig(const std::string& rootDir, bool paranoid, const char*
     alg = findCipherAlgorithm("AES", keySize);
     blockMACBytes = 0;
     externalIV = false;
+#if defined(DEFAULT_CASE_INSENSITIVE)
+    nameIOIface = BlockNameIO::CurrentInterface(true);
+#else
     nameIOIface = BlockNameIO::CurrentInterface();
+#endif 
 
     if (!reverseEncryption)
     {