Revert "Moved to OpenSSL 3.0 as OpenSSL 1.1.0 LTS is soon ending it's…

… life." This reverts commit 9bce04a.
SorenRR · Sep 1, 2023 · 41b016d · 41b016d
1 parent 9bce04a
commit 41b016d
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 19 deletions.
diff --git a/hmailserver/installation/hMailServer.iss b/hmailserver/installation/hMailServer.iss
@@ -1,11 +1,11 @@
 [Setup]
 AppName=hMailServer
-AppVerName=hMailServer 5.6.9-B2607.82 (x86)
+AppVerName=hMailServer 5.6.9-B2607.80 (x86)
 AppCopyright=Copyright (C) 2023
 DefaultDirName={pf}\hMailServer
 DefaultGroupName=hMailServer
 PrivilegesRequired=admin
-OutputBaseFilename=hMailServer-5.6.9-B2607.82-(x86)
+OutputBaseFilename=hMailServer-5.6.9-B2607.80-(x86)
 SolidCompression=yes
 WizardImageFile=setup.bmp
 LicenseFile=license.rtf
@@ -75,8 +75,8 @@ Source: "System files\dnsapi.dll"; DestDir: "{sys}"; Flags: uninsneveruninstall
 Source: "System files\ATL\atl70.dll"; DestDir: "{sys}";  Components: server;
 Source: "SQLCE\SSCERuntime-ENU.msi"; Flags: deleteafterinstall ; Excludes: ".svn"; DestDir: "{tmp}"; Components: server;
 Source: ".\Extras\7za.exe"; DestDir: "{app}\Bin"; Flags: ignoreversion; Components: server;
-Source: "..\..\..\Libs\openssl-3.0.10\out32\bin\libcrypto-3.dll"; DestDir: "{app}\Bin"; Flags: ignoreversion; Components: server admintools;
-Source: "..\..\..\Libs\openssl-3.0.10\out32\bin\libssl-3.dll"; DestDir: "{app}\Bin"; Flags: ignoreversion; Components: server admintools;
+Source: "..\..\..\Libs\openssl-1.1.1u\out32\bin\libcrypto-1_1.dll"; DestDir: "{app}\Bin"; Flags: ignoreversion; Components: server admintools;
+Source: "..\..\..\Libs\openssl-1.1.1u\out32\bin\libssl-1_1.dll"; DestDir: "{app}\Bin"; Flags: ignoreversion; Components: server admintools;
 Source: "Microsoft.VC120.CRT\*"; DestDir: "{app}\Bin"; Flags: ignoreversion; Components: server admintools;
 
 ; Main server

