From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Thu, 10 Jul 2008 01:56:18 +0000 (+0000)
Subject: ITS#5585
X-Git-Tag: OPENLDAP_REL_ENG_2_4_11~21
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=aa2bdbad454aa83b9a0c76e815006f81041653b2;p=openldap

ITS#5585
---

diff --git a/CHANGES b/CHANGES
index 77be43d533..325cce44a2 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4,6 +4,7 @@ OpenLDAP 2.4.11 Engineering
 	Fixed liblber ber_get_next length decoding (ITS#5580)
 	Added libldap assertion control (ITS#5560)
 	Fixed libldap GnuTLS CRL result handling (ITS#5577)
+	Fixed libldap GnuTLS SSF computation (ITS#5585)
 	Fixed slapd check for structural_class failures (ITS#5540)
 	Fixed slapd config backend renumbering (ITS#5571)
 	Fixed slapd configContext OID (ITS#5383)
diff --git a/libraries/libldap/tls.c b/libraries/libldap/tls.c
index c966628390..b042aec9f4 100644
--- a/libraries/libldap/tls.c
+++ b/libraries/libldap/tls.c
@@ -2795,7 +2795,7 @@ ldap_pvt_tls_get_strength( void *s )
 	gnutls_cipher_algorithm_t c;
 
 	c = gnutls_cipher_get( session->session );
-	return gnutls_cipher_get_key_size( c );
+	return gnutls_cipher_get_key_size( c ) * 8;
 #else
 	return 0;
 #endif