summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGregory P. Smith <greg@mad-scientist.com>2010-10-13 03:53:21 (GMT)
committerGregory P. Smith <greg@mad-scientist.com>2010-10-13 03:53:21 (GMT)
commitbd4dacb3f983cb839314a79ef92430e83f757f17 (patch)
treec027abde7ccee1c20d8da6c5b8377f9265367b91
parent2501aca6281500ecc31cccdd4d78977c84c9e4f6 (diff)
downloadcpython-bd4dacb3f983cb839314a79ef92430e83f757f17.zip
cpython-bd4dacb3f983cb839314a79ef92430e83f757f17.tar.gz
cpython-bd4dacb3f983cb839314a79ef92430e83f757f17.tar.bz2
Fix compile on NetBSD 5.0 (or anything else using an old 0.9.9-dev OpenSSL).
-rw-r--r--Modules/_ssl.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/Modules/_ssl.c b/Modules/_ssl.c
index 254dde6..4f7bb4d 100644
--- a/Modules/_ssl.c
+++ b/Modules/_ssl.c
@@ -113,8 +113,10 @@ static unsigned int _ssl_locks_count = 0;
# undef HAVE_OPENSSL_RAND
#endif
-/* SSL_CTX_clear_options() and SSL_clear_options() were first added in OpenSSL 0.9.8m */
-#if OPENSSL_VERSION_NUMBER >= 0x009080dfL
+/* SSL_CTX_clear_options() and SSL_clear_options() were first added in
+ * OpenSSL 0.9.8m but do not appear in some 0.9.9-dev versions such the
+ * 0.9.9 from "May 2008" that NetBSD 5.0 uses. */
+#if OPENSSL_VERSION_NUMBER >= 0x009080dfL && OPENSSL_VERSION_NUMBER != 0x00909000L
# define HAVE_SSL_CTX_CLEAR_OPTIONS
#else
# undef HAVE_SSL_CTX_CLEAR_OPTIONS