Skip to content

Commit 8157ee7

Browse files
committed
Remove OpenSSL dependency
The only place where `OpenSSL` is used is via an indirect dependency from `urllib3.contrib.pyopenssl`, which itself is only used when the Python built-in SSL module doesn't support SNI (Server Name Indication). That module itself is only imported via the vendored `requests` init, _iff_ `ssl.HAS_SNI` is `False`, or as an optional import in vendored `requests.help` (which is never imported by code; in the original `requests` library, it's supposed to be run as a command-line module, but it's unlikely `python -m oci._vendor.requests.help` is a real use case). The `urllib3.contrib.pyopenssl` module's docstring says: > This module was relevant before the standard library ``ssl`` > module supported SNI, but now that we've dropped support for > Python 2.7 all relevant Python versions support SNI so > **this module is no longer recommended**. This is related to #802; right now there are upper version pins on `pyOpenSSL`, which prevent downstream users from upgrading to e.g. non-vulnerable versions of that library downstream. Signed-off-by: Aarni Koskela <akx@iki.fi>
1 parent 765efd5 commit 8157ee7

3 files changed

Lines changed: 2 additions & 5 deletions

File tree

pyproject.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ dependencies = [
4444
"certifi",
4545
"configparser==4.0.2 ; python_version < '3'",
4646
"cryptography>=3.2.1,<50.0.0",
47-
"pyOpenSSL>=17.5.0,<27.0.0",
4847
"python-dateutil>=2.5.3,<3.0.0",
4948
"pytz>=2016.10",
5049
"circuitbreaker>=1.3.1,<2.0.0; python_version <= '3.6'",
@@ -94,4 +93,4 @@ exclude = [
9493
"src/oci/waas/models/waf_log.py",
9594
"src/oci/functions/functions_invoke_client.py"
9695
]
97-
max_line_length = 99
96+
max_line_length = 99

requirements.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ cryptography==42.0.8; python_full_version == '3.9.0' or python_full_version == '
44
cryptography>=3.2.1,<50.0.0; python_full_version != '3.9.0' and python_full_version != '3.9.1'
55
flake8>=3.6.0,<6
66
mock==2.0.0
7-
pyOpenSSL>=17.5.0,<27.0.0
87
pytest==4.6.10; python_version <= '3.9'
98
pytest==7.1.2; python_version >= '3.10'
109
pytest-cov==2.6.1
@@ -32,4 +31,4 @@ PyJWT>=2.12.0; python_version >= '3.9'
3231
Jinja2<3.0.0; python_version == '3.6'
3332
Jinja2>=3.1.5,<4.0.0; python_version >= '3.7'
3433
crc32c==2.5; python_version == '3.6'
35-
crc32c==2.7.1; python_version >= '3.7'
34+
crc32c==2.7.1; python_version >= '3.7'

setup.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ def open_relative(*path):
3333
"certifi",
3434
"configparser==4.0.2 ; python_version < '3'",
3535
"cryptography>=3.2.1,<50.0.0",
36-
"pyOpenSSL>=17.5.0,<27.0.0",
3736
"python-dateutil>=2.5.3,<3.0.0",
3837
"pytz>=2016.10",
3938
"circuitbreaker>=1.3.1,<2.0.0; python_version <= '3.6'",

0 commit comments

Comments
 (0)