[pypy-commit] pypy stdlib-2.7.9: Implemented set_default_verify_paths on SSLContext

alex_gaynor noreply at buildbot.pypy.org
Sun Dec 21 20:05:15 CET 2014


Author: Alex Gaynor <alex.gaynor at gmail.com>
Branch: stdlib-2.7.9
Changeset: r75053:7660237a949e
Date: 2014-12-21 11:05 -0800
http://bitbucket.org/pypy/pypy/changeset/7660237a949e/

Log:	Implemented set_default_verify_paths on SSLContext

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
@@ -912,6 +912,11 @@
                         "CERT_OPTIONAL or CERT_REQUIRED")
         self.check_hostname = check_hostname
 
+    def descr_set_default_verify_paths(self, space):
+        if not libssl_SSL_CTX_set_default_verify_paths(self.ctx):
+            raise ssl_error(space, "")
+
+
 _SSLContext.typedef = TypeDef("_SSLContext",
     __module__ = "_ssl",
     __new__ = interp2app(_SSLContext.descr_new),
@@ -923,6 +928,7 @@
                                  _SSLContext.descr_set_verify_mode),
     check_hostname = GetSetProperty(_SSLContext.descr_get_check_hostname,
                                     _SSLContext.descr_set_check_hostname),
+    set_default_verify_paths=interp2app(_SSLContext.descr_set_default_verify_paths),
 )
 
 
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
@@ -138,6 +138,11 @@
         assert str(exc.value) == "Cannot set verify_mode to CERT_NONE " \
                                  "when check_hostname is enabled."
 
+    def test_set_default_verify_paths(self):
+        import _ssl
+        s = _ssl._SSLContext(_ssl.PROTOCOL_TLSv1)
+        s.set_default_verify_paths()
+
 
 class AppTestConnectedSSL:
     spaceconfig = {


More information about the pypy-commit mailing list