Blob Blame History Raw
diff -up --recursive mod_nss-1.0.11/test/test_cipher.py mod_nss-1.0.11.fixed/test/test_cipher.py
--- mod_nss-1.0.11/test/test_cipher.py	2015-08-17 19:35:48.362013632 +0000
+++ mod_nss-1.0.11.fixed/test/test_cipher.py	2015-08-17 19:33:25.818806486 +0000
@@ -121,7 +121,7 @@ class test_ciphers(object):
     # skipping COMPLEMENTOFDEFAULT as these are all ADH ciphers
 
     def test_SSLv3(self):
-        assert_equal_openssl("SSLv3", "SSLv3:-KRB5:-PSK:-ADH:-EDH:-SEED:-IDEA")
+        assert_equal_openssl("SSLv3", "SSLv3:-KRB5:-PSK:-ADH:-EDH:-DH:-SEED:-IDEA")
 
     def test_SSLv3_equals_TLSv1(self):
         (nss, err, rc) = run([exe, "--o", "SSLv3"])
diff -up --recursive mod_nss-1.0.11/test/test_request.py mod_nss-1.0.11.fixed/test/test_request.py
--- mod_nss-1.0.11/test/test_request.py	2014-12-02 18:59:03.000000000 +0000
+++ mod_nss-1.0.11.fixed/test/test_request.py	2015-08-17 19:32:53.831536743 +0000
@@ -4,8 +4,8 @@
 import socket
 import requests
 import urlparse
-from urllib3.util import get_host
-from urllib3.connectionpool import HTTPConnectionPool, HTTPSConnectionPool
+from requests.packages.urllib3.util import get_host
+from requests.packages.urllib3.connectionpool import HTTPConnectionPool, HTTPSConnectionPool
 import logging
 
 # Don't bend over backwards for ssl support, assume it is there.
@@ -107,6 +107,9 @@ class MyVerifiedHTTPSConnection(HTTPSCon
     ca_certs = None
     client_cipher = None
 
+    # A gross oversimplification but we aren't testing this
+    is_verified = True
+
     def set_cert(self, key_file=None, cert_file=None,
                  cert_reqs='CERT_NONE', ca_certs=None):
         ssl_req_scheme = {