Movatterモバイル変換


[0]ホーム

URL:


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

Sign up
Appearance settings

gh-103142: Upgrade binary builds and CI to OpenSSL 1.1.1u#105174

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.

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

Already on GitHub?Sign in to your account

Merged
gpshead merged 7 commits intopython:mainfromgpshead:openssl-1.1.1u
Jun 1, 2023

Conversation

gpshead
Copy link
Member

@gpsheadgpshead commentedMay 31, 2023
edited by bedevere-bot
Loading

This OpenSSL version addresses a pile if less-urgent CVEs since 1.1.1t.

TheMac/BuildScript/build-installer.py file appears to have already been updated.

This OpenSSL version addresses a pile if less-urgent CVEs since 1.1.1t.The Mac/BuildScript/build-installer.py file appears to have already beenupdated.
@gpshead
Copy link
MemberAuthor

#105129 does more of this, so anything missing can probably just be moved over into that.@ned-deily

@ned-deily
Copy link
Member

@gpshead Sorry I didn't ping you earlier. I did not attempt to do the Windows changes. I figured that should be in a separate PR since the versions don't always match up. But feel free to use either PR.

@zooba
Copy link
Member

I'm doing updated binaries for Windows now. I'll let you know when they're done

@zooba
Copy link
Member

Binaries are up now. I'll hit rerun

Copy link
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

vshttps://github.com/python/cpython/pull/105129/files I manually reverted edits that removed definitions from this file as for the purposes of backporting, I don't want names to disappear. some were FIPS related and I'm blindly guessing that those may be special to some vendor openssl builds without digging into the history? regardless there is no harm in keeping names, everything is #ifdef based.

Copy link
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

I'm adding this, generated from 3.1.1 but do not intend to backport it beyond 3.12 (and if it causes anyone trouble in 3.12-land, we can just revert it there or re-add whatever is missing).

diff it vs the _300 file, you'll see the things missing that I avoided removing from the _300 one.

@gpsheadgpshead requested review fromYhg1s andned-deilyJune 1, 2023 03:47
@gpshead
Copy link
MemberAuthor

many backport labels removed as older backports will be generated from the 3.11 backport PR and successively chained ones as many backport edits will be the same.

@miss-islington
Copy link
Contributor

Thanks@gpshead for the PR 🌮🎉.. I'm working now to backport this PR to: 3.11, 3.12.
🐍🍒⛏🤖

@gpsheadgpshead deleted the openssl-1.1.1u branchJune 1, 2023 16:42
@miss-islington
Copy link
Contributor

Sorry,@gpshead, I could not cleanly backport this to3.11 due to a conflict.
Please backport usingcherry_picker on command line.
cherry_picker ede89af605b1c0442353435ad22195c16274f65d 3.11

miss-islington pushed a commit to miss-islington/cpython that referenced this pull requestJun 1, 2023
…onGH-105174)Upgrade builds to OpenSSL 1.1.1u.This OpenSSL version addresses a pile if less-urgent CVEs since 1.1.1t.The Mac/BuildScript/build-installer.py was already updated.Also updates _ssl_data_111.h from OpenSSL 1.1.1u, _ssl_data_300.h from 3.0.9, and adds a new _ssl_data_31.h file from 3.1.1 along with the ssl.c code to use it.Manual edits to the _ssl_data_300.h file prevent it from removing any existing definitions in case those exist in some peoples builds and were important (avoiding regressions during backporting).backports of this prior to 3.12 will not include the openssl 3.1 header.(cherry picked from commitede89af)Co-authored-by: Gregory P. Smith <greg@krypto.org>
@bedevere-bot
Copy link

GH-105199 is a backport of this pull request to the3.12 branch.

