Author: Amaury Forgeot d'Arc <[email protected]>
Branch: stdlib-2.7.10
Changeset: r78046:87dfaaf41b2a
Date: 2015-06-12 17:44 +0200
http://bitbucket.org/pypy/pypy/changeset/87dfaaf41b2a/
Log: Fix "import ssl"
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
@@ -66,6 +66,7 @@
constants["HAS_TLS_UNIQUE"] = HAVE_OPENSSL_FINISHED
constants["HAS_ECDH"] = not OPENSSL_NO_ECDH
constants["HAS_NPN"] = OPENSSL_NPN_NEGOTIATED
+constants["HAS_ALPN"] = HAVE_ALPN
if not OPENSSL_NO_SSL2:
constants["PROTOCOL_SSLv2"] = PY_SSL_VERSION_SSL2
diff --git a/rpython/rlib/ropenssl.py b/rpython/rlib/ropenssl.py
--- a/rpython/rlib/ropenssl.py
+++ b/rpython/rlib/ropenssl.py
@@ -97,6 +97,7 @@
if HAVE_TLSv1_2:
SSL_OP_NO_TLSv1_1 = rffi_platform.ConstantInteger("SSL_OP_NO_TLSv1_1")
SSL_OP_NO_TLSv1_2 = rffi_platform.ConstantInteger("SSL_OP_NO_TLSv1_2")
+ OPENSSL_NO_TLSEXT = rffi_platform.Defined("OPENSSL_NO_TLSEXT")
SSL_OP_CIPHER_SERVER_PREFERENCE = rffi_platform.ConstantInteger(
"SSL_OP_CIPHER_SERVER_PREFERENCE")
SSL_OP_SINGLE_DH_USE = rffi_platform.ConstantInteger(
@@ -259,6 +260,7 @@
OPENSSL_VERSION_NUMBER != 0x00909000
if OPENSSL_VERSION_NUMBER < 0x0090800f and not OPENSSL_NO_ECDH:
OPENSSL_NO_ECDH = True
+HAVE_ALPN = OPENSSL_VERSION_NUMBER >= 0x1000200fL and not OPENSSL_NO_TLSEXT
def external(name, argtypes, restype, **kw):
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
