[pypy-commit] pypy py3k: don't export SSL_CTX_clear_options unless we have it

pjenvey noreply at buildbot.pypy.org
Mon Oct 15 21:03:00 CEST 2012


Author: Philip Jenvey <pjenvey at underboss.org>
Branch: py3k
Changeset: r58121:448a96a744bc
Date: 2012-10-15 12:02 -0700
http://bitbucket.org/pypy/pypy/changeset/448a96a744bc/

Log:	don't export SSL_CTX_clear_options unless we have it

diff --git a/pypy/rlib/ropenssl.py b/pypy/rlib/ropenssl.py
--- a/pypy/rlib/ropenssl.py
+++ b/pypy/rlib/ropenssl.py
@@ -221,7 +221,9 @@
 ssl_external('SSL_CTX_use_certificate_chain_file', [SSL_CTX, rffi.CCHARP], rffi.INT)
 ssl_external('SSL_CTX_get_options', [SSL_CTX], rffi.INT, macro=True)
 ssl_external('SSL_CTX_set_options', [SSL_CTX, rffi.INT], rffi.INT, macro=True)
-ssl_external('SSL_CTX_clear_options', [SSL_CTX, rffi.INT], rffi.INT, macro=True)
+if HAVE_SSL_CTX_CLEAR_OPTIONS:
+    ssl_external('SSL_CTX_clear_options', [SSL_CTX, rffi.INT], rffi.INT,
+                 macro=True)
 ssl_external('SSL_CTX_ctrl', [SSL_CTX, rffi.INT, rffi.INT, rffi.VOIDP], rffi.INT)
 ssl_external('SSL_CTX_set_verify', [SSL_CTX, rffi.INT, rffi.VOIDP], lltype.Void)
 ssl_external('SSL_CTX_get_verify_mode', [SSL_CTX], rffi.INT)


More information about the pypy-commit mailing list