From: Marcel Raad <raad@teamviewer.com>
Date: Mon, 30 May 2016 11:26:20 +0000 (+0200)
Subject: openssl: fix build with OPENSSL_NO_COMP
X-Git-Tag: curl-7_50_0~86
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c9b4e6e85907f1581c8d6e1ab52c7f8b9282f266;p=curl

openssl: fix build with OPENSSL_NO_COMP

With OPENSSL_NO_COMP defined, there is no function
SSL_COMP_free_compression_methods

Closes #836
---

diff --git a/lib/vtls/openssl.c b/lib/vtls/openssl.c
index 3a4bde5b3..592bea5ff 100644
--- a/lib/vtls/openssl.c
+++ b/lib/vtls/openssl.c
@@ -122,6 +122,12 @@
 #define HAVE_X509_GET0_SIGNATURE 1
 #endif
 
+#if OPENSSL_VERSION_NUMBER >= 0x10002003L && \
+  OPENSSL_VERSION_NUMBER <= 0x10002FFFL && \
+  !defined(OPENSSL_NO_COMP)
+#define HAVE_SSL_COMP_FREE_COMPRESSION_METHODS 1
+#endif
+
 #if (OPENSSL_VERSION_NUMBER < 0x0090808fL)
 /* not present in older OpenSSL */
 #define OPENSSL_load_builtin_modules(x)
@@ -748,8 +754,7 @@ void Curl_ossl_cleanup(void)
   /* Free all memory allocated by all configuration modules */
   CONF_modules_free();
 
-#if OPENSSL_VERSION_NUMBER >= 0x10002003L && \
-    OPENSSL_VERSION_NUMBER <= 0x10002FFFL
+#ifdef HAVE_SSL_COMP_FREE_COMPRESSION_METHODS
   SSL_COMP_free_compression_methods();
 #endif
 }