ITS#6192

diff --git a/CHANGES b/CHANGES
index a9852b504dcfd4cd10fde0e2700be9fc3a1b0a27..72e3f71f19f0e50a58e595eab684e7c90d84326e 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -3,6 +3,7 @@ OpenLDAP 2.4 Change Log
 OpenLDAP 2.4.17 Engineering
        Fixed liblber to use ber_strnlen (ITS#6080)
        Fixed libldap gnutls private key init (ITS#6053)
+       Fixed libldap openssl digest initialization (ITS#6192)
        Fixed libldap tls NULL error messages (ITS#6079)
        Fixed liblutil opendir/closedir on windows (ITS#6041)
        Fixed liblutil for _GNU_SOURCE (ITS#5464,ITS#5666)

diff --git a/libraries/libldap/tls_o.c b/libraries/libldap/tls_o.c
index fc49529f927e095ee12e93a8fb030295a2515a99..a5855b4a1698edfc5d1746a0d0dcccb0897a4de2 100644 (file)
--- a/libraries/libldap/tls_o.c
+++ b/libraries/libldap/tls_o.c
@@ -77,7 +77,7 @@ static int tlso_seed_PRNG( const char *randfile );
 
 #ifdef LDAP_R_COMPILE
 /*
- * provide mutexes for the SSLeay library.
+ * provide mutexes for the OpenSSL library.
  */
 static ldap_pvt_thread_mutex_t tlso_mutexes[CRYPTO_NUM_LOCKS];
 static ldap_pvt_thread_mutex_t tlso_dh_mutex;
@@ -162,7 +162,8 @@ tlso_init( void )
 #endif
 
        SSL_load_error_strings();
-       SSLeay_add_ssl_algorithms();
+       SSL_library_init();
+       OpenSSL_add_all_digests();
 
        /* FIXME: mod_ssl does this */
        X509V3_add_standard_extensions();