Skip to content

Commit

Permalink
[3005.2] Update cryptography to 41.0.3
Browse files Browse the repository at this point in the history
  • Loading branch information
Megan Wilhite committed Aug 2, 2023
1 parent 5972888 commit dff6f6c
Show file tree
Hide file tree
Showing 44 changed files with 46 additions and 44 deletions.
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,12 @@ Security

Due to:
* https://github.com/advisories/GHSA-j8r2-6x86-q33q (#64336)
- Upgrade to `cryptography==41.0.2`(and therefor `pyopenssl==23.2.0` due to https://github.com/advisories/GHSA-5cpq-8wj7-hf2v)
- Upgrade to `cryptography==41.0.3`(and therefor `pyopenssl==23.2.0` due to https://github.com/advisories/GHSA-jm77-qphf-c4w8)

Also resolves the following cryptography advisories:

Due to:
* https://github.com/advisories/GHSA-5cpq-8wj7-hf2v
* https://github.com/advisories/GHSA-x4qr-2fvf-3mr5
* https://github.com/advisories/GHSA-w7pp-m8wf-vj6r

Expand Down
3 changes: 2 additions & 1 deletion doc/topics/releases/3005.2.rst
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,12 @@ Security

Due to:
* https://github.com/advisories/GHSA-j8r2-6x86-q33q (#64336)
- Upgrade to `cryptography==41.0.2`(and therefor `pyopenssl==23.2.0` due to https://github.com/advisories/GHSA-5cpq-8wj7-hf2v)
- Upgrade to `cryptography==41.0.3`(and therefor `pyopenssl==23.2.0` due to https://github.com/advisories/GHSA-jm77-qphf-c4w8)

Also resolves the following cryptography advisories:

Due to:
* https://github.com/advisories/GHSA-5cpq-8wj7-hf2v
* https://github.com/advisories/GHSA-x4qr-2fvf-3mr5
* https://github.com/advisories/GHSA-w7pp-m8wf-vj6r

Expand Down
2 changes: 1 addition & 1 deletion requirements/darwin.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
apache-libcloud>=2.4.0
backports.ssl_match_hostname>=3.7.0.1; python_version < '3.7'
cherrypy>=17.4.1
cryptography>=41.0.2 ; python_version >= "3.7"
cryptography>=41.0.3 ; python_version >= "3.7"
cryptography<=40.0.2 ; python_version == "3.6"
cryptography<=3.2.1 ; python_version <= "3.5"
gitpython>=2.1.15 ; python_version <= "3.6"
Expand Down
2 changes: 1 addition & 1 deletion requirements/static/ci/py3.10/cloud.txt
Original file line number Diff line number Diff line change
Expand Up @@ -383,7 +383,7 @@ contextvars==2.4
# via -r requirements/base.txt
croniter==1.0.15 ; sys_platform != "win32"
# via -r requirements/static/ci/common.in
cryptography==41.0.2 ; python_version >= "3.7"
cryptography==41.0.3 ; python_version >= "3.7"
# via
# -r requirements/static/pkg/linux.in
# adal
Expand Down
2 changes: 1 addition & 1 deletion requirements/static/ci/py3.10/darwin.txt
Original file line number Diff line number Diff line change
Expand Up @@ -386,7 +386,7 @@ contextvars==2.4
# via -r requirements/base.txt
croniter==0.3.29 ; sys_platform != "win32"
# via -r requirements/static/ci/common.in
cryptography==41.0.2 ; python_version >= "3.7"
cryptography==41.0.3 ; python_version >= "3.7"
# via
# -r requirements/darwin.txt
# adal
Expand Down
2 changes: 1 addition & 1 deletion requirements/static/ci/py3.10/docs.txt
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,7 @@ contextvars==2.4
# via -r requirements/base.txt
croniter==1.0.15 ; sys_platform != "win32"
# via -r requirements/static/ci/common.in
cryptography==41.0.2 ; python_version >= "3.7"
cryptography==41.0.3 ; python_version >= "3.7"
# via
# -r requirements/static/pkg/linux.in
# adal
Expand Down
2 changes: 1 addition & 1 deletion requirements/static/ci/py3.10/freebsd.txt
Original file line number Diff line number Diff line change
Expand Up @@ -382,7 +382,7 @@ contextvars==2.4
# via -r requirements/base.txt
croniter==0.3.29 ; sys_platform != "win32"
# via -r requirements/static/ci/common.in
cryptography==41.0.2 ; python_version >= "3.7"
cryptography==41.0.3 ; python_version >= "3.7"
# via
# -r requirements/static/pkg/freebsd.in
# adal
Expand Down
2 changes: 1 addition & 1 deletion requirements/static/ci/py3.10/lint.txt
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,7 @@ contextvars==2.4
# via -r requirements/base.txt
croniter==1.0.15 ; sys_platform != "win32"
# via -r requirements/static/ci/common.in
cryptography==41.0.2 ; python_version >= "3.7"
cryptography==41.0.3 ; python_version >= "3.7"
# via
# -r requirements/static/pkg/linux.in
# adal
Expand Down
2 changes: 1 addition & 1 deletion requirements/static/ci/py3.10/linux.txt
Original file line number Diff line number Diff line change
Expand Up @@ -396,7 +396,7 @@ contextvars==2.4
# via -r requirements/base.txt
croniter==0.3.29 ; sys_platform != "win32"
# via -r requirements/static/ci/common.in
cryptography==41.0.2 ; python_version >= "3.7"
cryptography==41.0.3 ; python_version >= "3.7"
# via
# -r requirements/static/pkg/linux.in
# adal
Expand Down
2 changes: 1 addition & 1 deletion requirements/static/ci/py3.7/cloud.txt
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,7 @@ contextvars==2.4
# via -r requirements/base.txt
croniter==1.0.15 ; sys_platform != "win32"
# via -r requirements/static/ci/common.in
cryptography==41.0.2 ; python_version >= "3.7"
cryptography==41.0.3 ; python_version >= "3.7"
# via
# -r requirements/static/pkg/linux.in
# adal
Expand Down
2 changes: 1 addition & 1 deletion requirements/static/ci/py3.7/docs.txt
Original file line number Diff line number Diff line change
Expand Up @@ -399,7 +399,7 @@ contextvars==2.4
# via -r requirements/base.txt
croniter==1.0.15 ; sys_platform != "win32"
# via -r requirements/static/ci/common.in
cryptography==41.0.2 ; python_version >= "3.7"
cryptography==41.0.3 ; python_version >= "3.7"
# via
# -r requirements/static/pkg/linux.in
# adal
Expand Down
2 changes: 1 addition & 1 deletion requirements/static/ci/py3.7/freebsd.txt
Original file line number Diff line number Diff line change
Expand Up @@ -389,7 +389,7 @@ contextvars==2.4
# via -r requirements/base.txt
croniter==0.3.29 ; sys_platform != "win32"
# via -r requirements/static/ci/common.in
cryptography==41.0.2 ; python_version >= "3.7"
cryptography==41.0.3 ; python_version >= "3.7"
# via
# -r requirements/static/pkg/freebsd.in
# adal
Expand Down
2 changes: 1 addition & 1 deletion requirements/static/ci/py3.7/lint.txt
Original file line number Diff line number Diff line change
Expand Up @@ -397,7 +397,7 @@ contextvars==2.4
# via -r requirements/base.txt
croniter==1.0.15 ; sys_platform != "win32"
# via -r requirements/static/ci/common.in
cryptography==41.0.2 ; python_version >= "3.7"
cryptography==41.0.3 ; python_version >= "3.7"
# via
# -r requirements/static/pkg/linux.in
# adal
Expand Down
2 changes: 1 addition & 1 deletion requirements/static/ci/py3.7/linux.txt
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,7 @@ contextvars==2.4
# via -r requirements/base.txt
croniter==0.3.29 ; sys_platform != "win32"
# via -r requirements/static/ci/common.in
cryptography==41.0.2 ; python_version >= "3.7"
cryptography==41.0.3 ; python_version >= "3.7"
# via
# -r requirements/static/pkg/linux.in
# adal
Expand Down
2 changes: 1 addition & 1 deletion requirements/static/ci/py3.7/windows.txt
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ colorama==0.4.1
# via pytest
contextvars==2.4
# via -r requirements/base.txt
cryptography==41.0.2 ; python_version >= "3.7"
cryptography==41.0.3 ; python_version >= "3.7"
# via
# -r requirements/windows.txt
# etcd3-py
Expand Down
2 changes: 1 addition & 1 deletion requirements/static/ci/py3.8/cloud.txt
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,7 @@ contextvars==2.4
# via -r requirements/base.txt
croniter==1.0.15 ; sys_platform != "win32"
# via -r requirements/static/ci/common.in
cryptography==41.0.2 ; python_version >= "3.7"
cryptography==41.0.3 ; python_version >= "3.7"
# via
# -r requirements/static/pkg/linux.in
# adal
Expand Down
2 changes: 1 addition & 1 deletion requirements/static/ci/py3.8/docs.txt
Original file line number Diff line number Diff line change
Expand Up @@ -397,7 +397,7 @@ contextvars==2.4
# via -r requirements/base.txt
croniter==1.0.15 ; sys_platform != "win32"
# via -r requirements/static/ci/common.in
cryptography==41.0.2 ; python_version >= "3.7"
cryptography==41.0.3 ; python_version >= "3.7"
# via
# -r requirements/static/pkg/linux.in
# adal
Expand Down
2 changes: 1 addition & 1 deletion requirements/static/ci/py3.8/freebsd.txt
Original file line number Diff line number Diff line change
Expand Up @@ -387,7 +387,7 @@ contextvars==2.4
# via -r requirements/base.txt
croniter==0.3.29 ; sys_platform != "win32"
# via -r requirements/static/ci/common.in
cryptography==41.0.2 ; python_version >= "3.7"
cryptography==41.0.3 ; python_version >= "3.7"
# via
# -r requirements/static/pkg/freebsd.in
# adal
Expand Down
2 changes: 1 addition & 1 deletion requirements/static/ci/py3.8/lint.txt
Original file line number Diff line number Diff line change
Expand Up @@ -395,7 +395,7 @@ contextvars==2.4
# via -r requirements/base.txt
croniter==1.0.15 ; sys_platform != "win32"
# via -r requirements/static/ci/common.in
cryptography==41.0.2 ; python_version >= "3.7"
cryptography==41.0.3 ; python_version >= "3.7"
# via
# -r requirements/static/pkg/linux.in
# adal
Expand Down
2 changes: 1 addition & 1 deletion requirements/static/ci/py3.8/linux.txt
Original file line number Diff line number Diff line change
Expand Up @@ -401,7 +401,7 @@ contextvars==2.4
# via -r requirements/base.txt
croniter==0.3.29 ; sys_platform != "win32"
# via -r requirements/static/ci/common.in
cryptography==41.0.2 ; python_version >= "3.7"
cryptography==41.0.3 ; python_version >= "3.7"
# via
# -r requirements/static/pkg/linux.in
# adal
Expand Down
2 changes: 1 addition & 1 deletion requirements/static/ci/py3.8/windows.txt
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ colorama==0.4.1
# via pytest
contextvars==2.4
# via -r requirements/base.txt
cryptography==41.0.2 ; python_version >= "3.7"
cryptography==41.0.3 ; python_version >= "3.7"
# via
# -r requirements/windows.txt
# etcd3-py
Expand Down
2 changes: 1 addition & 1 deletion requirements/static/ci/py3.9/cloud.txt
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,7 @@ contextvars==2.4
# via -r requirements/base.txt
croniter==1.0.15 ; sys_platform != "win32"
# via -r requirements/static/ci/common.in
cryptography==41.0.2 ; python_version >= "3.7"
cryptography==41.0.3 ; python_version >= "3.7"
# via
# -r requirements/static/pkg/linux.in
# adal
Expand Down
2 changes: 1 addition & 1 deletion requirements/static/ci/py3.9/darwin.txt
Original file line number Diff line number Diff line change
Expand Up @@ -391,7 +391,7 @@ contextvars==2.4
# via -r requirements/base.txt
croniter==0.3.29 ; sys_platform != "win32"
# via -r requirements/static/ci/common.in
cryptography==41.0.2 ; python_version >= "3.7"
cryptography==41.0.3 ; python_version >= "3.7"
# via
# -r requirements/darwin.txt
# adal
Expand Down
2 changes: 1 addition & 1 deletion requirements/static/ci/py3.9/docs.txt
Original file line number Diff line number Diff line change
Expand Up @@ -395,7 +395,7 @@ contextvars==2.4
# via -r requirements/base.txt
croniter==1.0.15 ; sys_platform != "win32"
# via -r requirements/static/ci/common.in
cryptography==41.0.2 ; python_version >= "3.7"
cryptography==41.0.3 ; python_version >= "3.7"
# via
# -r requirements/static/pkg/linux.in
# adal
Expand Down
2 changes: 1 addition & 1 deletion requirements/static/ci/py3.9/freebsd.txt
Original file line number Diff line number Diff line change
Expand Up @@ -387,7 +387,7 @@ contextvars==2.4
# via -r requirements/base.txt
croniter==0.3.29 ; sys_platform != "win32"
# via -r requirements/static/ci/common.in
cryptography==41.0.2 ; python_version >= "3.7"
cryptography==41.0.3 ; python_version >= "3.7"
# via
# -r requirements/static/pkg/freebsd.in
# adal
Expand Down
2 changes: 1 addition & 1 deletion requirements/static/ci/py3.9/lint.txt
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,7 @@ contextvars==2.4
# via -r requirements/base.txt
croniter==1.0.15 ; sys_platform != "win32"
# via -r requirements/static/ci/common.in
cryptography==41.0.2 ; python_version >= "3.7"
cryptography==41.0.3 ; python_version >= "3.7"
# via
# -r requirements/static/pkg/linux.in
# adal
Expand Down
2 changes: 1 addition & 1 deletion requirements/static/ci/py3.9/linux.txt
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,7 @@ contextvars==2.4
# via -r requirements/base.txt
croniter==0.3.29 ; sys_platform != "win32"
# via -r requirements/static/ci/common.in
cryptography==41.0.2 ; python_version >= "3.7"
cryptography==41.0.3 ; python_version >= "3.7"
# via
# -r requirements/static/pkg/linux.in
# adal
Expand Down
2 changes: 1 addition & 1 deletion requirements/static/ci/py3.9/windows.txt
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ colorama==0.4.1
# via pytest
contextvars==2.4
# via -r requirements/base.txt
cryptography==41.0.2 ; python_version >= "3.7"
cryptography==41.0.3 ; python_version >= "3.7"
# via
# -r requirements/windows.txt
# etcd3-py
Expand Down
2 changes: 1 addition & 1 deletion requirements/static/pkg/freebsd.in
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# This file only exists to trigger the right static compiled requirements destination
# Any non hard dependencies of Salt for FreeBSD can go here
cherrypy
cryptography>=41.0.2 ; python_version >= "3.7"
cryptography>=41.0.3 ; python_version >= "3.7"
cryptography<=40.0.2 ; python_version == "3.6"
cryptography<=3.2.1 ; python_version <= "3.5"
backports.ssl_match_hostname>=3.7.0.1; python_version < '3.7'
Expand Down
2 changes: 1 addition & 1 deletion requirements/static/pkg/linux.in
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# This file only exists to trigger the right static compiled requirements destination.
# Any non hard dependencies of Salt for linux can go here
cherrypy
cryptography>=41.0.2 ; python_version >= "3.7"
cryptography>=41.0.3 ; python_version >= "3.7"
cryptography<=40.0.2 ; python_version == "3.6"
cryptography<=3.2.1 ; python_version <= "3.5"
backports.ssl_match_hostname>=3.7.0.1; python_version < '3.7'
Expand Down
2 changes: 1 addition & 1 deletion requirements/static/pkg/py3.10/darwin.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ cherrypy==18.6.1
# via -r requirements/darwin.txt
contextvars==2.4
# via -r requirements/base.txt
cryptography==41.0.2 ; python_version >= "3.7"
cryptography==41.0.3 ; python_version >= "3.7"
# via
# -r requirements/darwin.txt
# pyopenssl
Expand Down
2 changes: 1 addition & 1 deletion requirements/static/pkg/py3.10/freebsd.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ cherrypy==18.6.1
# via -r requirements/static/pkg/freebsd.in
contextvars==2.4
# via -r requirements/base.txt
cryptography==41.0.2 ; python_version >= "3.7"
cryptography==41.0.3 ; python_version >= "3.7"
# via
# -r requirements/static/pkg/freebsd.in
# pyopenssl
Expand Down
2 changes: 1 addition & 1 deletion requirements/static/pkg/py3.10/linux.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ cherrypy==18.6.1
# via -r requirements/static/pkg/linux.in
contextvars==2.4
# via -r requirements/base.txt
cryptography==41.0.2 ; python_version >= "3.7"
cryptography==41.0.3 ; python_version >= "3.7"
# via
# -r requirements/static/pkg/linux.in
# pyopenssl
Expand Down
2 changes: 1 addition & 1 deletion requirements/static/pkg/py3.7/freebsd.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ cherrypy==18.6.1
# via -r requirements/static/pkg/freebsd.in
contextvars==2.4
# via -r requirements/base.txt
cryptography==41.0.2 ; python_version >= "3.7"
cryptography==41.0.3 ; python_version >= "3.7"
# via
# -r requirements/static/pkg/freebsd.in
# pyopenssl
Expand Down
2 changes: 1 addition & 1 deletion requirements/static/pkg/py3.7/linux.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ cherrypy==18.6.1
# via -r requirements/static/pkg/linux.in
contextvars==2.4
# via -r requirements/base.txt
cryptography==41.0.2 ; python_version >= "3.7"
cryptography==41.0.3 ; python_version >= "3.7"
# via
# -r requirements/static/pkg/linux.in
# pyopenssl
Expand Down
2 changes: 1 addition & 1 deletion requirements/static/pkg/py3.7/windows.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ cherrypy==18.6.1
# via -r requirements/windows.txt
contextvars==2.4
# via -r requirements/base.txt
cryptography==41.0.2 ; python_version >= "3.7"
cryptography==41.0.3 ; python_version >= "3.7"
# via
# -r requirements/windows.txt
# pyopenssl
Expand Down
2 changes: 1 addition & 1 deletion requirements/static/pkg/py3.8/freebsd.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ cherrypy==18.6.1
# via -r requirements/static/pkg/freebsd.in
contextvars==2.4
# via -r requirements/base.txt
cryptography==41.0.2 ; python_version >= "3.7"
cryptography==41.0.3 ; python_version >= "3.7"
# via
# -r requirements/static/pkg/freebsd.in
# pyopenssl
Expand Down
2 changes: 1 addition & 1 deletion requirements/static/pkg/py3.8/linux.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ cherrypy==18.6.1
# via -r requirements/static/pkg/linux.in
contextvars==2.4
# via -r requirements/base.txt
cryptography==41.0.2 ; python_version >= "3.7"
cryptography==41.0.3 ; python_version >= "3.7"
# via
# -r requirements/static/pkg/linux.in
# pyopenssl
Expand Down
2 changes: 1 addition & 1 deletion requirements/static/pkg/py3.8/windows.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ cherrypy==18.6.1
# via -r requirements/windows.txt
contextvars==2.4
# via -r requirements/base.txt
cryptography==41.0.2 ; python_version >= "3.7"
cryptography==41.0.3 ; python_version >= "3.7"
# via
# -r requirements/windows.txt
# pyopenssl
Expand Down
2 changes: 1 addition & 1 deletion requirements/static/pkg/py3.9/darwin.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ cherrypy==18.6.1
# via -r requirements/darwin.txt
contextvars==2.4
# via -r requirements/base.txt
cryptography==41.0.2 ; python_version >= "3.7"
cryptography==41.0.3 ; python_version >= "3.7"
# via
# -r requirements/darwin.txt
# pyopenssl
Expand Down
2 changes: 1 addition & 1 deletion requirements/static/pkg/py3.9/freebsd.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ cherrypy==18.6.1
# via -r requirements/static/pkg/freebsd.in
contextvars==2.4
# via -r requirements/base.txt
cryptography==41.0.2 ; python_version >= "3.7"
cryptography==41.0.3 ; python_version >= "3.7"
# via
# -r requirements/static/pkg/freebsd.in
# pyopenssl
Expand Down
2 changes: 1 addition & 1 deletion requirements/static/pkg/py3.9/linux.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ cherrypy==18.6.1
# via -r requirements/static/pkg/linux.in
contextvars==2.4
# via -r requirements/base.txt
cryptography==41.0.2 ; python_version >= "3.7"
cryptography==41.0.3 ; python_version >= "3.7"
# via
# -r requirements/static/pkg/linux.in
# pyopenssl
Expand Down
2 changes: 1 addition & 1 deletion requirements/static/pkg/py3.9/windows.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ cherrypy==18.6.1
# via -r requirements/windows.txt
contextvars==2.4
# via -r requirements/base.txt
cryptography==41.0.2 ; python_version >= "3.7"
cryptography==41.0.3 ; python_version >= "3.7"
# via
# -r requirements/windows.txt
# pyopenssl
Expand Down
Loading

0 comments on commit dff6f6c

Please sign in to comment.