ITS#8353 partial fixes

[openldap] / libraries / libldap / tls_o.c

diff --git a/libraries/libldap/tls_o.c b/libraries/libldap/tls_o.c
index 5d2367c6c1cc1e45707dbd070dadf88a556f8d74..e3379efd4ca49884b2a6a6b6aed153e4b78418e1 100644 (file)
--- 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 ) {
@@ -630,7 +634,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;
                        }