bpo-31392: Update SSL build for 1.1.0 (#3448)

5 files changed, 12 insertions, 84 deletions

diff --git a/Tools/msi/lib/lib_files.wxs b/Tools/msi/lib/lib_files.wxs
index 0b8a3ee..fa0da3a 100644
--- a/Tools/msi/lib/lib_files.wxs
+++ b/Tools/msi/lib/lib_files.wxs
@@ -14,11 +14,11 @@
             <Component Id="sqlite3.dll" Directory="DLLs" Guid="*">
                 <File Name="sqlite3.dll" KeyPath="yes" />
             </Component>
-            <Component Id="libeay32.dll" Directory="DLLs" Guid="*">
-                <File Name="libeay32.dll" KeyPath="yes" />
+            <Component Id="libcrypto.dll" Directory="DLLs" Guid="*">
+                <File Name="libcrypto$(var.ssltag).dll" KeyPath="yes" />
             </Component>
-            <Component Id="ssleay32.dll" Directory="DLLs" Guid="*">
-                <File Name="ssleay32.dll" KeyPath="yes" />
+            <Component Id="libssl.dll" Directory="DLLs" Guid="*">
+                <File Name="libssl$(var.ssltag).dll" KeyPath="yes" />
             </Component>
         </ComponentGroup>
     </Fragment>
@@ -36,11 +36,11 @@
             <Component Id="sqlite3.pdb" Directory="DLLs" Guid="*">
                 <File Name="sqlite3.pdb" />
             </Component>
-            <Component Id="libeay32.pdb" Directory="DLLs" Guid="*">
-                <File Name="libeay32.pdb" KeyPath="yes" />
+            <Component Id="libcrypto.pdb" Directory="DLLs" Guid="*">
+                <File Name="libcrypto$(var.ssltag).pdb" KeyPath="yes" />
             </Component>
-            <Component Id="ssleay32.pdb" Directory="DLLs" Guid="*">
-                <File Name="ssleay32.pdb" KeyPath="yes" />
+            <Component Id="libssl.pdb" Directory="DLLs" Guid="*">
+                <File Name="libssl$(var.ssltag).pdb" KeyPath="yes" />
             </Component>
         </ComponentGroup>
     </Fragment>
diff --git a/Tools/msi/make_zip.py b/Tools/msi/make_zip.py
index 8e35bdc..58f3b15 100644
--- a/Tools/msi/make_zip.py
+++ b/Tools/msi/make_zip.py
@@ -47,8 +47,6 @@ EXCLUDE_FILE_FROM_LIBRARY = {
 
 EXCLUDE_FILE_FROM_LIBS = {
     'liblzma',
-    'ssleay',
-    'libeay',
     'python3stub',
 }
 
diff --git a/Tools/msi/msi.props b/Tools/msi/msi.props
index 60abba1..2318d48 100644
--- a/Tools/msi/msi.props
+++ b/Tools/msi/msi.props
@@ -92,10 +92,10 @@
             $(DefineConstants);CRTRedist=$(CRTRedist);
         </DefineConstants>
         <DefineConstants Condition="$(Platform) != 'x64'">
-            $(DefineConstants);Suffix32=-32;
+            $(DefineConstants);Suffix32=-32;ssltag=-1_1;
         </DefineConstants>
         <DefineConstants Condition="$(Platform) == 'x64'">
-            $(DefineConstants);Suffix32=;
+            $(DefineConstants);Suffix32=;ssltag=-1_1-x64;
         </DefineConstants>
     </PropertyGroup>
 
diff --git a/Tools/nuget/pythondaily.symbols.nuspec b/Tools/nuget/pythondaily.symbols.nuspec
index 77792b8..b89717a 100644
--- a/Tools/nuget/pythondaily.symbols.nuspec
+++ b/Tools/nuget/pythondaily.symbols.nuspec
@@ -18,7 +18,7 @@
     <file src="python*.pdb" target="tools" exclude="*_d*" />
     <file src="*.pdb" target="tools\DLLs" exclude="python*;*_test*;xx*;_freeze*;*_d*;py.*;pyw.*;pyshellext.*" />
     <file src="*.pyd" target="tools\DLLs" exclude="python*;*_test*;xx*;_freeze*;*_d*;py.*;pyw.*;pyshellext.*" />
-    <file src="libeay32.dll;ssleay32.dll;sqlite3.dll" target="tools\DLLs" />
-    <file src="libeay32.pdb;ssleay32.pdb;sqlite3.pdb" target="tools\DLLs" />
+    <file src="libcrypto*.dll;libssl*.dll;sqlite3.dll" target="tools\DLLs" />
+    <file src="libcrypto*.pdb;libssl*.pdb;sqlite3.pdb" target="tools\DLLs" />
   </files>
 </package>
diff --git a/Tools/ssl/sslspeed.vcxproj b/Tools/ssl/sslspeed.vcxproj
deleted file mode 100644
index 8ec4106..0000000
--- a/Tools/ssl/sslspeed.vcxproj
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{F068BCCF-C0D6-478D-A2C5-26BA3237C992}</ProjectGuid>
-    <RootNamespace>sslspeed</RootNamespace>
-  </PropertyGroup>
-  
-  <Import Project="..\..\PCBuild\python.props" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="..\..\PCBuild\openssl.props" />
-  
-  <PropertyGroup Label="Configuration">
-    <OriginalOutDir>$(OutDir)</OriginalOutDir>
-    <OutDir>$(MSBuildProjectDirectory)\$(ArchName)\</OutDir>
-    <IntDir>$(MSBuildProjectDirectory)\$(ArchName)\obj\</IntDir>
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  
-  <ItemGroup>
-    <ClCompile Include="$(opensslDir)apps\speed.c" />
-    <ClCompile Include="$(opensslDir)apps\apps.c" />
-  </ItemGroup>
-  
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(opensslIncDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;crypt32.lib;libeay$(PyDebugExt).lib;ssleay$(PyDebugExt).lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(OriginalOutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\PCBuild\ssleay.vcxproj">
-      <Project>{10615b24-73bf-4efa-93aa-236916321317}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="..\..\PCBuild\libeay.vcxproj">
-      <Project>{e5b04cc0-eb4c-42ab-b4dc-18ef95f864b0}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-</Project>
\ No newline at end of file