mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-02-23 14:09:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

ITS#10094 libldap/OpenSSL: fix setting ciphersuites

Browse Source 
Don't try old-style ciphersuite list if only v1.3 or newer ciphers were specified
This commit is contained in:
Howard Chu 2023-10-12 17:22:48 +01:00 committed by Quanah Gibson-Mount
parent 11b3e5946b
commit 8c482cec9a
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libraries/libldap/tls_o.c
View File

@ -296,7 +296,7 @@ tlso_stecpy( char *dst, const char *src, const char *end )
* Try to find any TLS1.3 ciphers in the given list of suites.
*/
static void
tlso_ctx_cipher13( tlso_ctx *ctx, char *suites )
tlso_ctx_cipher13( tlso_ctx *ctx, char *suites, char **oldsuites )
{
char tls13_suites[1024], *ts = tls13_suites, *te = tls13_suites + sizeof(tls13_suites);
char *ptr, *colon, *nptr;
@ -305,6 +305,8 @@ tlso_ctx_cipher13( tlso_ctx *ctx, char *suites )
SSL *s = SSL_new( ctx );
int ret;
*oldsuites = NULL;
if ( !s )
return;
@ -336,8 +338,15 @@ tlso_ctx_cipher13( tlso_ctx *ctx, char *suites )
if ( tls13_suites[0] )
ts = tlso_stecpy( ts, ":", te );
ts = tlso_stecpy( ts, nptr, te );
} else if (! *oldsuites) {
/* should never happen, set_ciphersuites should
* only succeed for TLSv1.3 and above
*/
*oldsuites = ptr;
}
}
} else if (! *oldsuites) {
*oldsuites = ptr;
}
if ( !colon || ts >= te )
break;
@ -417,10 +426,11 @@ tlso_ctx_init( struct ldapoptions *lo, struct ldaptls *lt, int is_server, char *
}
if ( lo->ldo_tls_ciphersuite ) {
char *oldsuites = lt->lt_ciphersuite;
#if OPENSSL_VERSION_NUMBER >= 0x10101000
tlso_ctx_cipher13( ctx, lt->lt_ciphersuite );
tlso_ctx_cipher13( ctx, lt->lt_ciphersuite, &oldsuites );
#endif
if ( !SSL_CTX_set_cipher_list( ctx, lt->lt_ciphersuite ) )
if ( oldsuites && !SSL_CTX_set_cipher_list( ctx, oldsuites ) )
{
Debug1( LDAP_DEBUG_ANY,
"TLS: could not set cipher list %s.\n",