diff options
author | Georg Richter <georg@mariadb.com> | 2021-07-04 13:49:41 +0200 |
---|---|---|
committer | Georg Richter <georg@mariadb.com> | 2021-07-05 08:14:52 +0200 |
commit | de02d91fed7f7290885dd22e20de4b3f78000b02 (patch) | |
tree | 0478551017622b74059bd477d8b0dc5ee138b725 /mysql-test/main/ssl_cipher.test | |
parent | 83684fc9a4d81f15fee1888123cc7f7a4e298c4f (diff) | |
download | mariadb-git-bb-10.6-MDEV-26049.tar.gz |
MDEV-26049bb-10.6-MDEV-26049
1. In the previous implementation the status variable 'Ssl_cipher_list'
returned the built-in cipher suites for OpenSSL and (which is wrong)
for WolfSSL the current cipher in use. This patch displays all supported
cipher suites for WolfSSL and doesn't require a secure connection anymore.
2. A new status variable 'Ssl_shared_ciphers' was added which returns
the cipher suites supported from both client and server considering TLS
protocol version. This feature is fully supported by OpenSSL only, while
WolfSSL supports this feature via OpenSSL compatibility layer it returns
only the cipher suite used by current connection.
3. Fixed ssl_cipher test:
Also allow testing against OpenSSL by limiting the TLS version to
TLSv1.1 and 1.2.
Diffstat (limited to 'mysql-test/main/ssl_cipher.test')
-rw-r--r-- | mysql-test/main/ssl_cipher.test | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/main/ssl_cipher.test b/mysql-test/main/ssl_cipher.test index 36549d76d02..f9385e21c85 100644 --- a/mysql-test/main/ssl_cipher.test +++ b/mysql-test/main/ssl_cipher.test @@ -4,9 +4,9 @@ # --source include/have_ssl_communication.inc -if (`select @@version_ssl_library like 'OpenSSL 1.1.1%'`) { - skip OpenSSL 1.1.1; -} +#if (`select @@version_ssl_library like 'OpenSSL 1.1.1%'`) { +# skip OpenSSL 1.1.1; +#} create user ssl_user1@localhost require SSL; create user ssl_user2@localhost require cipher 'AES256-SHA'; @@ -98,6 +98,6 @@ let $restart_parameters=--ssl-cipher=AES128-SHA; source include/restart_mysqld.inc; connect (ssl_con,localhost,root,,,,,SSL); SHOW STATUS LIKE 'Ssl_cipher'; -SHOW STATUS LIKE 'Ssl_cipher_list'; +SELECT 'Ssl_cipher_list' as Variable_name, 'AES128-SHA' as Value from information_schema.session_status where variable_name='SSL_CIPHER_LIST' and locate('AES128-SHA', variable_value) > 0; disconnect ssl_con; connection default; |