Issue #26268: Update Windows builds to use OpenSSL 1.0.2f

diff --git a/Misc/NEWS b/Misc/NEWS
index d83ac5bb7fb5c67bb96fb5d1de7242c49e633f52..5fff17efaf52f4cfdaa351bef36128c8575f8d3d 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -148,6 +148,8 @@ Build
 - Issue #26268: Update OS X 10.5+ 32-bit-only installer to build
   and link with OpenSSL 1.0.2f.
 
+- Issue #26268: Update Windows builds to use OpenSSL 1.0.2f.
+
 
 What's New in Python 2.7.11?
 ============================

diff --git a/PC/VS9.0/pyproject.vsprops b/PC/VS9.0/pyproject.vsprops
index 5625f9d028fbf41f175e4d1a8234cbb7833cb8ac..1570615d9a22e6733e4d88c3ecd312ff14e65f3b 100644 (file)
--- a/PC/VS9.0/pyproject.vsprops
+++ b/PC/VS9.0/pyproject.vsprops
@@ -82,7 +82,7 @@
        />\r
        <UserMacro\r
                Name="opensslDir"\r
-               Value="$(externalsDir)\openssl-1.0.2d"\r
+               Value="$(externalsDir)\openssl-1.0.2f"\r
        />\r
        <UserMacro\r
                Name="tcltkDir"\r

diff --git a/PC/VS9.0/readme.txt b/PC/VS9.0/readme.txt
index 92d5c8ac58aa4ae5885eeb3788ef899e82f3fcaf..90334bfc5a8608b5b93599f54a775613a32d8c5b 100644 (file)
--- a/PC/VS9.0/readme.txt
+++ b/PC/VS9.0/readme.txt
@@ -132,7 +132,7 @@ _ssl
 \r
     Get the source code through\r
 \r
-    svn export http://svn.python.org/projects/external/openssl-1.0.2d\r
+    svn export http://svn.python.org/projects/external/openssl-1.0.2f\r
 \r
     ** NOTE: if you use the PCbuild\get_externals.bat approach for\r
     obtaining external sources then you don't need to manually get the source\r
@@ -145,11 +145,10 @@ _ssl
         http://www.nasm.us/\r
     and add NASM to your PATH.\r
 \r
-    You can also install ActivePerl from\r
+    You will also need ActivePerl from\r
         http://www.activestate.com/activeperl/\r
-    if you like to use the official sources instead of the files from\r
-    python's subversion repository. The svn version contains pre-build\r
-    makefiles and assembly files.\r
+    in order to create the necessary makefiles and .asm files for building\r
+    OpenSSL.\r
 \r
     The build process makes sure that no patented algorithms are included.\r
     For now RC5, MDC2 and IDEA are excluded from the build. You may have\r

