diff options
| author | Seth Michael Larson <sethmichaellarson@gmail.com> | 2022-01-23 22:19:24 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-23 22:19:24 -0600 |
| commit | ea96fde9450b2d0d233f0414c7be0a75148fae8b (patch) | |
| tree | 778e4a3e28664f691d8478167c3c6278bbebbeee /src/urllib3/util | |
| parent | 2459900b10f54326745a597cc1cf2bf8a18f0d56 (diff) | |
| download | urllib3-ea96fde9450b2d0d233f0414c7be0a75148fae8b.tar.gz | |
Change proxy TLS flow to match destination TLS flow
Diffstat (limited to 'src/urllib3/util')
| -rw-r--r-- | src/urllib3/util/proxy.py | 31 |
1 files changed, 1 insertions, 30 deletions
diff --git a/src/urllib3/util/proxy.py b/src/urllib3/util/proxy.py index 4f90eb55..78e8055b 100644 --- a/src/urllib3/util/proxy.py +++ b/src/urllib3/util/proxy.py @@ -1,11 +1,8 @@ -from typing import TYPE_CHECKING, Optional, Union +from typing import TYPE_CHECKING, Optional -from .ssl_ import create_urllib3_context, resolve_cert_reqs, resolve_ssl_version from .url import Url if TYPE_CHECKING: - import ssl - from ..connection import ProxyConfig @@ -42,29 +39,3 @@ def connection_requires_http_tunnel( # Otherwise always use a tunnel. return True - - -def create_proxy_ssl_context( - ssl_version: Optional[Union[int, str]] = None, - cert_reqs: Optional[Union[int, str]] = None, - ca_certs: Optional[str] = None, - ca_cert_dir: Optional[str] = None, - ca_cert_data: Union[None, str, bytes] = None, -) -> "ssl.SSLContext": - """ - Generates a default proxy ssl context if one hasn't been provided by the - user. - """ - ssl_context = create_urllib3_context( - ssl_version=resolve_ssl_version(ssl_version), - cert_reqs=resolve_cert_reqs(cert_reqs), - ) - if ( - not ca_certs - and not ca_cert_dir - and not ca_cert_data - and hasattr(ssl_context, "load_default_certs") - ): - ssl_context.load_default_certs() - - return ssl_context |
