summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Paul Calderone <exarkun@twistedmatrix.com>2011-05-04 18:10:26 -0400
committerJean-Paul Calderone <exarkun@twistedmatrix.com>2011-05-04 18:10:26 -0400
commit24dfb333d9282289d7010eee26f16b6612d8347c (patch)
tree0c80aa19e92f3b98845f5031e8fcc9610482f201
parent060a57e40ccab39eb4fc0a644f047e4df2bcf883 (diff)
downloadpyopenssl-24dfb333d9282289d7010eee26f16b6612d8347c.tar.gz
Adjust another test to account for another changed hash algorithm in OpenSSL 1.0.0
-rw-r--r--OpenSSL/test/test_ssl.py14
1 files changed, 8 insertions, 6 deletions
diff --git a/OpenSSL/test/test_ssl.py b/OpenSSL/test/test_ssl.py
index 99aa6fb..ff2e725 100644
--- a/OpenSSL/test/test_ssl.py
+++ b/OpenSSL/test/test_ssl.py
@@ -558,12 +558,14 @@ class ContextTests(TestCase, _LoopbackMixin):
"""
capath = self.mktemp()
makedirs(capath)
- # Hash value computed manually with c_rehash to avoid depending on
- # c_rehash in the test suite.
- cafile = join(capath, 'c7adac82.0')
- fObj = open(cafile, 'w')
- fObj.write(cleartextCertificatePEM.decode('ascii'))
- fObj.close()
+ # Hash values computed manually with c_rehash to avoid depending on
+ # c_rehash in the test suite. One is from OpenSSL 0.9.8, the other
+ # from OpenSSL 1.0.0.
+ for name in ['c7adac82.0', 'c3705638.0']:
+ cafile = join(capath, name)
+ fObj = open(cafile, 'w')
+ fObj.write(cleartextCertificatePEM.decode('ascii'))
+ fObj.close()
self._load_verify_locations_test(None, capath)