summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>2001-04-13 17:54:04 (GMT)
committerGuido van Rossum <guido@python.org>2001-04-13 17:54:04 (GMT)
commit058dae37a668e030cd23ed8ef3794380d0037294 (patch)
tree39b51fc3bbb6e067a81d564589923c2dbc7187c2 /Modules
parent37832f0c8d02861f1171fc59e0e0cb5965dfecfb (diff)
downloadcpython-058dae37a668e030cd23ed8ef3794380d0037294.zip
cpython-058dae37a668e030cd23ed8ef3794380d0037294.tar.gz
cpython-058dae37a668e030cd23ed8ef3794380d0037294.tar.bz2
I am TENTATIVELY checking in Martin von Loewis's patch for the SSL
problem reported by Neil Schemenauer on python-dev on 4/12/01, wth subject "Problem with SSL and socketmodule on Debian Potato?". It's tentative because Moshe objected, but Martin rebutted, and Moshe seems unavailable for comments. (Note that with OpenSSL 0.9.6a, I get a lot of compilation warnings for socketmodule.c -- I'm assuming I can safely ignore these until 2.1 is released.)
Diffstat (limited to 'Modules')
-rw-r--r--Modules/socketmodule.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
index c92dc95..e5dc7cb 100644
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -195,6 +195,13 @@ Socket methods:
#include "openssl/ssl.h"
#include "openssl/err.h"
#include "openssl/rand.h"
+
+#if OPENSSL_VERSION_NUMBER < 0x0090510fL
+/* RAND_status was added in OpenSSL 0.9.5. If it is not available,
+ we assume that seeding the RNG is necessary every time. */
+#define RAND_status() 0
+#endif
+
#endif /* USE_SSL */
#if defined(MS_WINDOWS) || defined(__BEOS__)