moparisthebest
/
curl
mirror of https://github.com/moparisthebest/curl
1
0
Fork 0
Code Issues Releases Wiki Activity

openssl: fix build with OPENSSL_NO_COMP 

With OPENSSL_NO_COMP defined, there is no function
SSL_COMP_free_compression_methods

Closes #836
This commit is contained in:
Marcel Raad 2016-05-30 13:26:20 +02:00 committed by Daniel Stenberg
parent 9a1593501c
commit c9b4e6e859
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/vtls/openssl.c
View File

@ -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
}