|
 |
154a6e |
From 04b6d11d7745b319fad127622f45bfb99759a8d7 Mon Sep 17 00:00:00 2001
|
|
|
154a6e |
From: Rob Crittenden <rcritten@redhat.com>
|
|
|
154a6e |
Date: Tue, 17 May 2016 14:02:24 -0400
|
|
|
154a6e |
Subject: [PATCH] Work around missing ndg-httpsclient breaking import of
|
|
|
154a6e |
pyopenssl
|
|
|
154a6e |
|
|
|
154a6e |
---
|
|
|
154a6e |
test/test_request.py | 13 +++++++++----
|
|
|
154a6e |
1 file changed, 9 insertions(+), 4 deletions(-)
|
|
|
154a6e |
|
|
|
154a6e |
diff --git a/test/test_request.py b/test/test_request.py
|
|
|
154a6e |
index 5d2a525..254b31c 100644
|
|
|
154a6e |
--- a/test/test_request.py
|
|
|
154a6e |
+++ b/test/test_request.py
|
|
|
154a6e |
@@ -8,8 +8,13 @@ import logging
|
|
|
154a6e |
import socket
|
|
|
154a6e |
from requests.packages.urllib3.util import get_host
|
|
|
154a6e |
from requests.packages.urllib3.util.timeout import Timeout
|
|
|
154a6e |
-from requests.packages.urllib3.contrib import pyopenssl
|
|
|
154a6e |
from requests.packages.urllib3.connectionpool import HTTPConnectionPool, HTTPSConnectionPool, VerifiedHTTPSConnection
|
|
|
154a6e |
+try:
|
|
|
154a6e |
+ from requests.packages.urllib3.contrib.pyopenssl import DEFAULT_SSL_CIPHER_LIST
|
|
|
154a6e |
+except ImportError:
|
|
|
154a6e |
+ DEFAULT_SSL_CIPHER_LIST = "ECDH+AESGCM:DH+AESGCM:ECDH+AES256:DH+AES256:" + \
|
|
|
154a6e |
+ "ECDH+AES128:DH+AES:ECDH+3DES:DH+3DES:RSA+AESGCM:RSA+AES:RSA+3DES:" + \
|
|
|
154a6e |
+ "!aNULL:!MD5:!DSS"
|
|
|
154a6e |
|
|
|
154a6e |
# Don't bend over backwards for ssl support, assume it is there.
|
|
|
154a6e |
import ssl
|
|
|
154a6e |
@@ -33,7 +38,7 @@ except ImportError:
|
|
|
154a6e |
# Other older python we use the urllib3 bundled copy
|
|
|
154a6e |
from urllib3.packages.ssl_match_hostname import match_hostname, CertificateError
|
|
|
154a6e |
|
|
|
154a6e |
-SAVE_DEFAULT_SSL_CIPHER_LIST = pyopenssl.DEFAULT_SSL_CIPHER_LIST
|
|
|
154a6e |
+SAVE_DEFAULT_SSL_CIPHER_LIST = DEFAULT_SSL_CIPHER_LIST
|
|
|
154a6e |
|
|
|
154a6e |
log = logging.getLogger(__name__)
|
|
|
154a6e |
|
|
|
154a6e |
@@ -141,9 +146,9 @@ class MyVerifiedHTTPSConnection(VerifiedHTTPSConnection):
|
|
|
154a6e |
def connect(self):
|
|
|
154a6e |
if self.sni:
|
|
|
154a6e |
if self.ciphers:
|
|
|
154a6e |
- pyopenssl.DEFAULT_SSL_CIPHER_LIST = self.ciphers
|
|
|
154a6e |
+ DEFAULT_SSL_CIPHER_LIST = self.ciphers
|
|
|
154a6e |
else:
|
|
|
154a6e |
- pyopenssl.DEFAULT_SSL_CIPHER_LIST = SAVE_DEFAULT_SSL_CIPHER_LIST
|
|
|
154a6e |
+ DEFAULT_SSL_CIPHER_LIST = SAVE_DEFAULT_SSL_CIPHER_LIST
|
|
|
154a6e |
return super(MyVerifiedHTTPSConnection, self).connect()
|
|
|
154a6e |
|
|
|
154a6e |
# Add certificate verification
|
|
|
154a6e |
--
|
|
|
154a6e |
2.5.5
|
|
|
154a6e |
|