You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
37 lines
1.8 KiB
37 lines
1.8 KiB
--- a/salt/ext/tornado/netutil.py~ 2023-05-05 12:53:34.000000000 -0500
|
|
+++ b/salt/ext/tornado/netutil.py 2023-07-24 11:27:02.376824349 -0500
|
|
@@ -54,8 +54,8 @@
|
|
elif ssl is None:
|
|
ssl_match_hostname = SSLCertificateError = None # type: ignore
|
|
else:
|
|
- import backports.ssl_match_hostname
|
|
- ssl_match_hostname = backports.ssl_match_hostname.match_hostname
|
|
+ import urllib3.util.ssl_match_hostname
|
|
+ ssl_match_hostname = urllib3.util.ssl_match_hostname
|
|
SSLCertificateError = backports.ssl_match_hostname.CertificateError # type: ignore
|
|
|
|
if hasattr(ssl, 'SSLContext'):
|
|
--- a/salt/ext/tornado/iostream.py~ 2023-05-05 12:53:34.000000000 -0500
|
|
+++ b/salt/ext/tornado/iostream.py 2023-07-24 11:38:00.657632623 -0500
|
|
@@ -38,7 +38,8 @@
|
|
from salt.ext.tornado.concurrent import TracebackFuture
|
|
from salt.ext.tornado import ioloop
|
|
from salt.ext.tornado.log import gen_log, app_log
|
|
-from salt.ext.tornado.netutil import ssl_wrap_socket, ssl_match_hostname, SSLCertificateError, _client_ssl_defaults, _server_ssl_defaults
|
|
+from salt.ext.tornado.netutil import ssl_wrap_socket, SSLCertificateError, _client_ssl_defaults, _server_ssl_defaults
|
|
+import urllib3.util.ssl_match_hostname
|
|
from salt.ext.tornado import stack_context
|
|
from salt.ext.tornado.util import errno_from_exception
|
|
|
|
--- a/salt/ext/tornado/netutil.py~ 2023-07-24 11:50:02.836988664 -0500
|
|
+++ b/salt/ext/tornado/netutil.py 2023-07-24 11:50:52.217539638 -0500
|
|
@@ -56,7 +56,7 @@
|
|
else:
|
|
import urllib3.util.ssl_match_hostname
|
|
ssl_match_hostname = urllib3.util.ssl_match_hostname
|
|
- SSLCertificateError = backports.ssl_match_hostname.CertificateError # type: ignore
|
|
+ SSLCertificateError = urllib3.util.ssl_match_hostname.CertificateError # type: ignore
|
|
|
|
if hasattr(ssl, 'SSLContext'):
|
|
if hasattr(ssl, 'create_default_context'):
|