Mon Jul 20 15:32:33 2009 UTC ()

catch up with openssl constification


(christos)

diff -r1.1.1.2 -r1.2 src/external/bsd/openldap/dist/libraries/libldap/tls.c

--- src/external/bsd/openldap/dist/libraries/libldap/Attic/tls.c 2008/07/17 04:32:57	1.1.1.2
+++ src/external/bsd/openldap/dist/libraries/libldap/Attic/tls.c 2009/07/20 15:32:33	1.2

 @@ -2776,29 +2776,29 @@ ldap_pvt_tls_sb_ctx( Sockbuf *sb )
 	if (HAS_TLS( sb )) {
 		ber_sockbuf_ctrl( sb, LBER_SB_OPT_GET_SSL, (void *)&p );
 		return p;
+	}
 #endif
 	return NULL;
+}
 int
 ldap_pvt_tls_get_strength( void *s )
+{
 #ifdef HAVE_OPENSSL
-	SSL_CIPHER *c;
+	const SSL_CIPHER *c;
-	c = SSL_get_current_cipher((SSL *)s);
+	c = SSL_get_current_cipher((const SSL *)s);
 	return SSL_CIPHER_get_bits(c, NULL);
 #elif defined(HAVE_GNUTLS)
 	tls_session *session = s;
 	gnutls_cipher_algorithm_t c;
 	c = gnutls_cipher_get( session->session );
 	return gnutls_cipher_get_key_size( c ) * 8;
 #else
 	return 0;
 #endif
+}