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

ITS#9176 Add TLS SNI support to libldap

Browse source 
Implemented for OpenSSL, GnuTLS just stubbed
This commit is contained in:
Howard Chu 2020-04-27 03:41:12 +01:00
parent df46c07a92
commit 5c0efb9ce8
4 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/libldap/ldap-tls.h
View file

@ -34,7 +34,7 @@ typedef void (TI_ctx_free)(tls_ctx *ctx);
typedef int (TI_ctx_init)(struct ldapoptions *lo, struct ldaptls *lt, int is_server); typedef int (TI_ctx_init)(struct ldapoptions *lo, struct ldaptls *lt, int is_server);
typedef tls_session *(TI_session_new)(tls_ctx *ctx, int is_server); typedef tls_session *(TI_session_new)(tls_ctx *ctx, int is_server);
typedef int (TI_session_connect)(LDAP *ld, tls_session *s); typedef int (TI_session_connect)(LDAP *ld, tls_session *s, const char *name_in);
typedef int (TI_session_accept)(tls_session *s); typedef int (TI_session_accept)(tls_session *s);
typedef int (TI_session_upflags)(Sockbuf *sb, tls_session *s, int rc); typedef int (TI_session_upflags)(Sockbuf *sb, tls_session *s, int rc);
typedef char *(TI_session_errmsg)(tls_session *s, int rc, char *buf, size_t len ); typedef char *(TI_session_errmsg)(tls_session *s, int rc, char *buf, size_t len );

2
libraries/libldap/tls2.c
View file

@ -376,7 +376,7 @@ ldap_int_tls_connect( LDAP *ld, LDAPConn *conn, const char *host )
lo->ldo_tls_connect_cb( ld, ssl, ctx, lo->ldo_tls_connect_arg ); lo->ldo_tls_connect_cb( ld, ssl, ctx, lo->ldo_tls_connect_arg );
} }
err = tls_imp->ti_session_connect( ld, ssl ); err = tls_imp->ti_session_connect( ld, ssl, host );
#ifdef HAVE_WINSOCK #ifdef HAVE_WINSOCK
errno = WSAGetLastError(); errno = WSAGetLastError();

2
libraries/libldap/tls_g.c
View file

@ -420,7 +420,7 @@ tlsg_session_accept( tls_session *session )
} }
static int static int
tlsg_session_connect( LDAP *ld, tls_session *session ) tlsg_session_connect( LDAP *ld, tls_session *session, const char *name_in )
{ {
return tlsg_session_accept( session); return tlsg_session_accept( session);
} }

8
libraries/libldap/tls_o.c
View file

@ -524,12 +524,16 @@ tlso_session_new( tls_ctx *ctx, int is_server )
} }
static int static int
tlso_session_connect( LDAP *ld, tls_session *sess ) tlso_session_connect( LDAP *ld, tls_session *sess, const char *name_in )
{ {
tlso_session *s = (tlso_session *)sess; tlso_session *s = (tlso_session *)sess;
int rc;
#ifdef SSL_CTRL_SET_TLSEXT_HOSTNAME
SSL_set_tlsext_host_name( s, name_in );
#endif
/* Caller expects 0 = success, OpenSSL returns 1 = success */ /* Caller expects 0 = success, OpenSSL returns 1 = success */
int rc = SSL_connect( s ) - 1; rc = SSL_connect( s ) - 1;
return rc; return rc;
} }