X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=openssl.c;h=824b0d7342483420e21683ef347e9b32538b00cc;hb=9ac533bc03d0043a41204f2be12d2551bbc49729;hp=d27f91878d3f47dfcd2310a2367c090a528cedfb;hpb=e6c7a0409aed822fc6a8ad8028b7e7bde0b711ac;p=privoxy.git diff --git a/openssl.c b/openssl.c index d27f9187..824b0d73 100644 --- a/openssl.c +++ b/openssl.c @@ -656,7 +656,7 @@ static int ssl_store_cert(struct client_state *csp, X509* crt) len = BIO_get_mem_data(bio, &bio_mem_data); if (len <= 0) { - log_error(LOG_LEVEL_ERROR, "BIO_get_mem_data() returned %d " + log_error(LOG_LEVEL_ERROR, "BIO_get_mem_data() returned %ld " "while gathering certificate information", len); ret = -1; goto exit; @@ -697,7 +697,7 @@ exit: * Parameters : * 1 : csp = Current client state (buffers, headers, etc...) * - * Returns : 1 => Error while creating hash + * Returns : -1 => Error while creating hash * 0 => Hash created successfully * *********************************************************************/ @@ -2221,6 +2221,7 @@ extern void ssl_crt_verify_info(char *buf, size_t size, struct client_state *csp } +#ifdef FEATURE_GRACEFUL_TERMINATION /********************************************************************* * * Function : ssl_release @@ -2236,8 +2237,12 @@ extern void ssl_release(void) { if (ssl_inited == 1) { +#if OPENSSL_VERSION_NUMBER >= 0x1000200fL +#ifndef LIBRESSL_VERSION_NUMBER #ifndef OPENSSL_NO_COMP SSL_COMP_free_compression_methods(); +#endif +#endif #endif CONF_modules_free(); CONF_modules_unload(1); @@ -2251,4 +2256,4 @@ extern void ssl_release(void) CRYPTO_cleanup_all_ex_data(); } } - +#endif /* def FEATURE_GRACEFUL_TERMINATION */