@bedevere-botbedevere-bot removed the needs backport to 3.12only security fixes labelJun 1, 2023
gpshead added a commit that referenced this pull requestJun 1, 2023
…105174) (#105199)gh-103142: Upgrade binary builds and CI to OpenSSL 1.1.1u (GH-105174)Upgrade builds to OpenSSL 1.1.1u.This OpenSSL version addresses a pile if less-urgent CVEs since 1.1.1t.The Mac/BuildScript/build-installer.py was already updated.Also updates _ssl_data_111.h from OpenSSL 1.1.1u, _ssl_data_300.h from 3.0.9, and adds a new _ssl_data_31.h file from 3.1.1 along with the ssl.c code to use it.Manual edits to the _ssl_data_300.h file prevent it from removing any existing definitions in case those exist in some peoples builds and were important (avoiding regressions during backporting).backports of this prior to 3.12 will not include the openssl 3.1 header.(cherry picked from commitede89af)Co-authored-by: Gregory P. Smith [Google] <greg@krypto.org>
gpshead added a commit to gpshead/cpython that referenced this pull requestJun 1, 2023
pythonGH-105174)Upgrade builds to OpenSSL 1.1.1u.This OpenSSL version addresses a pile if less-urgent CVEs since 1.1.1t.The Mac/BuildScript/build-installer.py was already updated.Also updates _ssl_data_111.h from OpenSSL 1.1.1u, _ssl_data_300.h from 3.0.9, and adds a new _ssl_data_31.h file from 3.1.1 along with the ssl.c code to use it.Manual edits to the _ssl_data_300.h file prevent it from removing any existing definitions in case those exist in some peoples builds and were important (avoiding regressions during backporting).backports of this prior to 3.12 will not include the openssl 3.1 header..(cherry picked from commitede89af)Co-authored-by: Gregory P. Smith <greg@krypto.org>
@bedevere-bot
Copy link

GH-105200 is a backport of this pull request to the3.11 branch.

