Author: Richard Plangger <[email protected]>
Branch: py3.5
Changeset: r90741:a320b2c592ec
Date: 2017-03-17 10:24 +0100
http://bitbucket.org/pypy/pypy/changeset/a320b2c592ec/
Log: check if RAND_egd is present before builtinify is called, (also
transform RAND_status)
diff --git a/lib_pypy/_cffi_ssl/_stdssl/__init__.py
b/lib_pypy/_cffi_ssl/_stdssl/__init__.py
--- a/lib_pypy/_cffi_ssl/_stdssl/__init__.py
+++ b/lib_pypy/_cffi_ssl/_stdssl/__init__.py
@@ -1363,7 +1363,8 @@
return lib.BIO_ctrl_pending(self.bio)
-RAND_status = lib.RAND_status
+def RAND_status():
+ return lib.RAND_status()
def _RAND_bytes(count, pseudo):
if count < 0:
diff --git a/lib_pypy/_ssl/__init__.py b/lib_pypy/_ssl/__init__.py
--- a/lib_pypy/_ssl/__init__.py
+++ b/lib_pypy/_ssl/__init__.py
@@ -1,5 +1,6 @@
from _cffi_ssl._stdssl import (_PROTOCOL_NAMES, _OPENSSL_API_VERSION,
_test_decode_cert, _SSLContext)
+from _cffi_ssl import _stdssl
from _cffi_ssl._stdssl import *
@@ -8,5 +9,8 @@
RAND_add = builtinify(RAND_add)
RAND_bytes = builtinify(RAND_bytes)
-RAND_egd = builtinify(RAND_egd)
RAND_pseudo_bytes = builtinify(RAND_pseudo_bytes)
+RAND_status = builtinify(RAND_status)
+# RAND_egd is optional and might not be available on e.g. libreoffice
+if hasattr(_stdssl, 'RAND_egd'):
+ RAND_egd = builtinify(RAND_egd)
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
