summaryrefslogtreecommitdiff
path: root/client
diff options
context:
space:
mode:
authorunknown <msvensson@neptunus.(none)>2006-04-07 11:26:21 +0200
committerunknown <msvensson@neptunus.(none)>2006-04-07 11:26:21 +0200
commit82bb41254f4e418b482c711a668bfdc2ad2dd4d4 (patch)
tree6cc47e2021ddf59b75c5caa841415df76472f1b7 /client
parentd15b31bf8c147fa6e5c8885b4dd0c855f6102b88 (diff)
downloadmariadb-git-82bb41254f4e418b482c711a668bfdc2ad2dd4d4.tar.gz
Add new function mysql_get_ssl_cipher to libmysl and use it from client to avoid dependency on SSL libs from mysql client.
include/mysql.h: Add new function mysql_get_ssl_cipher sql-common/client.c: Add new function mysql_get_ssl_cipher, will return the cipher used for the current connection to the server.
Diffstat (limited to 'client')
-rw-r--r--client/mysql.cc5
1 files changed, 2 insertions, 3 deletions
diff --git a/client/mysql.cc b/client/mysql.cc
index 2001056dea1..a0bc6f52f29 100644
--- a/client/mysql.cc
+++ b/client/mysql.cc
@@ -3212,10 +3212,9 @@ com_status(String *buffer __attribute__((unused)),
mysql_free_result(result);
}
#ifdef HAVE_OPENSSL
- if (mysql.net.vio && mysql.net.vio->ssl_arg &&
- SSL_get_cipher((SSL*) mysql.net.vio->ssl_arg))
+ if (mysql_get_ssl_cipher(&mysql))
tee_fprintf(stdout, "SSL:\t\t\tCipher in use is %s\n",
- SSL_get_cipher((SSL*) mysql.net.vio->ssl_arg));
+ mysql_get_ssl_cipher(&mysql));
else
#endif /* HAVE_OPENSSL */
tee_puts("SSL:\t\t\tNot in use", stdout);