@bedevere-botbedevere-bot removed the needs backport to 3.11only security fixes labelJun 1, 2023
gpshead added a commit that referenced this pull requestJun 1, 2023
…105174)  (#105200)Upgrade builds to OpenSSL 1.1.1u.This OpenSSL version addresses a pile if less-urgent CVEs since 1.1.1t.The Mac/BuildScript/build-installer.py was already updated.Also updates _ssl_data_111.h from OpenSSL 1.1.1u, _ssl_data_300.h from 3.0.9.Manual edits to the _ssl_data_300.h file prevent it from removing any existing definitions in case those exist in some peoples builds and were important (avoiding regressions during backporting).(cherry picked from commitede89af)
gpshead added a commit to gpshead/cpython that referenced this pull requestJun 1, 2023
…L 1.1.1u (pythonGH-105174)  (pythonGH-105200)Upgrade builds to OpenSSL 1.1.1u.This OpenSSL version addresses a pile if less-urgent CVEs since 1.1.1t.The Mac/BuildScript/build-installer.py was already updated.Also updates _ssl_data_111.h from OpenSSL 1.1.1u, _ssl_data_300.h from 3.0.9.Manual edits to the _ssl_data_300.h file prevent it from removing any existing definitions in case those exist in some peoples builds and were important (avoiding regressions during backporting).(cherry picked from commitede89af).(cherry picked from commita5d2b54)Co-authored-by: Gregory P. Smith <greg@krypto.org>
gpshead added a commit to gpshead/cpython that referenced this pull requestJun 1, 2023
…pythonGH-105174) (python#105200)Upgrade builds to OpenSSL 1.1.1u.Also updates _ssl_data_111.h from OpenSSL 1.1.1u, _ssl_data_300.h from 3.0.9.Manual edits to the _ssl_data_300.h file prevent it from removing anyexisting definitions in case those exist in some peoples builds and wereimportant (avoiding regressions during backporting).(cherry picked from commitede89af)
ambv pushed a commit that referenced this pull requestJun 5, 2023
…05174) (GH-105200) (#105205)Upgrade builds to OpenSSL 1.1.1u.Also updates _ssl_data_111.h from OpenSSL 1.1.1u, _ssl_data_300.h from 3.0.9.Manual edits to the _ssl_data_300.h file prevent it from removing anyexisting definitions in case those exist in some peoples builds and wereimportant (avoiding regressions during backporting).(cherry picked from commitede89af)Co-authored-by: Ned Deily <nad@python.org>
ambv pushed a commit that referenced this pull requestJun 5, 2023
…105174) (GH-105200) (#105204)Upgrade builds to OpenSSL 1.1.1u.This OpenSSL version addresses a pile if less-urgent CVEs since 1.1.1t.The Mac/BuildScript/build-installer.py was already updated.Also updates _ssl_data_111.h from OpenSSL 1.1.1u, _ssl_data_300.h from 3.0.9.Manual edits to the _ssl_data_300.h file prevent it from removing any existing definitions in case those exist in some peoples builds and were important (avoiding regressions during backporting).(cherry picked from commitede89af).(cherry picked from commita5d2b54)(cherry picked from commitf90d3f6)Co-authored-by: Gregory P. Smith <greg@krypto.org>
ambv pushed a commit to ambv/cpython that referenced this pull requestJun 6, 2023
…1.1.1u (pythonGH-105174) (pythonGH-105200) (pythonGH-105205)Upgrade builds to OpenSSL 1.1.1u.Also updates _ssl_data_111.h from OpenSSL 1.1.1u, _ssl_data_300.h from 3.0.9.Manual edits to the _ssl_data_300.h file prevent it from removing anyexisting definitions in case those exist in some peoples builds and wereimportant (avoiding regressions during backporting).(cherry picked from commitede89af)(cherry picked from commite15de14)Co-authored-by: Gregory P. Smith <greg@krypto.org>Co-authored-by: Ned Deily <nad@python.org>
ambv added a commit that referenced this pull requestJun 6, 2023
…05174) (GH-105200) (GH-105205) (#105370)Upgrade builds to OpenSSL 1.1.1u.Also updates _ssl_data_111.h from OpenSSL 1.1.1u, _ssl_data_300.h from 3.0.9.Manual edits to the _ssl_data_300.h file prevent it from removing anyexisting definitions in case those exist in some peoples builds and wereimportant (avoiding regressions during backporting).(cherry picked from commitede89af)(cherry picked from commite15de14)Co-authored-by: Gregory P. Smith <greg@krypto.org>Co-authored-by: Ned Deily <nad@python.org>
carlosroman added a commit to DataDog/cpython that referenced this pull requestJun 22, 2023
* Post 3.8.16* [3.8] Update copyright years to 2023. (pythongh-100852)* [3.8] Update copyright years to 2023. (pythongh-100848).(cherry picked from commit11f9932)Co-authored-by: Benjamin Peterson <benjamin@python.org>* Update additional copyright years to 2023.Co-authored-by: Ned Deily <nad@python.org>* [3.8] Update copyright year in README (pythonGH-100863) (pythonGH-100867)(cherry picked from commit30a6cc4)Co-authored-by: Ned Deily <nad@python.org>Co-authored-by: HARSHA VARDHAN <75431678+Thunder-007@users.noreply.github.com>* [3.8] CorrectCVE-2020-10735 documentation (pythonGH-100306) (python#100698)(cherry picked from commit1cf3d78)(cherry picked from commit88fe8d7)Co-authored-by: Jeremy Paige <ucodery@gmail.com>Co-authored-by: Gregory P. Smith <greg@krypto.org>* [3.8] Bump Azure Pipelines to ubuntu-22.04 (pythonGH-101089) (python#101215)(cherry picked from commitc22a55c)Co-authored-by: Hugo van Kemenade <hugovk@users.noreply.github.com>* [3.8]pythongh-100180: Update Windows installer to OpenSSL 1.1.1s (pythonGH-100903) (python#101258)*pythongh-101422: (docs) TarFile default errorlevel argument is 1, not 0 (pythonGH-101424)(cherry picked from commitea23271)Co-authored-by: Owain Davies <116417456+OTheDev@users.noreply.github.com>* [3.8]pythongh-95778: add doc missing in some places (pythonGH-100627) (python#101630)(cherry picked from commit4652182)* [3.8]pythongh-101283: Improved fallback logic for subprocess with shell=True on Windows (pythonGH-101286) (python#101710)Co-authored-by: Oleg Iarygin <oleg@arhadthedev.net>Co-authored-by: Steve Dower <steve.dower@microsoft.com>* [3.8]pythongh-101981: Fix Ubuntu SSL tests with OpenSSL (3.1.0-beta1) CI i… (python#102095)[3.8]pythongh-101981: Fix Ubuntu SSL tests with OpenSSL (3.1.0-beta1) CI issue (pythongh-102079)* [3.8]pythonGH-102306 Avoid GHA CI macOS test_posix failure by using the appropriate macOS SDK (pythonGH-102307)[3.8] Avoid GHA CI macOS test_posix failure by using the appropriate macOS SDK.* [3.8]pythongh-101726: Update the OpenSSL version to 1.1.1t (pythonGH-101727) (pythonGH-101752)FixesCVE-2023-0286 (High) and a couple of Medium security issues.https://www.openssl.org/news/secadv/20230207.txtCo-authored-by: Gregory P. Smith <greg@krypto.org>Co-authored-by: Ned Deily <nad@python.org>* [3.8]pythongh-102627: Replace address pointing toward malicious web page (pythonGH-102630) (pythonGH-102667)(cherry picked from commit61479d4)Co-authored-by: Blind4Basics <32236948+Blind4Basics@users.noreply.github.com>Co-authored-by: C.A.M. Gerlach <CAM.Gerlach@Gerlach.CAM>Co-authored-by: Hugo van Kemenade <hugovk@users.noreply.github.com>* [3.8]pythongh-101997: Update bundled pip version to 23.0.1 (pythonGH-101998). (python#102244)(cherry picked from commit89d9ff0)* [3.8]pythongh-102950: Implement PEP 706 – Filter for tarfile.extractall (pythonGH-102953) (python#104548)Backport ofc8c3956* [3.8]pythongh-99889: Fix directory traversal security flaw in uu.decode() (pythonGH-104096) (python#104332)(cherry picked from commit0aeda29)Co-authored-by: Sam Carroll <70000253+samcarroll42@users.noreply.github.com>* [3.8]pythongh-104049: do not expose on-disk location from SimpleHTTPRequestHandler (pythonGH-104067) (python#104121)Do not expose the local server's on-disk location from `SimpleHTTPRequestHandler` when generating a directory index. (unnecessary information disclosure)(cherry picked from commitc7c3a60)Co-authored-by: Ethan Furman <ethan@stoneleaf.us>Co-authored-by: Gregory P. Smith <greg@krypto.org>Co-authored-by: Jelle Zijlstra <jelle.zijlstra@gmail.com>* [3.8]pythongh-103935: Use `io.open_code()` when executing code in trace and profile modules (pythonGH-103947) (python#103954)Co-authored-by: Tian Gao <gaogaotiantian@hotmail.com>* [3.8]pythongh-68966: fix versionchanged in docs (pythonGH-105299)* [3.8] Update GitHub CI workflow for macOS. (pythonGH-105302)* [3.8]pythongh-105184: document that marshal functions can fail and need to be checked with PyErr_Occurred (pythonGH-105185) (python#105222)(cherry picked from commitee26ca1)Co-authored-by: Irit Katriel <1055913+iritkatriel@users.noreply.github.com>* [3.8]pythongh-102153: Start stripping C0 control and space chars in `urlsplit` (pythonGH-102508) (pythonGH-104575) (pythonGH-104592) (python#104593) (python#104895)`urllib.parse.urlsplit` has already been respecting the WHATWG spec a bitpythonGH-25595.This adds more sanitizing to respect the "Remove any leading C0 control or space from input" [rule](https://url.spec.whatwg.org/GH-url-parsing:~:text=Remove%20any%20leading%20and%20trailing%20C0%20control%20or%20space%20from%20input.) in response to [CVE-2023-24329](https://nvd.nist.gov/vuln/detail/CVE-2023-24329).I simplified the docs by eliding the state of the world explanatoryparagraph in this security release only backport.  (people will seethat in the mainline /3/ docs)(cherry picked from commitd7f8a5f)(cherry picked from commit2f630e1)(cherry picked from commit610cc0a)(cherry picked from commitf48a96a)Co-authored-by: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>Co-authored-by: Illia Volochii <illia.volochii@gmail.com>Co-authored-by: Gregory P. Smith [Google] <greg@krypto.org>* [3.8]pythongh-103142: Upgrade binary builds and CI to OpenSSL 1.1.1u (pythonGH-105174) (pythonGH-105200) (pythonGH-105205) (python#105370)Upgrade builds to OpenSSL 1.1.1u.Also updates _ssl_data_111.h from OpenSSL 1.1.1u, _ssl_data_300.h from 3.0.9.Manual edits to the _ssl_data_300.h file prevent it from removing anyexisting definitions in case those exist in some peoples builds and wereimportant (avoiding regressions during backporting).(cherry picked from commitede89af)(cherry picked from commite15de14)Co-authored-by: Gregory P. Smith <greg@krypto.org>Co-authored-by: Ned Deily <nad@python.org>* Python 3.8.17* Post 3.8.17* Updated CI to build 3.8.17---------Co-authored-by: Łukasz Langa <lukasz@langa.pl>Co-authored-by: Benjamin Peterson <benjamin@python.org>Co-authored-by: Ned Deily <nad@python.org>Co-authored-by: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>Co-authored-by: HARSHA VARDHAN <75431678+Thunder-007@users.noreply.github.com>Co-authored-by: Gregory P. Smith <greg@krypto.org>Co-authored-by: Jeremy Paige <ucodery@gmail.com>Co-authored-by: Hugo van Kemenade <hugovk@users.noreply.github.com>Co-authored-by: Steve Dower <steve.dower@python.org>Co-authored-by: Owain Davies <116417456+OTheDev@users.noreply.github.com>Co-authored-by: Éric <earaujo@caravan.coop>Co-authored-by: Oleg Iarygin <oleg@arhadthedev.net>Co-authored-by: Steve Dower <steve.dower@microsoft.com>Co-authored-by: Dong-hee Na <donghee.na@python.org>Co-authored-by: Blind4Basics <32236948+Blind4Basics@users.noreply.github.com>Co-authored-by: C.A.M. Gerlach <CAM.Gerlach@Gerlach.CAM>Co-authored-by: Pradyun Gedam <pradyunsg@gmail.com>Co-authored-by: Petr Viktorin <encukou@gmail.com>Co-authored-by: Sam Carroll <70000253+samcarroll42@users.noreply.github.com>Co-authored-by: Ethan Furman <ethan@stoneleaf.us>Co-authored-by: Jelle Zijlstra <jelle.zijlstra@gmail.com>Co-authored-by: Tian Gao <gaogaotiantian@hotmail.com>Co-authored-by: Irit Katriel <1055913+iritkatriel@users.noreply.github.com>Co-authored-by: stratakis <cstratak@redhat.com>Co-authored-by: Illia Volochii <illia.volochii@gmail.com>
glebfm pushed a commit to glebfm/cpython that referenced this pull requestJul 30, 2023
…on#105174)Upgrade builds to OpenSSL 1.1.1u.This OpenSSL version addresses a pile if less-urgent CVEs since 1.1.1t.The Mac/BuildScript/build-installer.py was already updated.Also updates _ssl_data_111.h from OpenSSL 1.1.1u, _ssl_data_300.h from 3.0.9, and adds a new _ssl_data_31.h file from 3.1.1 along with the ssl.c code to use it.Manual edits to the _ssl_data_300.h file prevent it from removing any existing definitions in case those exist in some peoples builds and were important (avoiding regressions during backporting).backports of this prior to 3.12 will not include the openssl 3.1 header.(cherry picked from commitede89af)
Sign up for freeto join this conversation on GitHub. Already have an account?Sign in to comment
Reviewers

@ned-deilyned-deilyned-deily approved these changes

@ezio-melottiezio-melottiAwaiting requested review from ezio-melottiezio-melotti is a code owner

@hugovkhugovkAwaiting requested review from hugovkhugovk is a code owner

@Yhg1sYhg1sAwaiting requested review from Yhg1s

Assignees

@gpsheadgpshead

Labels
Projects
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

5 participants
@gpshead@ned-deily@zooba@miss-islington@bedevere-bot

[8]ページ先頭

©2009-2025 Movatter.jp