upgrade to Dokany 2.1

Author: Bailey Brown

INSTALL.md

@@ -85,7 +85,7 @@ To start an elevated command prompt in Windows 10, click on the search (magnifyi
 Whether or not you are using git, everything will go easier if you put everything in c:\git.
 
 Getting OpenSSL from github will get you the latest development version of OpenSSL.  However, the cppcryptfs releases are built using the
-current 3.0.x Long Term Support (LTS) version of OpenSSL (currently openssl-3.0.10).  These are available from https://www.openssl.org/source/.  To use those, you will need to download
+current 3.0.x Long Term Support (LTS) version of OpenSSL (currently openssl-3.0.13).  These are available from https://www.openssl.org/source/.  To use those, you will need to download
 the .tar.gz and extract it into a directory.  You can build it with the same instructions that follow regardless of how you get OpenSSL.
 
 Microsoft has announced a compiler-based mitigation for one variant of the Spectre vulnerability.  To use it, you need to have version 15.5 or higher of Visual Studio.  To use the mitigation with OpenSSL, you need to add the /Qspectre flag to the compiler optimization flags.  OpenSSL currently does not use this flag.  Also, to be extra safe, add the /guard:cf (Control Flow Guard) flag.  To use these, you need to edit c:\\git\openssl\\Configurations\\10-main.conf and change "/O2" to "/O2 /Qspectre /guard:cf".  

README.md

@@ -72,7 +72,7 @@ Build Requirements
 
 There are detailed build instructions in [INSTALL.md](INSTALL.md).
 
-cppcryptfs is currently up-to-date with Dokany 2.0.6.1000
+cppcryptfs is currently up-to-date with Dokany 2.1.0.1000
 
 
 Use

changelog.md

@@ -2,6 +2,9 @@
 
 Changelog
 ------------
+v1.4.4.3 28 Apr 2024
+* Use Dokany 2.1 (2.1.0.1000)
+
 v1.4.4.2 17 Sept 2023
 * Use Openssl 3.0 LTS
 

cppcryptfs/cppcryptfs.rc

@@ -98,15 +98,15 @@
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(PROJECTDIR)..\libcppcryptfs;C:\Program Files\Dokan\Dokan Library-2.0.6\include;$(ProjectDir);c:\git\rapidjson\include;C:\Program Files (X86)\OpenSSL\include</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(PROJECTDIR)..\libcppcryptfs;C:\Program Files\Dokan\Dokan Library-2.1.0\include;$(ProjectDir);c:\git\rapidjson\include;C:\Program Files (X86)\OpenSSL\include</AdditionalIncludeDirectories>
       <AdditionalOptions>/Qspectre</AdditionalOptions>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <ControlFlowGuard>false</ControlFlowGuard>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>$(OutputPath)libcommonutil.lib;$(OutputPath)libipc.lib;$(OutputPath)libcppcryptfs.lib;C:\Program Files\Dokan\Dokan Library-2.0.6\x86\lib\dokan2.lib;version.lib;C:\Program Files (X86)\OpenSSL\lib\libcrypto.lib;Shlwapi.lib;Crypt32.lib;</AdditionalDependencies>
+      <AdditionalDependencies>$(OutputPath)libcommonutil.lib;$(OutputPath)libipc.lib;$(OutputPath)libcppcryptfs.lib;C:\Program Files\Dokan\Dokan Library-2.1.0\x86\lib\dokan2.lib;version.lib;C:\Program Files (X86)\OpenSSL\lib\libcrypto.lib;Shlwapi.lib;Crypt32.lib;</AdditionalDependencies>
       <UACExecutionLevel>AsInvoker</UACExecutionLevel>
     </Link>
     <Midl>
@@ -127,7 +127,7 @@
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>_WINDOWS;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(PROJECTDIR)..\libcppcryptfs;C:\Program Files\Dokan\Dokan Library-2.0.6\include;$(ProjectDir);c:\git\rapidjson\include;C:\Program Files\OpenSSL\include</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(PROJECTDIR)..\libcppcryptfs;C:\Program Files\Dokan\Dokan Library-2.1.0\include;$(ProjectDir);c:\git\rapidjson\include;C:\Program Files\OpenSSL\include</AdditionalIncludeDirectories>
       <EnablePREfast>false</EnablePREfast>
       <AdditionalOptions>/Qspectre</AdditionalOptions>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
@@ -136,7 +136,7 @@
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>$(OutputPath)libcommonutil.lib;$(OutputPath)libipc.lib;$(OutputPath)libcppcryptfs.lib;C:\Program Files\Dokan\Dokan Library-2.0.6\lib\dokan2.lib;version.lib;C:\Program Files\OpenSSL\lib\libcrypto.lib;Shlwapi.lib;Crypt32.lib;</AdditionalDependencies>
+      <AdditionalDependencies>$(OutputPath)libcommonutil.lib;$(OutputPath)libipc.lib;$(OutputPath)libcppcryptfs.lib;C:\Program Files\Dokan\Dokan Library-2.1.0\lib\dokan2.lib;version.lib;C:\Program Files\OpenSSL\lib\libcrypto.lib;Shlwapi.lib;Crypt32.lib;</AdditionalDependencies>
       <AdditionalOptions>/ignore:4099 /HIGHENTROPYVA %(AdditionalOptions)</AdditionalOptions>
       <UACExecutionLevel>AsInvoker</UACExecutionLevel>
     </Link>
@@ -160,7 +160,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(PROJECTDIR)..\libcppcryptfs;C:\Program Files\Dokan\Dokan Library-2.0.6\include;$(ProjectDir);c:\git\rapidjson\include;C:\Program Files (X86)\OpenSSL\include</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(PROJECTDIR)..\libcppcryptfs;C:\Program Files\Dokan\Dokan Library-2.1.0\include;$(ProjectDir);c:\git\rapidjson\include;C:\Program Files (X86)\OpenSSL\include</AdditionalIncludeDirectories>
       <AdditionalOptions>/Qspectre</AdditionalOptions>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <ControlFlowGuard>Guard</ControlFlowGuard>
@@ -170,7 +170,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>$(OutputPath)libcommonutil.lib;$(OutputPath)libipc.lib;$(OutputPath)libcppcryptfs.lib;C:\Program Files\Dokan\Dokan Library-2.0.6\x86\lib\dokan2.lib;version.lib;C:\Program Files (X86)\OpenSSL\lib\libcrypto.lib;Shlwapi.lib;Crypt32.lib;</AdditionalDependencies>
+      <AdditionalDependencies>$(OutputPath)libcommonutil.lib;$(OutputPath)libipc.lib;$(OutputPath)libcppcryptfs.lib;C:\Program Files\Dokan\Dokan Library-2.1.0\x86\lib\dokan2.lib;version.lib;C:\Program Files (X86)\OpenSSL\lib\libcrypto.lib;Shlwapi.lib;Crypt32.lib;</AdditionalDependencies>
       <UACExecutionLevel>AsInvoker</UACExecutionLevel>
     </Link>
     <Midl>
@@ -193,7 +193,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>_WINDOWS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(PROJECTDIR)..\libcppcryptfs;C:\Program Files\Dokan\Dokan Library-2.0.6\include;$(ProjectDir);c:\git\rapidjson\include;C:\Program Files\OpenSSL\include</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(PROJECTDIR)..\libcppcryptfs;C:\Program Files\Dokan\Dokan Library-2.1.0\include;$(ProjectDir);c:\git\rapidjson\include;C:\Program Files\OpenSSL\include</AdditionalIncludeDirectories>
       <AdditionalOptions>/Qspectre</AdditionalOptions>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <ControlFlowGuard>Guard</ControlFlowGuard>
@@ -203,7 +203,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>$(OutputPath)libcommonutil.lib;$(OutputPath)libipc.lib;$(OutputPath)libcppcryptfs.lib;C:\Program Files\Dokan\Dokan Library-2.0.6\lib\dokan2.lib;version.lib;C:\Program Files\OpenSSL\lib\libcrypto.lib;Shlwapi.lib;Crypt32.lib;</AdditionalDependencies>
+      <AdditionalDependencies>$(OutputPath)libcommonutil.lib;$(OutputPath)libipc.lib;$(OutputPath)libcppcryptfs.lib;C:\Program Files\Dokan\Dokan Library-2.1.0\lib\dokan2.lib;version.lib;C:\Program Files\OpenSSL\lib\libcrypto.lib;Shlwapi.lib;Crypt32.lib;</AdditionalDependencies>
       <AdditionalOptions>/ignore:4099 /HIGHENTROPYVA %(AdditionalOptions)</AdditionalOptions>
       <UACExecutionLevel>AsInvoker</UACExecutionLevel>
     </Link>

cppcryptfs/cppcryptfs.vcxproj

@@ -2750,7 +2750,7 @@ bool get_dokany_version(wstring& ver, vector<int>& v)
 bool check_dokany_version(wstring& mes)
 {
 	constexpr int required_major = 2;
-	constexpr int required_middle = 0;
+	constexpr int required_middle = 1;
     const wstring required_ver =  to_wstring(required_major) + L"." + to_wstring(required_middle) +  L".x.x";
 
 	mes = L"";

cppcryptfs/dokan/cryptdokan.cpp

@@ -51,8 +51,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,4,4,2
- PRODUCTVERSION 1,4,4,2
+ FILEVERSION 1,4,4,3
+ PRODUCTVERSION 1,4,4,3
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -69,12 +69,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Bailey Brown"
             VALUE "FileDescription", "cppcryptfsctl"
-            VALUE "FileVersion", "1.4.4.2"
+            VALUE "FileVersion", "1.4.4.3"
             VALUE "InternalName", "cppcryptfsctl.exe"
             VALUE "LegalCopyright", "Copyright (C) 2020-2023 Bailey Brown. All rights reserved."
             VALUE "OriginalFilename", "cppcryptfsctl.exe"
             VALUE "ProductName", "cppcryptfsctl"
-            VALUE "ProductVersion", "1.4.4.2"
+            VALUE "ProductVersion", "1.4.4.3"
         END
     END
     BLOCK "VarFileInfo"