upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2026-02-03 20:40:05 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

ITS#9521 clarify - affects OpenSSL 1.1.1, not 1.1.0

Browse source
This commit is contained in:
Howard Chu 2021-04-09 18:23:53 +01:00
parent 2a3b64f4e6
commit fe6a740381
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libraries/libldap/tls_o.c
View file

@ -275,6 +275,7 @@ tlso_ctx_free ( tls_ctx *ctx )
SSL_CTX_free( c );
}
#if OPENSSL_VERSION_NUMBER >= 0x10101000
static char *
tlso_stecpy( char *dst, const char *src, const char *end )
{
@ -285,7 +286,7 @@ tlso_stecpy( char *dst, const char *src, const char *end )
return dst;
}
/* OpenSSL 1.1 uses a separate API for TLS1.3 ciphersuites.
/* OpenSSL 1.1.1 uses a separate API for TLS1.3 ciphersuites.
* Try to find any TLS1.3 ciphers in the given list of suites.
*/
static void
@ -319,6 +320,7 @@ tlso_ctx_cipher13( tlso_ctx *ctx, char *suites )
}
SSL_CTX_set_ciphersuites( ctx, tls13_suites );
}
#endif /* OpenSSL 1.1.1 */
/*
* initialize a new TLS context
@ -386,7 +388,9 @@ tlso_ctx_init( struct ldapoptions *lo, struct ldaptls *lt, int is_server )
}
if ( lo->ldo_tls_ciphersuite ) {
#if OPENSSL_VERSION_NUMBER >= 0x10101000
tlso_ctx_cipher13( ctx, lt->lt_ciphersuite );
#endif
if ( !SSL_CTX_set_cipher_list( ctx, lt->lt_ciphersuite ) )
{
Debug1( LDAP_DEBUG_ANY,