Author: Matti Picus <[email protected]>
Branch: release-5.x
Changeset: r86870:050d84dd7899
Date: 2016-09-04 21:10 +0300
http://bitbucket.org/pypy/pypy/changeset/050d84dd7899/
Log: Explicitly detect that we found OpenSSL 1.1, and abort with a
message as explicit as possible, hopefully better than an obscure
crash soon (grafted from 48ca2469fc30053c39d92b8d4ccef6e82800fb57)
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,21 @@
OPENSSL_VERSION_NUMBER = cconfig["OPENSSL_VERSION_NUMBER"]
HAVE_TLSv1_2 = OPENSSL_VERSION_NUMBER >= 0x10001000
+if OPENSSL_VERSION_NUMBER >= 0x10100000:
+ eci.pre_include_bits = ()
+ eci.post_include_bits = ()
+ raise Exception("""OpenSSL version >= 1.1 not supported yet.
+
+ This program requires OpenSSL version 1.0.x, and may also
+ work with LibreSSL or OpenSSL 0.9.x. OpenSSL 1.1 is quite
+ some work to update to; contributions are welcome. Sorry,
+ you need to install an older version of OpenSSL for now.
+ Make sure this older version is the one picked up by this
+ program when it runs the compiler.
+
+ This is the configuration used: %r""" % (eci,))
+
+
class CConfig:
_compilation_info_ = eci
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
