Module: sip-router Branch: master Commit: 5decf8ecdd68a11f36e0e868242dbfed484eda55 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5decf8ec...

Author: Andrei Pelinescu-Onciul andrei@iptel.org Committer: Andrei Pelinescu-Onciul andrei@iptel.org Date: Fri Mar 19 15:28:37 2010 +0100

tls: remove warning about compression for openssl > 0.9.8e-beta1

Remove compile-time warning about compression workarounds for openssl versions newer then 0.9.8e-beta1.

---

modules/tls/tls_init.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/modules/tls/tls_init.c b/modules/tls/tls_init.c index a685c83..aac73a6 100644 --- a/modules/tls/tls_init.c +++ b/modules/tls/tls_init.c @@ -79,7 +79,11 @@ # warning "" #endif

-#if OPENSSL_VERSION_NUMBER >= 0x00908000L /* 0.9.8*/ +/* replace openssl zlib compression with our version if necessary + * (the openssl zlib compression uses the wrong malloc, see + * openssl #1468): 0.9.8-dev < version <0.9.8e-beta1 */ +#if OPENSSL_VERSION_NUMBER >= 0x00908000L /* 0.9.8-dev */ && \ + OPENSSL_VERSION_NUMBER < 0x00908051L /* 0.9.8.e-beta1 */ # ifndef OPENSSL_NO_COMP # warning "openssl zlib compression bug workaround enabled" # endif