projects
/
privoxy.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bump copyright
[privoxy.git]
/
openssl.c
diff --git
a/openssl.c
b/openssl.c
index
d27f918
..
8239e33
100644
(file)
--- a/
openssl.c
+++ b/
openssl.c
@@
-697,7
+697,7
@@
exit:
* Parameters :
* 1 : csp = Current client state (buffers, headers, etc...)
*
* 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
*
*********************************************************************/
* 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
/*********************************************************************
*
* Function : ssl_release
@@
-2236,8
+2237,12
@@
extern void ssl_release(void)
{
if (ssl_inited == 1)
{
{
if (ssl_inited == 1)
{
+#if OPENSSL_VERSION_NUMBER >= 0x1000200fL
+#ifndef LIBRESSL_VERSION_NUMBER
#ifndef OPENSSL_NO_COMP
SSL_COMP_free_compression_methods();
#ifndef OPENSSL_NO_COMP
SSL_COMP_free_compression_methods();
+#endif
+#endif
#endif
CONF_modules_free();
CONF_modules_unload(1);
#endif
CONF_modules_free();
CONF_modules_unload(1);
@@
-2251,4
+2256,4
@@
extern void ssl_release(void)
CRYPTO_cleanup_all_ex_data();
}
}
CRYPTO_cleanup_all_ex_data();
}
}
-
+#endif /* def FEATURE_GRACEFUL_TERMINATION */