Skip to content

Commit

Permalink
OpenSSL 3.0.10 w/ backwards compatibility
Browse files Browse the repository at this point in the history
  • Loading branch information
@SorenRR
SorenRR committed Sep 7, 2023
1 parent 4e513dc commit aa2a709
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 20 deletions.
8 changes: 4 additions & 4 deletions hmailserver/installation/hMailServer.iss
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
[Setup]
AppName=hMailServer
AppVerName=hMailServer 5.6.9-B2607.81 (x86)
AppVerName=hMailServer 5.6.9-B2641.82 (x86)
AppCopyright=Copyright (C) 2023
DefaultDirName={pf}\hMailServer
DefaultGroupName=hMailServer
PrivilegesRequired=admin
OutputBaseFilename=hMailServer-5.6.9-B2607.81-(x86)
OutputBaseFilename=hMailServer-5.6.9-B2641.82-(x86)
SolidCompression=yes
WizardImageFile=setup.bmp
LicenseFile=license.rtf
Expand Down Expand Up @@ -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-1.1.1v\out32\bin\libcrypto-1_1.dll"; DestDir: "{app}\Bin"; Flags: ignoreversion; Components: server admintools;
Source: "..\..\..\Libs\openssl-1.1.1v\out32\bin\libssl-1_1.dll"; DestDir: "{app}\Bin"; Flags: ignoreversion; Components: server admintools;
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: "Microsoft.VC120.CRT\*"; DestDir: "{app}\Bin"; Flags: ignoreversion; Components: server admintools;

; Main server
Expand Down
10 changes: 3 additions & 7 deletions hmailserver/source/Server/Common/Application/Version.h
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#pragma once

#define HMAILSERVER_VERSION "5.6.9"
#define HMAILSERVER_BUILD "2607.81 (x86)"
#define HMAILSERVER_BUILD "2641.82 (x86)"

/*
[list=1]
Expand Down Expand Up @@ -68,21 +68,17 @@
[*]Fix: Error logged if email address length exceeds 254 characters [url=https://github.com/hmailserver/hmailserver/issues/393]issue #393[/url]
[*]Fix: DKIM Signing Not Performed On Messages > 10 MB [url=https://github.com/hmailserver/hmailserver/issues/387]issue #387[/url]
[*]Fix: DKIM (header) verification fails when an email is received with no subject issue #245
[*]Update: Added "X-hMailServer-Envelope-To to SMTP processing. POPFetch already know client so no change.
[*]Minor update: Renamed "X-hMailServer-Envelope-To/From" to "X-Envelope-To/From" in order to follow common usage by 3'rd party.
[*]Added: DKIM signing support for CSA-Compliant Mail Headers, eg: X-CSA-Complaints and List-Unsubscribe-Post headers.
[*]Fix: Prefer IPv6 over IPv4 didn't do anything, added the missing part (sorting of found IP Addresses)
[*]Update: Reverted a workaround to Thunderbird bug https://bugzilla.mozilla.org/show_bug.cgi?id=460443
[*]Added: Received-SPF: diagnostic header controlled with INI setting "AddReceivedSPFHeader" (skip for authenticated client connections or localhost!)
[*]Added: (envelope-from <[email protected]>), for <[email protected]> to Received: header (if single recipient!)
[*]Moving "Return-Path" header handling to SMTPMessageHeaderCreator.
[*]Scripting "Received" header to handle HELO/EHLO/ESMTP/SMTP in header.
[*]Commented: Only create "X-Envelope-To/From" headers if NOT local AND NOT authenticated.
[*]Update: Removed X-Envelope headers.
[*]Update: Distinguish more clearly between helo/mailfrom SPF results/checks
[*]Experiment: Remove .NET 2.0 requirement during install.
[*]Update: 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 1.1.1v compiled with "no-ssl2 no-ssl3 no-deprecated" and without "enable-weak-ssl-ciphers". DKIM.cpp and HashCreator.cpp corrected for deprecated OpenSSL function.
[*]OpenSSL 3.0.10 compiled with "-DOPENSSL_TLS_SECURITY_LEVEL=0 --api=1.1.1 no-deprecated" to allow backwards compatibility with version 1.1.0.
[/list]
*/
16 changes: 8 additions & 8 deletions hmailserver/source/Server/hMailServer/hMailServer.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ EXIT 0
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>$(hMailServerLibs)\boost_1_70_0;..\..\..\..\Libraries\mssqlce3.5;$(hMailServerLibs)\openssl-1.1.1v\out32\include;..\..\..\..\Libraries\pgsql8.2.4\include;$(ProjectDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(hMailServerLibs)\boost_1_70_0;..\..\..\..\Libraries\mssqlce3.5;$(hMailServerLibs)\openssl-3.0.10\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>
Expand All @@ -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-1.1.1v\out32\lib;..\..\..\..\Libraries\pgsql8.2.4;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>$(hMailServerLibs)\boost_1_70_0\stage\lib;$(hMailServerLibs)\openssl-3.0.10\out32\lib;..\..\..\..\Libraries\pgsql8.2.4;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AssemblyDebug>true</AssemblyDebug>
Expand All @@ -125,8 +125,8 @@ EXIT 0
</Link>
<PostBuildEvent>
<Message>Performing registration</Message>
<Command>xcopy /F /Y $(hMailServerLibs)\openssl-1.1.1v\out32\bin\libcrypto-1_1.dll $(OutDir)
xcopy /F /Y $(hMailServerLibs)\openssl-1.1.1v\out32\bin\libssl-1_1.dll $(OutDir)
<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)
"$(TargetPath)" /Register
</Command>
</PostBuildEvent>
Expand All @@ -151,7 +151,7 @@ EXIT 0
<ClCompile>
<AdditionalOptions>/MP
%(AdditionalOptions)</AdditionalOptions>
<AdditionalIncludeDirectories>$(hMailServerLibs)\boost_1_70_0;..\..\..\..\Libraries\mssqlce3.5;$(hMailServerLibs)\openssl-1.1.1v\out32\include;..\..\..\..\Libraries\pgsql8.2.4\include;$(ProjectDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(hMailServerLibs)\boost_1_70_0;..\..\..\..\Libraries\mssqlce3.5;$(hMailServerLibs)\openssl-3.0.10\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>
Expand All @@ -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-1.1.1v\out32\lib;..\..\..\..\Libraries\pgsql8.2.4;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>$(hMailServerLibs)\boost_1_70_0\stage\lib;$(hMailServerLibs)\openssl-3.0.10\out32\lib;..\..\..\..\Libraries\pgsql8.2.4;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
Expand All @@ -180,8 +180,8 @@ EXIT 0
</Link>
<PostBuildEvent>
<Message>Performing registration</Message>
<Command>xcopy /F /Y $(hMailServerLibs)\openssl-1.1.1v\out32\bin\libcrypto-1_1.dll $(OutDir)
xcopy /F /Y $(hMailServerLibs)\openssl-1.1.1v\out32\bin\libssl-1_1.dll $(OutDir)
<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)
"$(TargetPath)" /Register
</Command>
</PostBuildEvent>
Expand Down
2 changes: 1 addition & 1 deletion hmailserver/source/Tools/Administrator/Dialogs/formAbout.Designer.cs
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit aa2a709

Please sign in to comment.