mirror of
https://git.openldap.org/openldap/openldap.git
synced 2025-03-07 14:18:15 +08:00
ITS#8353 partial fixes
ERR_remove_state() is deprecated since OpenSSL 1.0.0 Use X509_NAME_ENTRY_get_object() instead of direct access.
This commit is contained in:
parent
eaee3b39ba
commit
f2d0aa7d22
@ -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;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user