diff --git a/hmailserver/source/Server/Common/AntiSpam/DKIM/DKIM.cpp b/hmailserver/source/Server/Common/AntiSpam/DKIM/DKIM.cpp
@@ -40,9 +40,8 @@ namespace HM
    void 
    DKIM::Initialize()
    {
-      // Deprecated: OpenSSL_add_all_algorithms();
-      // Deprecated: ERR_load_crypto_strings();
-      OPENSSL_init_crypto(OPENSSL_INIT_LOAD_CRYPTO_STRINGS | OPENSSL_INIT_ADD_ALL_CIPHERS | OPENSSL_INIT_ADD_ALL_DIGESTS, NULL);
+      OpenSSL_add_all_algorithms();
+      ERR_load_crypto_strings();
       ERR_load_EVP_strings();
 
       recommendedHeaderFields_.push_back("From");

diff --git a/hmailserver/source/Server/Common/Application/Version.h b/hmailserver/source/Server/Common/Application/Version.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #define HMAILSERVER_VERSION "5.6.9"
-#define HMAILSERVER_BUILD "2607.82 (x86)"
+#define HMAILSERVER_BUILD "2607.80 (x86)"
 
 /*
 [list=1]
@@ -83,7 +83,5 @@
 [*]Experiment: Remove .NET 2.0 requirement during install.
 [*]Update hm_smtp_antivirus.php issue #471
 [*]OpenSSL 1.1.1u compiled with "no-ssl2 no-ssl3" since we don't support them.
-[*]OpenSSL 3.0.10 compiled with "--api=1.1.1 no-deprecated no-ssl3", removed "enable-weak-ssl-ciphers".
-[*]Fix: Redefined deprecated OpenSSL calls in dkim.cpp.
 [/list]
 */
diff --git a/hmailserver/source/Server/hMailServer/hMailServer.vcxproj b/hmailserver/source/Server/hMailServer/hMailServer.vcxproj
@@ -93,7 +93,7 @@ EXIT 0
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(hMailServerLibs)\boost_1_70_0;..\..\..\..\Libraries\mssqlce3.5;$(hMailServerLibs)\openssl-3.0.10\out32\include;..\..\..\..\Libraries\pgsql8.2.4\include;$(ProjectDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(hMailServerLibs)\boost_1_70_0;..\..\..\..\Libraries\mssqlce3.5;$(hMailServerLibs)\openssl-1.1.1u\out32\include;..\..\..\..\Libraries\pgsql8.2.4\include;$(ProjectDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;UNICODE;_UNICODE;BOOST_DATE_TIME_NO_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>false</MinimalRebuild>
       <ExceptionHandling>Async</ExceptionHandling>
@@ -114,7 +114,7 @@ EXIT 0
       <AdditionalDependencies>Adsiid.lib;activeds.lib;IPHlpAPI.lib;Dnsapi.lib;Ws2_32.lib;libpq.lib;libcrypto.lib;libssl.lib;crypt32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <ShowProgress>NotSet</ShowProgress>
       <OutputFile>$(OutDir)hMailServer.exe</OutputFile>
-      <AdditionalLibraryDirectories>$(hMailServerLibs)\boost_1_70_0\stage\lib;$(hMailServerLibs)\openssl-3.0.10\out32\lib;..\..\..\..\Libraries\pgsql8.2.4;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(hMailServerLibs)\boost_1_70_0\stage\lib;$(hMailServerLibs)\openssl-1.1.1u\out32\lib;..\..\..\..\Libraries\pgsql8.2.4;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AssemblyDebug>true</AssemblyDebug>
@@ -125,8 +125,8 @@ EXIT 0
     </Link>
     <PostBuildEvent>
       <Message>Performing registration</Message>
-      <Command>xcopy /F /Y $(hMailServerLibs)\openssl-3.0.10\out32\bin\libcrypto-3.dll $(OutDir)
-xcopy /F /Y $(hMailServerLibs)\openssl-3.0.10\out32\bin\libssl-3.dll $(OutDir)
+      <Command>xcopy /F /Y $(hMailServerLibs)\openssl-1.1.1u\out32\bin\libcrypto-1_1.dll $(OutDir)
+xcopy /F /Y $(hMailServerLibs)\openssl-1.1.1u\out32\bin\libssl-1_1.dll $(OutDir)
 "$(TargetPath)" /Register
 </Command>
     </PostBuildEvent>
@@ -151,7 +151,7 @@ EXIT 0
     <ClCompile>
       <AdditionalOptions>/MP
  %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>$(hMailServerLibs)\boost_1_70_0;..\..\..\..\Libraries\mssqlce3.5;$(hMailServerLibs)\openssl-3.0.10\out32\include;..\..\..\..\Libraries\pgsql8.2.4\include;$(ProjectDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(hMailServerLibs)\boost_1_70_0;..\..\..\..\Libraries\mssqlce3.5;$(hMailServerLibs)\openssl-1.1.1u\out32\include;..\..\..\..\Libraries\pgsql8.2.4\include;$(ProjectDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_WINDOWS;UNICODE;_UNICODE;NDEBUG;BOOST_DATE_TIME_NO_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ExceptionHandling>Async</ExceptionHandling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -169,7 +169,7 @@ EXIT 0
       <AdditionalOptions>/SAFESEH /ignore:4099 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>libcrypto.lib;libssl.lib;Adsiid.lib;activeds.lib;IPHlpAPI.lib;Dnsapi.lib;Ws2_32.lib;libpq.lib;crypt32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)hMailServer.exe</OutputFile>
-      <AdditionalLibraryDirectories>$(hMailServerLibs)\boost_1_70_0\stage\lib;$(hMailServerLibs)\openssl-3.0.10\out32\lib;..\..\..\..\Libraries\pgsql8.2.4;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(hMailServerLibs)\boost_1_70_0\stage\lib;$(hMailServerLibs)\openssl-1.1.1u\out32\lib;..\..\..\..\Libraries\pgsql8.2.4;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
@@ -180,8 +180,8 @@ EXIT 0
     </Link>
     <PostBuildEvent>
       <Message>Performing registration</Message>
-      <Command>xcopy /F /Y $(hMailServerLibs)\openssl-3.0.10\out32\bin\libcrypto-3.dll $(OutDir)
-xcopy /F /Y $(hMailServerLibs)\openssl-3.0.10\out32\bin\libssl-3.dll $(OutDir)
+      <Command>xcopy /F /Y $(hMailServerLibs)\openssl-1.1.1u\out32\bin\libcrypto-1_1.dll $(OutDir)
+xcopy /F /Y $(hMailServerLibs)\openssl-1.1.1u\out32\bin\libssl-1_1.dll $(OutDir)
 "$(TargetPath)" /Register
 </Command>
     </PostBuildEvent>

diff --git a/hmailserver/source/Tools/Administrator/Dialogs/formAbout.Designer.cs b/hmailserver/source/Tools/Administrator/Dialogs/formAbout.Designer.cs