changeset 9389:26ca4ff5d269 HEAD

login: ssl_security string now also shows the used compression.
author Timo Sirainen <tss@iki.fi>
date Mon, 28 Sep 2009 11:11:54 -0400
parents c8e24c1b8468
children 3132464fbe9c
files src/login-common/ssl-proxy-openssl.c
diffstat 1 files changed, 7 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/login-common/ssl-proxy-openssl.c	Wed Sep 23 23:11:54 2009 +0300
+++ b/src/login-common/ssl-proxy-openssl.c	Mon Sep 28 11:11:54 2009 -0400
@@ -635,17 +635,22 @@
 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)