From: Howard Chu <hyc@openldap.org>
Date: Thu, 21 Jan 2016 18:01:17 +0000 (+0000)
Subject: ITS#8353 partial fixes
X-Git-Tag: OPENLDAP_REL_ENG_2_4_45~107
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=d8c9c414ac6992f38378a95fbb510bfde93c1c0d;p=openldap

ITS#8353 partial fixes

ERR_remove_state() is deprecated since OpenSSL 1.0.0
Use X509_NAME_ENTRY_get_object() instead of direct access.
---

diff --git a/libraries/libldap/tls_o.c b/libraries/libldap/tls_o.c
index a2d9cd31f9..93fdd6e2a1 100644
--- a/libraries/libldap/tls_o.c
+++ b/libraries/libldap/tls_o.c
@@ -164,7 +164,11 @@ tlso_destroy( void )
 	struct ldapoptions *lo = LDAP_INT_GLOBAL_OPT();   
 
 	EVP_cleanup();
+#if OPENSSL_VERSION_NUMBER < 0x10000000
 	ERR_remove_state(0);
+#else
+	ERR_remove_thread_state(NULL);
+#endif
 	ERR_free_strings();
 
 	if ( lo->ldo_tls_randfile ) {
@@ -599,7 +603,7 @@ tlso_session_chkhost( LDAP *ld, tls_session *sess, const char *name_in )
 		navas = X509_NAME_entry_count( xn );
 		for ( i=navas-1; i>=0; i-- ) {
 			ne = X509_NAME_get_entry( xn, i );
-			if ( !OBJ_cmp( ne->object, obj )) {
+			if ( !OBJ_cmp( X509_NAME_ENTRY_get_object(ne), obj )) {
 				cn = X509_NAME_ENTRY_get_data( ne );
 				break;
 			}