Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit e2d7366

Browse filesBrowse files
zoobazooba
authored
gh-99079: Update Windows build to use OpenSSL 3.0.9 (GH-106649)
1 parent 2ca008e commit e2d7366
Copy full SHA for e2d7366

File tree

Expand file treeCollapse file tree

6 files changed

+10
-8
lines changed
Filter options
Expand file treeCollapse file tree

6 files changed

+10
-8
lines changed

‎Misc/NEWS.d/next/Windows/2023-07-11-20-48-17.gh-issue-99079.CIMftz.rst

Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Update Windows build to use OpenSSL 3.0.9

‎PCbuild/get_externals.bat

Copy file name to clipboardExpand all lines: PCbuild/get_externals.bat
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ echo.Fetching external libraries...
5353
set libraries=
5454
set libraries=%libraries% bzip2-1.0.8
5555
if NOT "%IncludeLibffiSrc%"=="false" set libraries=%libraries% libffi-3.4.4
56-
if NOT "%IncludeSSLSrc%"=="false" set libraries=%libraries% openssl-1.1.1u
56+
if NOT "%IncludeSSLSrc%"=="false" set libraries=%libraries% openssl-3.0.9
5757
set libraries=%libraries% sqlite-3.42.0.0
5858
if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tcl-core-8.6.13.0
5959
if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tk-8.6.13.0
@@ -76,7 +76,7 @@ echo.Fetching external binaries...
7676

7777
set binaries=
7878
if NOT "%IncludeLibffi%"=="false" set binaries=%binaries% libffi-3.4.4
79-
if NOT "%IncludeSSL%"=="false" set binaries=%binaries% openssl-bin-1.1.1u
79+
if NOT "%IncludeSSL%"=="false" set binaries=%binaries% openssl-bin-3.0.9
8080
if NOT "%IncludeTkinter%"=="false" set binaries=%binaries% tcltk-8.6.13.0
8181
if NOT "%IncludeSSLSrc%"=="false" set binaries=%binaries% nasm-2.11.06
8282

‎PCbuild/openssl.props

Copy file name to clipboardExpand all lines: PCbuild/openssl.props
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
</Link>
1111
</ItemDefinitionGroup>
1212
<PropertyGroup>
13-
<_DLLSuffix>-1_1</_DLLSuffix>
13+
<_DLLSuffix>-3</_DLLSuffix>
1414
<_DLLSuffix Condition="$(Platform) == 'ARM'">$(_DLLSuffix)-arm</_DLLSuffix>
1515
<_DLLSuffix Condition="$(Platform) == 'ARM64'">$(_DLLSuffix)-arm64</_DLLSuffix>
16-
<OpenSSLDLLSuffix>$(_DLLSuffix)</OpenSSLDLLSuffix>
16+
<OpenSSLDLLSuffix Condition="$(OpenSSLDLLSuffix) == ''">$(_DLLSuffix)</OpenSSLDLLSuffix>
1717
</PropertyGroup>
1818
<ItemGroup>
1919
<_SSLDLL Include="$(opensslOutDir)\libcrypto$(_DLLSuffix).dll" />

‎PCbuild/python.props

Copy file name to clipboardExpand all lines: PCbuild/python.props
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@
7474
<libffiDir Condition="$(libffiDir) == ''">$(ExternalsDir)libffi-3.4.4\</libffiDir>
7575
<libffiOutDir Condition="$(libffiOutDir) == ''">$(libffiDir)$(ArchName)\</libffiOutDir>
7676
<libffiIncludeDir Condition="$(libffiIncludeDir) == ''">$(libffiOutDir)include</libffiIncludeDir>
77-
<opensslDir Condition="$(opensslDir) == ''">$(ExternalsDir)openssl-1.1.1u\</opensslDir>
78-
<opensslOutDir Condition="$(opensslOutDir) == ''">$(ExternalsDir)openssl-bin-1.1.1u\$(ArchName)\</opensslOutDir>
77+
<opensslDir Condition="$(opensslDir) == ''">$(ExternalsDir)openssl-3.0.9\</opensslDir>
78+
<opensslOutDir Condition="$(opensslOutDir) == ''">$(ExternalsDir)openssl-bin-3.0.9\$(ArchName)\</opensslOutDir>
7979
<opensslIncludeDir Condition="$(opensslIncludeDir) == ''">$(opensslOutDir)include</opensslIncludeDir>
8080
<nasmDir Condition="$(nasmDir) == ''">$(ExternalsDir)\nasm-2.11.06\</nasmDir>
8181
<zlibDir Condition="$(zlibDir) == ''">$(ExternalsDir)\zlib-1.2.13\</zlibDir>

‎PCbuild/readme.txt

Copy file name to clipboardExpand all lines: PCbuild/readme.txt
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ _lzma
168168
Homepage:
169169
https://tukaani.org/xz/
170170
_ssl
171-
Python wrapper for version 1.1.1u of the OpenSSL secure sockets
171+
Python wrapper for version 3.0 of the OpenSSL secure sockets
172172
library, which is downloaded from our binaries repository at
173173
https://github.com/python/cpython-bin-deps.
174174

‎PCbuild/regen.targets

Copy file name to clipboardExpand all lines: PCbuild/regen.targets
+2-1Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,9 @@
104104
<_LicenseSources Include="$(PySourcePath)LICENSE;
105105
$(PySourcePath)PC\crtlicense.txt;
106106
$(bz2Dir)LICENSE;
107-
$(opensslOutDir)LICENSE;
108107
$(libffiDir)LICENSE;" />
108+
<_LicenseSources Include="$(opensslOutDir)LICENSE.txt" Condition="Exists('$(opensslOutDir)LICENSE.txt')" />
109+
<_LicenseSources Include="$(opensslOutDir)LICENSE" Condition="!Exists('$(opensslOutDir)LICENSE.txt')" />
109110
<_LicenseSources Include="$(tcltkDir)tcllicense.terms;
110111
$(tcltkDir)tklicense.terms" Condition="$(IncludeTkinter)" />
111112
</ItemGroup>

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.