INN commit: trunk/nnrpd (tls.c)

[INN Commit]

    Date: Sunday, January 7, 2018 @ 06:38:49
  Author: iulius
Revision: 10218

Fix build with OpenSSL 0.9.9-dev version

This development version sometimes does not have SSL_CTX_clear_options()
which was introduced in 0.9.8m version.

Modified:
  trunk/nnrpd/tls.c

-------+
 tls.c |   10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

Modified: tls.c
===================================================================
--- tls.c	2018-01-07 13:38:58 UTC (rev 10217)
+++ tls.c	2018-01-07 14:38:49 UTC (rev 10218)
@@ -582,8 +582,9 @@
     if (prefer_server_ciphers) {
         SSL_CTX_set_options(CTX, SSL_OP_CIPHER_SERVER_PREFERENCE);
     } else {
-#if OPENSSL_VERSION_NUMBER >= 0x0009080dfL
-        /* Function first added in OpenSSL 0.9.8m. */
+#if OPENSSL_VERSION_NUMBER >= 0x0009080dfL && OPENSSL_VERSION_NUMBER != 0x000909000L
+        /* Function first added in OpenSSL 0.9.8m and not present
+         * in OpenSSL 0.9.9-dev. */
         SSL_CTX_clear_options(CTX, SSL_OP_CIPHER_SERVER_PREFERENCE);
 #endif
     }
@@ -654,8 +655,9 @@
     }
 
     if (tls_compression) {
-#if defined(SSL_OP_NO_COMPRESSION) && OPENSSL_VERSION_NUMBER >= 0x0009080dfL
-        /* Function first added in OpenSSL 0.9.8m. */
+#if defined(SSL_OP_NO_COMPRESSION) && OPENSSL_VERSION_NUMBER >= 0x0009080dfL && OPENSSL_VERSION_NUMBER != 0x000909000L
+        /* Function first added in OpenSSL 0.9.8m, and not present
+         * in OpenSSL 0.9.9-dev. */
         SSL_CTX_clear_options(CTX, SSL_OP_NO_COMPRESSION);
 #endif
     } else {