summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlvh <_@lvh.io>2015-10-17 10:50:07 +0200
committerlvh <_@lvh.io>2015-10-17 10:50:07 +0200
commit510a04eb7cb97fda2062c0c8b51724db2edbd855 (patch)
tree1d63bbc605b120e85b144ca1743ef7adfb71b921
parentecbcde659557b6951ec3e1346b39499f8a9e9c18 (diff)
parenta07fa8c3b803f4e5d7342a9498d47f35bf3895c1 (diff)
downloadpyopenssl-git-510a04eb7cb97fda2062c0c8b51724db2edbd855.tar.gz
Merge pull request #372 from hynek/oakley
Fix test_set_tmp_ecdh on OpenSSL 1.0.2
-rw-r--r--OpenSSL/test/test_ssl.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/OpenSSL/test/test_ssl.py b/OpenSSL/test/test_ssl.py
index 265aa78..3db1f8f 100644
--- a/OpenSSL/test/test_ssl.py
+++ b/OpenSSL/test/test_ssl.py
@@ -1385,6 +1385,11 @@ class ContextTests(TestCase, _LoopbackMixin):
"""
context = Context(TLSv1_METHOD)
for curve in get_elliptic_curves():
+ if curve.name.startswith(u"Oakley-"):
+ # Setting Oakley-EC2N-4 and Oakley-EC2N-3 adds
+ # ('bignum routines', 'BN_mod_inverse', 'no inverse') to the
+ # error queue on OpenSSL 1.0.2.
+ continue
# The only easily "assertable" thing is that it does not raise an
# exception.
context.set_tmp_ecdh(curve)