mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-08 08:04:29 +02:00
Code Issues Projects Releases Packages Wiki Activity

MDEV-35581 On servers linked against WolfSSL SSL_Cipher and SSL_cipher_list are always the same

Browse source 
emulate OpenSSL behavior in WolfSSL:
* use wolfSSL_get_cipher_list(i) for SSL_get_cipher_list(ctx, i),
  not wolfSSL_get_cipher_list_ex(ctx, i), which returns only
  the cipher used in the current connection.
This commit is contained in:
Sergei Golubchik 2025-07-03 22:16:45 +02:00
commit 1ac4aeb5d8
3 changed files with 19 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/ssl_compat.h
View file

@ -57,6 +57,8 @@
#define ERR_remove_state(x) do {} while(0)
#undef SSL_get_cipher
#define SSL_get_cipher(ssl) (SSL_version(ssl) == TLS1_3_VERSION ? wolfSSL_get_cipher(ssl) : wolfSSL_get_cipher_name(ssl))
#undef SSL_get_cipher_list
#define SSL_get_cipher_list(ctx,i) wolfSSL_get_cipher_list(i)
#elif defined (HAVE_ERR_remove_thread_state)
#define ERR_remove_state(X) ERR_remove_thread_state(NULL)
#endif /* HAVE_ERR_remove_thread_state */

9
mysql-test/main/ssl.result
View file

@ -2188,11 +2188,20 @@ drop table t1;
SELECT (VARIABLE_VALUE <> '') AS have_ssl FROM INFORMATION_SCHEMA.SESSION_STATUS WHERE VARIABLE_NAME='Ssl_cipher';
have_ssl
1
#
# MDEV-7697 Client reports ERROR 2006 (MySQL server has gone away) or ERROR 2013 (Lost connection to server during query) while executing AES* functions under SSL
#
select aes_decrypt('MySQL','adf');
aes_decrypt('MySQL','adf')
NULL
select 'still connected?';
still connected?
still connected?
#
# MDEV-35581 On servers linked against WolfSSL SSL_Cipher and SSL_cipher_list are always the same
#
select variable_value like '%:%' from information_schema.session_status where variable_name='ssl_cipher_list';
variable_value like '%:%'
1
connection default;
disconnect ssl_con;

11
mysql-test/main/ssl.test
View file

@ -29,12 +29,17 @@ SHOW STATUS LIKE 'Ssl_server_not_after';
# Check ssl turned on
SELECT (VARIABLE_VALUE <> '') AS have_ssl FROM INFORMATION_SCHEMA.SESSION_STATUS WHERE VARIABLE_NAME='Ssl_cipher';
#
# MDEV-7697 Client reports ERROR 2006 (MySQL server has gone away) or ERROR 2013 (Lost connection to server during query) while executing AES* functions under SSL
#
--echo #
--echo # MDEV-7697 Client reports ERROR 2006 (MySQL server has gone away) or ERROR 2013 (Lost connection to server during query) while executing AES* functions under SSL
--echo #
select aes_decrypt('MySQL','adf');
select 'still connected?';
--echo #
--echo # MDEV-35581 On servers linked against WolfSSL SSL_Cipher and SSL_cipher_list are always the same
--echo #
select variable_value like '%:%' from information_schema.session_status where variable_name='ssl_cipher_list';
connection default;
disconnect ssl_con;