[pypy-commit] pypy py3.5: (arigo, plan_rich) missing version check lost by merge (ssl3)

[plan_rich]

Author: Richard Plangger <planrichi at gmail.com>
Branch: py3.5
Changeset: r87716:67709d07835e
Date: 2016-10-11 19:25 +0200
http://bitbucket.org/pypy/pypy/changeset/67709d07835e/

Log:	(arigo, plan_rich) missing version check lost by merge (ssl3)

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
@@ -1364,6 +1364,8 @@
         options = SSL_OP_ALL & ~SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS
         if protocol != PY_SSL_VERSION_SSL2:
             options |= SSL_OP_NO_SSLv2
+        if protocol != PY_SSL_VERSION_SSL3:
+            options |= SSL_OP_NO_SSLv3
         libssl_SSL_CTX_set_options(self.ctx, options)
         libssl_SSL_CTX_set_session_id_context(self.ctx, "Python", len("Python"))