Author: Amaury Forgeot d'Arc <[email protected]>
Branch: stdlib-2.7.9
Changeset: r75594:07341897da21
Date: 2015-01-31 00:13 +0100
http://bitbucket.org/pypy/pypy/changeset/07341897da21/
Log: A bad tls version now raises ValueError
diff --git a/pypy/module/_ssl/interp_ssl.py b/pypy/module/_ssl/interp_ssl.py
--- a/pypy/module/_ssl/interp_ssl.py
+++ b/pypy/module/_ssl/interp_ssl.py
@@ -1045,7 +1045,7 @@
elif protocol == PY_SSL_VERSION_SSL23:
method = libssl_SSLv23_method()
else:
- raise ssl_error(space, "invalid protocol version")
+ raise oefmt(space.w_ValueError, "invalid protocol version")
ctx = libssl_SSL_CTX_new(method)
if not ctx:
raise ssl_error(space, "failed to allocate SSL context")
diff --git a/pypy/module/_ssl/test/test_ssl.py
b/pypy/module/_ssl/test/test_ssl.py
--- a/pypy/module/_ssl/test/test_ssl.py
+++ b/pypy/module/_ssl/test/test_ssl.py
@@ -120,6 +120,7 @@
def test_context(self):
import _ssl
s = _ssl._SSLContext(_ssl.PROTOCOL_TLSv1)
+ raises(ValueError, _ssl._SSLContext, -1)
assert type(s.options) is long
assert s.options & _ssl.OP_NO_SSLv2
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
