diff options
| -rw-r--r-- | Misc/NEWS | 3 | ||||
| -rw-r--r-- | PCbuild/_hashlib.vcxproj | 4 | ||||
| -rw-r--r-- | PCbuild/_ssl.vcxproj | 4 | ||||
| -rw-r--r-- | PCbuild/get_externals.bat | 2 | ||||
| -rw-r--r-- | PCbuild/openssl.props | 7 | ||||
| -rw-r--r-- | PCbuild/python.props | 4 | ||||
| -rw-r--r-- | PCbuild/readme.txt | 2 |
7 files changed, 14 insertions, 12 deletions
@@ -258,7 +258,8 @@ Build - Issue #25696: Fix installation of Python on UNIX with make -j9. -- Issue #26268: Update OS X 10.5 installer to use OpenSSL 1.0.2f. +- Issue #26268: Update OS X 10.5 installer and Windows builds to use + OpenSSL 1.0.2f. Windows ------- diff --git a/PCbuild/_hashlib.vcxproj b/PCbuild/_hashlib.vcxproj index d82b266..5616a1e 100644 --- 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> @@ -87,4 +87,4 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/PCbuild/_ssl.vcxproj b/PCbuild/_ssl.vcxproj index 8594a06..73c9571 100644 --- 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> @@ -91,4 +91,4 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/PCbuild/get_externals.bat b/PCbuild/get_externals.bat index 0b3c08b..f6ed070 100644 --- a/PCbuild/get_externals.bat +++ b/PCbuild/get_externals.bat @@ -54,7 +54,7 @@ echo.Fetching external libraries... set libraries=
set libraries=%libraries% bzip2-1.0.6
if NOT "%IncludeSSL%"=="false" set libraries=%libraries% nasm-2.11.06
-if NOT "%IncludeSSL%"=="false" set libraries=%libraries% openssl-1.0.2d
+if NOT "%IncludeSSL%"=="false" set libraries=%libraries% openssl-1.0.2f
set libraries=%libraries% sqlite-3.8.11.0
if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tcl-core-8.6.4.2
if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tk-8.6.4.2
diff --git a/PCbuild/openssl.props b/PCbuild/openssl.props index d094e59..e35c0d9 100644 --- a/PCbuild/openssl.props +++ b/PCbuild/openssl.props @@ -17,9 +17,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" /> @@ -53,7 +52,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> @@ -74,4 +73,4 @@ $(nasm) -o "$(IntDir)%(NasmCompile.Filename).obj" "%(NasmCompile.FullPath)"' /> <Lib Include="$(IntDir)%(NasmCompile.Filename).obj" /> </ItemGroup> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/PCbuild/python.props b/PCbuild/python.props index 4d8f603..8ad9a89 100644 --- a/PCbuild/python.props +++ b/PCbuild/python.props @@ -41,7 +41,9 @@ <sqlite3Dir>$(ExternalsDir)sqlite-3.8.11.0\</sqlite3Dir> <bz2Dir>$(ExternalsDir)bzip2-1.0.6\</bz2Dir> <lzmaDir>$(ExternalsDir)xz-5.0.5\</lzmaDir> - <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 09a996f..78ee0f9 100644 --- a/PCbuild/readme.txt +++ b/PCbuild/readme.txt @@ -169,7 +169,7 @@ _lzma Homepage:
http://tukaani.org/xz/
_ssl
- Python wrapper for version 1.0.2d of the OpenSSL secure sockets
+ Python wrapper for version 1.0.2f of the OpenSSL secure sockets
library, which is built by ssl.vcxproj
Homepage:
http://www.openssl.org/
|