upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-21 07:09:34 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

ITS#9436 libldap: OpenSSL 3.0 compat

Browse source
This commit is contained in:
Howard Chu 2022-02-02 18:11:27 +00:00 committed by Quanah Gibson-Mount
parent 83c712f401
commit e62d05d26c
1 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
libraries/libldap/tls_o.c
View file

@ -52,6 +52,10 @@
#define ASN1_STRING_data(x) ASN1_STRING_get0_data(x) #define ASN1_STRING_data(x) ASN1_STRING_get0_data(x)
#endif #endif
#if OPENSSL_VERSION_MAJOR >= 3
#define ERR_get_error_line( a, b ) ERR_get_error_all( a, b, NULL, NULL, NULL )
#define SSL_get_peer_certificate( s ) SSL_get1_peer_certificate( s )
#endif
typedef SSL_CTX tlso_ctx; typedef SSL_CTX tlso_ctx;
typedef SSL tlso_session; typedef SSL tlso_session;
@ -547,7 +551,13 @@ tlso_ctx_init( struct ldapoptions *lo, struct ldaptls *lt, int is_server, char *
} }
if ( is_server && lo->ldo_tls_dhfile ) { if ( is_server && lo->ldo_tls_dhfile ) {
#if OPENSSL_VERSION_MAJOR >= 3
EVP_PKEY *dh;
#define bio_params( bio, dh ) dh = PEM_read_bio_Parameters( bio, &dh )
#else
DH *dh; DH *dh;
#define bio_params( bio, dh ) dh = PEM_read_bio_DHparams( bio, NULL, NULL, NULL )
#endif
BIO *bio; BIO *bio;
if (( bio=BIO_new_file( lt->lt_dhfile,"r" )) == NULL ) { if (( bio=BIO_new_file( lt->lt_dhfile,"r" )) == NULL ) {
@ -557,7 +567,7 @@ tlso_ctx_init( struct ldapoptions *lo, struct ldaptls *lt, int is_server, char *
tlso_report_error( errmsg ); tlso_report_error( errmsg );
return -1; return -1;
} }
if (!( dh=PEM_read_bio_DHparams( bio, NULL, NULL, NULL ))) { if (!( bio_params( bio, dh ))) {
Debug1( LDAP_DEBUG_ANY, Debug1( LDAP_DEBUG_ANY,
"TLS: could not read DH parameters file `%s'.\n", "TLS: could not read DH parameters file `%s'.\n",
lo->ldo_tls_dhfile ); lo->ldo_tls_dhfile );
@ -566,9 +576,13 @@ tlso_ctx_init( struct ldapoptions *lo, struct ldaptls *lt, int is_server, char *
return -1; return -1;
} }
BIO_free( bio ); BIO_free( bio );
#if OPENSSL_VERSION_MAJOR >= 3
SSL_CTX_set0_tmp_dh_pkey( ctx, dh );
#else
SSL_CTX_set_tmp_dh( ctx, dh ); SSL_CTX_set_tmp_dh( ctx, dh );
SSL_CTX_set_options( ctx, SSL_OP_SINGLE_DH_USE ); SSL_CTX_set_options( ctx, SSL_OP_SINGLE_DH_USE );
DH_free( dh ); DH_free( dh );
#endif
} }
if ( lo->ldo_tls_ecname ) { if ( lo->ldo_tls_ecname ) {