diff options
author | Cory Benfield <lukasaoz@gmail.com> | 2016-07-19 13:00:31 +0100 |
---|---|---|
committer | Cory Benfield <lukasaoz@gmail.com> | 2016-07-19 13:00:31 +0100 |
commit | 770105ebda5a3a495c944baba51a61fdba1814c7 (patch) | |
tree | 191b4d6b3c39e98b3c212541c719fef18945422e | |
parent | f4daa1f9ba629518ac7b89925007be7e0fcee33e (diff) | |
download | urllib3-770105ebda5a3a495c944baba51a61fdba1814c7.tar.gz |
Clean up some bugs.
-rw-r--r-- | urllib3/contrib/pyopenssl.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/urllib3/contrib/pyopenssl.py b/urllib3/contrib/pyopenssl.py index a0860409..520b306f 100644 --- a/urllib3/contrib/pyopenssl.py +++ b/urllib3/contrib/pyopenssl.py @@ -46,7 +46,7 @@ from __future__ import absolute_import import idna import OpenSSL.SSL from cryptography import x509 -from cryptography.haztmat.backends.openssl import backend as openssl_backend +from cryptography.hazmat.backends.openssl import backend as openssl_backend from cryptography.hazmat.backends.openssl.x509 import _Certificate from socket import timeout, error as SocketError @@ -151,14 +151,14 @@ def get_subj_alt_name(peer_cert): # Pass the cert to cryptography, which has much better APIs for this. # This is technically using private APIs, but should work across all # relevant versions until PyOpenSSL gets something proper for this. - cert = _Certificate(openssl_backend(), peer_cert._x509) + cert = _Certificate(openssl_backend, peer_cert._x509) # We want to find the SAN extension. Ask Cryptography to locate it (it's # faster than looping in Python) try: ext = cert.extensions.get_extension_for_class( x509.SubjectAlternativeName - ) + ).value except x509.ExtensionNotFound: # No such extension, return the empty list. return [] @@ -309,7 +309,7 @@ class WrappedSocket(object): 'subject': ( (('commonName', x509.get_subject().CN),), ), - 'subjectAltName': [get_subj_alt_name(x509)] + 'subjectAltName': get_subj_alt_name(x509) } def _reuse(self): |