Skip to content

Commit 7907683

Browse files
Anushree Prakash Bgipulla
authored andcommitted
Bug#29414245 - BOTH MYSQL CLIENT AND SHELL FAIL TO CONNECT
TO 5.7 COMMUNITY SERVER DESCRIPTION: ============ 8.0 clients fail to connect to 5.7 community edition servers using SSL. ANALYSIS: ========= The clients fail to connect with the ssl error: unsafe legacy renegotiation disabled. This is because, the option SSL_OP_LEGACY_SERVER_CONNECT was cleared while setting the ssl options. FIX: ==== This patch reverts the changes that were added to clear SSL_OP_LEGACY_SERVER_CONNECT option so that clients can connect successfully to 5.7 community edition server. This option is currently set by default in openssl library. RB: 21622 (cherry picked from commit a9aeb4c20b5c0cf86764c80438632419ecfd4b2c)
1 parent a3dd3ba commit 7907683

File tree

1 file changed

+1
-4
lines changed

1 file changed

+1
-4
lines changed

vio/viossl.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
1+
/* Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
22
33
This program is free software; you can redistribute it and/or modify
44
it under the terms of the GNU General Public License as published by
@@ -397,9 +397,6 @@ static int ssl_do(struct st_VioSSLFd *ptr, Vio *vio,
397397
DBUG_PRINT("info", ("ssl: 0x%lx timeout: %ld", (long) ssl, timeout));
398398
SSL_clear(ssl);
399399
SSL_set_fd(ssl, sd);
400-
#if !defined(HAVE_YASSL) && OPENSSL_VERSION_NUMBER > 0x00908000L
401-
SSL_clear_options(ssl, SSL_OP_LEGACY_SERVER_CONNECT);
402-
#endif
403400
#if !defined(HAVE_YASSL) && defined(SSL_OP_NO_COMPRESSION)
404401
SSL_set_options(ssl, SSL_OP_NO_COMPRESSION); /* OpenSSL >= 1.0 only */
405402
#elif OPENSSL_VERSION_NUMBER >= 0x00908000L /* workaround for OpenSSL 0.9.8 */

0 commit comments

Comments
 (0)