Skip to content

[3.10] gh-101726: Update the OpenSSL version to 1.1.1t (GH-101727) #101750

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
zooba merged 2 commits into from
Feb 9, 2023
Merged

[3.10] gh-101726: Update the OpenSSL version to 1.1.1t (GH-101727) #101750

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
91196b6
gh-101726: Update the OpenSSL version to 1.1.1t (GH-101727)
gpshead Feb 9, 2023
5e10d68
Fix missed conflict
zooba Feb 9, 2023
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
Prev Previous commit
Fix missed conflict
  • Loading branch information
@zooba
zooba committed Feb 9, 2023
commit 5e10d6872326ba7f1e59c0b29509d2fbdf6df6bd
8 changes: 1 addition & 7 deletions PCbuild/get_externals.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,15 +76,9 @@ for %%e in (%libraries%) do (
echo.Fetching external binaries...

set binaries=
<<<<<<< HEAD
if NOT "%IncludeLibffi%"=="false" set binaries=%binaries% libffi-3.3.0
if NOT "%IncludeSSL%"=="false" set binaries=%binaries% openssl-bin-1.1.1s
if NOT "%IncludeTkinter%"=="false" set binaries=%binaries% tcltk-8.6.12.0
=======
if NOT "%IncludeLibffi%"=="false" set binaries=%binaries% libffi-3.4.3
if NOT "%IncludeSSL%"=="false" set binaries=%binaries% openssl-bin-1.1.1t
if NOT "%IncludeTkinter%"=="false" set binaries=%binaries% tcltk-8.6.12.1
>>>>>>> 6eb7d45f83 (gh-101726: Update the OpenSSL version to 1.1.1t (GH-101727))
if NOT "%IncludeTkinter%"=="false" set binaries=%binaries% tcltk-8.6.12.0
if NOT "%IncludeSSLSrc%"=="false" set binaries=%binaries% nasm-2.11.06

for %%b in (%binaries%) do (
Expand Down