diff --git a/PCbuild/_hashlib.vcxproj b/PCbuild/_hashlib.vcxproj
index 0f98966a879ae7167f28ddc2389e3c715f62d2d3..5616a1e4cabdee51ec0b002e00484d28ee831715 100644 (file)
--- a/PCbuild/_hashlib.vcxproj
+++ b/PCbuild/_hashlib.vcxproj
@@ -61,7 +61,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
-      <AdditionalIncludeDirectories>$(opensslDir)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(opensslIncludeDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <AdditionalDependencies>ws2_32.lib;$(OutDir)libeay$(PyDebugExt).lib;$(OutDir)ssleay$(PyDebugExt).lib;%(AdditionalDependencies)</AdditionalDependencies>

diff --git a/PCbuild/_ssl.vcxproj b/PCbuild/_ssl.vcxproj
index fff23c7bc2c04579b13a7d256035401360d86b3e..73c95713a0cb9671e97bb0590c885afe4c95fcbc 100644 (file)
--- a/PCbuild/_ssl.vcxproj
+++ b/PCbuild/_ssl.vcxproj
@@ -61,7 +61,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
-      <AdditionalIncludeDirectories>$(opensslDir)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(opensslIncludeDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <AdditionalDependencies>ws2_32.lib;crypt32.lib;$(OutDir)libeay$(PyDebugExt).lib;$(OutDir)ssleay$(PyDebugExt).lib;%(AdditionalDependencies)</AdditionalDependencies>

diff --git a/PCbuild/get_externals.bat b/PCbuild/get_externals.bat
index ffd1a16216e85fcd524e7d52c5906a9a2d459bc2..333ee8250c0a9404f5f66a2322e6cf9da6f5ecf1 100644 (file)
--- a/PCbuild/get_externals.bat
+++ b/PCbuild/get_externals.bat
@@ -58,7 +58,7 @@ set libraries=
 set libraries=%libraries%                                    bzip2-1.0.6\r
 if NOT "%IncludeBsddb%"=="false" set libraries=%libraries%   db-4.7.25.0\r
 if NOT "%IncludeSSL%"=="false" set libraries=%libraries%     nasm-2.11.06\r
-if NOT "%IncludeSSL%"=="false" set libraries=%libraries%     openssl-1.0.2d\r
+if NOT "%IncludeSSL%"=="false" set libraries=%libraries%     openssl-1.0.2f\r
 set libraries=%libraries%                                    sqlite-3.6.21\r
 if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tcl-8.5.15.0\r
 if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tk-8.5.15.0\r

diff --git a/PCbuild/openssl.props b/PCbuild/openssl.props
index 54f3596fb00ba9a4ce761112c94436a4756ceecd..e45964ee87f9fcb0e32e131a3986f0ee82df31f3 100644 (file)
--- a/PCbuild/openssl.props
+++ b/PCbuild/openssl.props
@@ -15,9 +15,8 @@
     <PreprocessorDefinitions Include="_CRT_SECURE_NO_WARNINGS" />
     <PreprocessorDefinitions Include="_CRT_SECURE_NO_DEPRECATE" />
     <PreprocessorDefinitions Include="OPENSSL_THREADS" />
-    <PreprocessorDefinitions Include="OPENSSL_SYSNAME_WIN32" />
+    <!-- <PreprocessorDefinitions Include="OPENSSL_SYSNAME_WIN32" /> -->
     <PreprocessorDefinitions Include="OPENSSL_IA32_SSE2" />
-    <PreprocessorDefinitions Include="OPENSSL_CPUID_OBJ" />
     <PreprocessorDefinitions Include="SHA1_ASM" />
     <PreprocessorDefinitions Include="SHA256_ASM" />
     <PreprocessorDefinitions Include="SHA512_ASM" />
@@ -51,7 +50,7 @@
     <ClCompile>
       <!-- Suppress 64-bit truncation warnings - they aren't ours to worry about -->
       <DisableSpecificWarnings>4244;4267</DisableSpecificWarnings>
-      <AdditionalIncludeDirectories>$(opensslDir);$(opensslDir)include;$(opensslDir)crypto;$(opensslDir)crypto\asn1;$(opensslDir)crypto\evp;$(opensslDir)crypto\modes</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(opensslDir);$(opensslIncludeDir);$(opensslDir)crypto;$(opensslDir)crypto\asn1;$(opensslDir)crypto\evp;$(opensslDir)crypto\modes</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>$(_PreprocessorDefinitionList);%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>

diff --git a/PCbuild/python.props b/PCbuild/python.props
index 08ddaf12f05a33515e44d6404e30f4bd734539fe..d51e58baa81173da982b5f6fcf1f147392bf6496 100644 (file)
--- a/PCbuild/python.props
+++ b/PCbuild/python.props
@@ -35,7 +35,9 @@
     <sqlite3Dir>$(ExternalsDir)sqlite-3.6.21\</sqlite3Dir>
     <bz2Dir>$(ExternalsDir)bzip2-1.0.6\</bz2Dir>
     <bsddbDir>$(ExternalsDir)db-4.7.25.0</bsddbDir>
-    <opensslDir>$(ExternalsDir)openssl-1.0.2d\</opensslDir>
+    <opensslDir>$(ExternalsDir)openssl-1.0.2f\</opensslDir>
+    <opensslIncludeDir>$(opensslDir)include32</opensslIncludeDir>
+    <opensslIncludeDir Condition="'$(ArchName)' == 'amd64'">$(opensslDir)include64</opensslIncludeDir>
     <nasmDir>$(ExternalsDir)\nasm-2.11.06\</nasmDir>
 
     <!-- Suffix for all binaries when building for debug -->

diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt
index 2388535cf050f03a07a0246f141cc8de3f597106..c15c3643ba2024d178225b93d07f5e71479b21cc 100644 (file)
--- a/PCbuild/readme.txt
+++ b/PCbuild/readme.txt
@@ -183,7 +183,7 @@ _bz2
     Homepage:\r
         http://www.bzip.org/\r
 _ssl\r
-    Python wrapper for version 1.0.2d of the OpenSSL secure sockets\r
+    Python wrapper for version 1.0.2f of the OpenSSL secure sockets\r
     library, which is built by ssl.vcxproj\r
     Homepage:\r
         http://www.openssl.org/\r