Skip to content

[3.7] gh-100180: Update Windows installer to OpenSSL 1.1.1s (GH-100903) #101259

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ned-deily merged 1 commit into from
Jan 25, 2023
Merged

[3.7] gh-100180: Update Windows installer to OpenSSL 1.1.1s (GH-100903) #101259

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
[3.7] gh-100180: Update Windows installer to OpenSSL 1.1.1s (GH-100903)
  • Loading branch information
@zooba
zooba committed Jan 23, 2023
commit d06e8b03f91c7b5f59a0388bb7fdbe74b5b88fca
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Windows/2023-01-09-23-03-57.gh-issue-100180.b5phrg.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Update Windows installer to OpenSSL 1.1.1s
4 changes: 2 additions & 2 deletions PCbuild/get_externals.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ echo.Fetching external libraries...

set libraries=
set libraries=%libraries% bzip2-1.0.8
if NOT "%IncludeSSLSrc%"=="false" set libraries=%libraries% openssl-1.1.1n
if NOT "%IncludeSSLSrc%"=="false" set libraries=%libraries% openssl-1.1.1s
set libraries=%libraries% sqlite-3.31.1.0
if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tcl-core-8.6.9.0
if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tk-8.6.9.0
Expand All @@ -72,7 +72,7 @@ for %%e in (%libraries%) do (
echo.Fetching external binaries...

set binaries=
if NOT "%IncludeSSL%"=="false" set binaries=%binaries% openssl-bin-1.1.1n
if NOT "%IncludeSSL%"=="false" set binaries=%binaries% openssl-bin-1.1.1s
if NOT "%IncludeTkinter%"=="false" set binaries=%binaries% tcltk-8.6.9.0
if NOT "%IncludeSSLSrc%"=="false" set binaries=%binaries% nasm-2.11.06

Expand Down
4 changes: 2 additions & 2 deletions PCbuild/python.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@
<sqlite3Dir>$(ExternalsDir)sqlite-3.31.1.0\</sqlite3Dir>
<bz2Dir>$(ExternalsDir)bzip2-1.0.8\</bz2Dir>
<lzmaDir>$(ExternalsDir)xz-5.2.2\</lzmaDir>
<opensslDir>$(ExternalsDir)openssl-1.1.1n\</opensslDir>
<opensslOutDir>$(ExternalsDir)openssl-bin-1.1.1n\$(ArchName)\</opensslOutDir>
<opensslDir>$(ExternalsDir)openssl-1.1.1s\</opensslDir>
<opensslOutDir>$(ExternalsDir)openssl-bin-1.1.1s\$(ArchName)\</opensslOutDir>
<opensslIncludeDir>$(opensslOutDir)include</opensslIncludeDir>
<nasmDir>$(ExternalsDir)\nasm-2.11.06\</nasmDir>
<zlibDir>$(ExternalsDir)\zlib-1.2.12\</zlibDir>
Expand Down