dovecot-2.0: login: ssl_security string now also shows the used ...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.0/rev/9b4bb1a7d789
changeset: 9939:9b4bb1a7d789
user:      Timo Sirainen <tss at iki.fi>
date:      Mon Sep 28 11:11:54 2009 -0400
description:
login: ssl_security string now also shows the used compression.

diffstat:

1 file changed, 7 insertions(+), 2 deletions(-)
src/login-common/ssl-proxy-openssl.c |    9 +++++++--

diffs (28 lines):

diff -r aedf642c8bc8 -r 9b4bb1a7d789 src/login-common/ssl-proxy-openssl.c
--- a/src/login-common/ssl-proxy-openssl.c	Wed Sep 23 23:12:58 2009 +0300
+++ b/src/login-common/ssl-proxy-openssl.c	Mon Sep 28 11:11:54 2009 -0400
@@ -667,17 +667,22 @@ const char *ssl_proxy_get_security_strin
 const char *ssl_proxy_get_security_string(struct ssl_proxy *proxy)
 {
 	SSL_CIPHER *cipher;
+	const COMP_METHOD *comp;
 	int bits, alg_bits;
+	const char *comp_str;
 
 	if (!proxy->handshaked)
 		return "";
 
 	cipher = SSL_get_current_cipher(proxy->ssl);
 	bits = SSL_CIPHER_get_bits(cipher, &alg_bits);
-	return t_strdup_printf("%s with cipher %s (%d/%d bits)",
+	comp = SSL_get_current_compression(proxy->ssl);
+	comp_str = comp == NULL ? "" :
+		t_strconcat(" ", SSL_COMP_get_name(comp), NULL);
+	return t_strdup_printf("%s with cipher %s (%d/%d bits)%s",
 			       SSL_get_version(proxy->ssl),
 			       SSL_CIPHER_get_name(cipher),
-			       bits, alg_bits);
+			       bits, alg_bits, comp_str);
 }
 
 void ssl_proxy_free(struct ssl_proxy **_proxy)