Upgraded to OpenSSL 1.1.1g hmailserver#327

ducbang · Apr 21, 2020 · 0a0d122 · 0a0d122
2 parents a79b5f0 + 2ae9fb1
commit 0a0d122
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/hmailserver/installation/section_files_64.iss b/hmailserver/installation/section_files_64.iss
@@ -21,5 +21,5 @@ Source: "..\source\tools\Administrator\bin\x64\Release\Interop.hMailServer.dll";
 Source: "..\source\Tools\Shared\Bin\x64\Release\*.dll"; DestDir: "{app}\Addons\DataDirectorySynchronizer"; Flags: ignoreversion recursesubdirs;Components: server;
 
 ; OpenSSL
-Source: "{#HMAILSERVERLIBS}\openssl-1.1.1d\out64\bin\libcrypto-1_1-x64.dll"; DestDir: "{app}\Bin"; Flags: ignoreversion; Components: server admintools;
-Source: "{#HMAILSERVERLIBS}\openssl-1.1.1d\out64\bin\libssl-1_1-x64.dll"; DestDir: "{app}\Bin"; Flags: ignoreversion; Components: server admintools;
+Source: "{#HMAILSERVERLIBS}\openssl-1.1.1g\out64\bin\libcrypto-1_1-x64.dll"; DestDir: "{app}\Bin"; Flags: ignoreversion; Components: server admintools;
+Source: "{#HMAILSERVERLIBS}\openssl-1.1.1g\out64\bin\libssl-1_1-x64.dll"; DestDir: "{app}\Bin"; Flags: ignoreversion; Components: server admintools;
diff --git a/hmailserver/source/Server/hMailServer/hMailServer.vcxproj b/hmailserver/source/Server/hMailServer/hMailServer.vcxproj
@@ -72,7 +72,7 @@ EXIT 0
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(hMailServerLibs)\boost_1_70_0;..\..\..\..\Libraries\mssqlce3.5;$(hMailServerLibs)\openssl-1.1.1d\out64\include;..\..\..\..\Libraries\libpq-9.4;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(hMailServerLibs)\boost_1_70_0;..\..\..\..\Libraries\mssqlce3.5;$(hMailServerLibs)\openssl-1.1.1g\out64\include;..\..\..\..\Libraries\libpq-9.4;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;UNICODE;_UNICODE;BOOST_DATE_TIME_NO_LIB;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>false</MinimalRebuild>
       <ExceptionHandling>Async</ExceptionHandling>
@@ -94,7 +94,7 @@ EXIT 0
       <AdditionalDependencies>Adsiid.lib;activeds.lib;IPHlpAPI.lib;Dnsapi.lib;Ws2_32.lib;libpq.lib;libcrypto.lib;libssl.lib;crypt32.lib;Secur32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <ShowProgress>NotSet</ShowProgress>
       <OutputFile>$(OutDir)hMailServer.exe</OutputFile>
-      <AdditionalLibraryDirectories>$(hMailServerLibs)\boost_1_70_0\stage\lib;$(hMailServerLibs)\openssl-1.1.1d\out64\lib;..\..\..\..\Libraries\libpq-9.4\64\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(hMailServerLibs)\boost_1_70_0\stage\lib;$(hMailServerLibs)\openssl-1.1.1g\out64\lib;..\..\..\..\Libraries\libpq-9.4\64\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AssemblyDebug>true</AssemblyDebug>
@@ -104,8 +104,8 @@ EXIT 0
     </Link>
     <PostBuildEvent>
       <Message>Performing registration</Message>
-      <Command>xcopy /F /Y $(hMailServerLibs)\openssl-1.1.1d\out64\bin\libcrypto-1_1-x64.dll $(OutDir)
-xcopy /F /Y $(hMailServerLibs)\openssl-1.1.1d\out64\bin\libssl-1_1-x64.dll $(OutDir)
+      <Command>xcopy /F /Y $(hMailServerLibs)\openssl-1.1.1g\out64\bin\libcrypto-1_1-x64.dll $(OutDir)
+xcopy /F /Y $(hMailServerLibs)\openssl-1.1.1g\out64\bin\libssl-1_1-x64.dll $(OutDir)
 "$(TargetPath)" /Register
 </Command>
     </PostBuildEvent>
@@ -128,7 +128,7 @@ EXIT 0
       <ProxyFileName>hMailServer_p.c</ProxyFileName>
     </Midl>
     <ClCompile>
-      <AdditionalIncludeDirectories>$(hMailServerLibs)\boost_1_70_0;..\..\..\..\Libraries\mssqlce3.5;$(hMailServerLibs)\openssl-1.1.1d\out64\include;..\..\..\..\Libraries\libpq-9.4;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(hMailServerLibs)\boost_1_70_0;..\..\..\..\Libraries\mssqlce3.5;$(hMailServerLibs)\openssl-1.1.1g\out64\include;..\..\..\..\Libraries\libpq-9.4;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_WINDOWS;UNICODE;_UNICODE;NDEBUG;BOOST_DATE_TIME_NO_LIB;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ExceptionHandling>Async</ExceptionHandling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -147,7 +147,7 @@ EXIT 0
       <AdditionalOptions>/ignore:4099 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>libcrypto.lib;libssl.lib;Adsiid.lib;activeds.lib;IPHlpAPI.lib;Dnsapi.lib;Ws2_32.lib;libpq.lib;crypt32.lib;Secur32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)hMailServer.exe</OutputFile>
-      <AdditionalLibraryDirectories>$(hMailServerLibs)\boost_1_70_0\stage\lib;$(hMailServerLibs)\openssl-1.1.1d\out64\lib;..\..\..\..\Libraries\libpq-9.4\64\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(hMailServerLibs)\boost_1_70_0\stage\lib;$(hMailServerLibs)\openssl-1.1.1g\out64\lib;..\..\..\..\Libraries\libpq-9.4\64\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
@@ -157,8 +157,8 @@ EXIT 0
     </Link>
     <PostBuildEvent>
       <Message>Performing registration</Message>
-      <Command>xcopy /F /Y $(hMailServerLibs)\openssl-1.1.1d\out64\bin\libcrypto-1_1-x64.dll $(OutDir)
-xcopy /F /Y $(hMailServerLibs)\openssl-1.1.1d\out64\bin\libssl-1_1-x64.dll $(OutDir)
+      <Command>xcopy /F /Y $(hMailServerLibs)\openssl-1.1.1g\out64\bin\libcrypto-1_1-x64.dll $(OutDir)
+xcopy /F /Y $(hMailServerLibs)\openssl-1.1.1g\out64\bin\libssl-1_1-x64.dll $(OutDir)
 "$(TargetPath)" /Register
 </Command>
     </PostBuildEvent>
@@ -1373,4 +1373,4 @@ xcopy /F /Y $(hMailServerLibs)\openssl-1.1.1d\out64\bin\libssl-1_1-x64.dll $(Out
       <UserProperties RESOURCE_FILE="hMailServer.rc" />
     </VisualStudio>
   </ProjectExtensions>
-</Project>
+</Project>