From: Guido van Rossum <guido@python.org>
Date: Fri, 13 Apr 2001 17:54:04 +0000 (+0000)
Subject: I am TENTATIVELY checking in Martin von Loewis's patch for the SSL
X-Git-Tag: v2.1c1~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=058dae37a668e030cd23ed8ef3794380d0037294;p=thirdparty%2FPython%2Fcpython.git

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.)
---

diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
index c92dc95553a3..e5dc7cb675b5 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__)