dovecot-2.2: libressl fix: Fixed compiling with SSL compression ...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.2/rev/256411741f0a
changeset: 17667:256411741f0a
user:      Timo Sirainen <tss at iki.fi>
date:      Tue Jul 29 14:27:49 2014 +0300
description:
libressl fix: Fixed compiling with SSL compression disabled.
Patch by Pascal Stumpf

diffstat:

 src/lib-ssl-iostream/iostream-openssl.c |  4 ++--
 src/login-common/ssl-proxy-openssl.c    |  2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diffs (33 lines):

diff -r e01a298adbe4 -r 256411741f0a src/lib-ssl-iostream/iostream-openssl.c
--- a/src/lib-ssl-iostream/iostream-openssl.c	Tue Jul 29 14:25:13 2014 +0300
+++ b/src/lib-ssl-iostream/iostream-openssl.c	Tue Jul 29 14:27:49 2014 +0300
@@ -677,7 +677,7 @@
 openssl_iostream_get_security_string(struct ssl_iostream *ssl_io)
 {
 	const SSL_CIPHER *cipher;
-#ifdef HAVE_SSL_COMPRESSION
+#if defined(HAVE_SSL_COMPRESSION) && !defined(OPENSSL_NO_COMP)
 	const COMP_METHOD *comp;
 #endif
 	const char *comp_str;
@@ -688,7 +688,7 @@
 
 	cipher = SSL_get_current_cipher(ssl_io->ssl);
 	bits = SSL_CIPHER_get_bits(cipher, &alg_bits);
-#ifdef HAVE_SSL_COMPRESSION
+#if defined(HAVE_SSL_COMPRESSION) && !defined(OPENSSL_NO_COMP)
 	comp = SSL_get_current_compression(ssl_io->ssl);
 	comp_str = comp == NULL ? "" :
 		t_strconcat(" ", SSL_COMP_get_name(comp), NULL);
diff -r e01a298adbe4 -r 256411741f0a src/login-common/ssl-proxy-openssl.c
--- a/src/login-common/ssl-proxy-openssl.c	Tue Jul 29 14:25:13 2014 +0300
+++ b/src/login-common/ssl-proxy-openssl.c	Tue Jul 29 14:27:49 2014 +0300
@@ -772,7 +772,7 @@
 
 const char *ssl_proxy_get_compression(struct ssl_proxy *proxy ATTR_UNUSED)
 {
-#ifdef HAVE_SSL_COMPRESSION
+#if defined(HAVE_SSL_COMPRESSION) && !defined(OPENSSL_NO_COMP)
 	const COMP_METHOD *comp;
 
 	comp = SSL_get_current_compression(proxy->ssl);