diff options
| author | unknown <tonu@x153.internalnet> | 2001-09-01 05:18:01 +0800 |
|---|---|---|
| committer | unknown <tonu@x153.internalnet> | 2001-09-01 05:18:01 +0800 |
| commit | 5fb52a1901528a0eab2fcb11e21a728eda9a47ae (patch) | |
| tree | 400bb63418642150054bbf66ff8d749f5771a09e /sql/sql_show.cc | |
| parent | a485f382e5ae58c2c90a79ddc10bc1acaeb291e7 (diff) | |
| download | mariadb-git-5fb52a1901528a0eab2fcb11e21a728eda9a47ae.tar.gz | |
SSL fixes
Diffstat (limited to 'sql/sql_show.cc')
| -rw-r--r-- | sql/sql_show.cc | 48 |
1 files changed, 25 insertions, 23 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc index a6e0c8a01f4..ef5fc50b4f7 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -1155,6 +1155,7 @@ int mysqld_show(THD *thd, const char *wild, show_var_st *variables) break; } #ifdef HAVE_OPENSSL + /* First group - functions relying on CTX */ case SHOW_SSL_CTX_SESS_ACCEPT: net_store_data(&packet2,(uint32) SSL_CTX_sess_accept(ssl_acceptor_fd->ssl_context_)); @@ -1167,10 +1168,6 @@ int mysqld_show(THD *thd, const char *wild, show_var_st *variables) net_store_data(&packet2,(uint32) SSL_CTX_sess_accept_renegotiate(ssl_acceptor_fd->ssl_context_)); break; - case SHOW_SSL_GET_VERSION: - net_store_data(&packet2, - SSL_get_version(thd->net.vio->ssl_)); - break; case SHOW_SSL_CTX_SESS_CB_HITS: net_store_data(&packet2,(uint32) SSL_CTX_sess_cb_hits(ssl_acceptor_fd->ssl_context_)); @@ -1179,14 +1176,6 @@ int mysqld_show(THD *thd, const char *wild, show_var_st *variables) net_store_data(&packet2,(uint32) SSL_CTX_sess_number(ssl_acceptor_fd->ssl_context_)); break; - case SHOW_SSL_SESSION_REUSED: - net_store_data(&packet2,(uint32) - SSL_session_reused(thd->net.vio->ssl_)); - break; - case SHOW_SSL_GET_DEFAULT_TIMEOUT: - net_store_data(&packet2,(uint32) - SSL_get_default_timeout(thd->net.vio->ssl_)); - break; case SHOW_SSL_CTX_SESS_GET_CACHE_SIZE: net_store_data(&packet2,(uint32) SSL_CTX_sess_get_cache_size(ssl_acceptor_fd->ssl_context_)); @@ -1195,21 +1184,10 @@ int mysqld_show(THD *thd, const char *wild, show_var_st *variables) net_store_data(&packet2,(uint32) SSL_CTX_get_verify_mode(ssl_acceptor_fd->ssl_context_)); break; - case SHOW_SSL_GET_VERIFY_MODE: - net_store_data(&packet2,(uint32) - SSL_get_verify_mode(thd->net.vio->ssl_)); - break; case SHOW_SSL_CTX_GET_VERIFY_DEPTH: net_store_data(&packet2,(uint32) SSL_CTX_get_verify_depth(ssl_acceptor_fd->ssl_context_)); break; - case SHOW_SSL_GET_VERIFY_DEPTH: - net_store_data(&packet2,(uint32) - SSL_get_verify_depth(thd->net.vio->ssl_)); - break; - case SHOW_SSL_GET_CIPHER: - net_store_data(&packet2, SSL_get_cipher(thd->net.vio->ssl_)); - break; case SHOW_SSL_CTX_GET_SESSION_CACHE_MODE: switch(SSL_CTX_get_session_cache_mode(ssl_acceptor_fd->ssl_context_)) { @@ -1236,6 +1214,30 @@ int mysqld_show(THD *thd, const char *wild, show_var_st *variables) break; } break; + /* First group - functions relying on SSL */ + case SHOW_SSL_GET_VERSION: + net_store_data(&packet2, thd->net.vio->ssl_ ? + SSL_get_version(thd->net.vio->ssl_) : ""); + break; + case SHOW_SSL_SESSION_REUSED: + net_store_data(&packet2,(uint32) (thd->net.vio->ssl_ ? + SSL_session_reused(thd->net.vio->ssl_) : 0)); + break; + case SHOW_SSL_GET_DEFAULT_TIMEOUT: + net_store_data(&packet2,(uint32) (thd->net.vio->ssl_ ? + SSL_get_default_timeout(thd->net.vio->ssl_):0)); + break; + case SHOW_SSL_GET_VERIFY_MODE: + net_store_data(&packet2,(uint32) (thd->net.vio->ssl_ ? + SSL_get_verify_mode(thd->net.vio->ssl_):0)); + break; + case SHOW_SSL_GET_VERIFY_DEPTH: + net_store_data(&packet2,(uint32) (thd->net.vio->ssl_ ? + SSL_get_verify_depth(thd->net.vio->ssl_):0)); + break; + case SHOW_SSL_GET_CIPHER: + net_store_data(&packet2, thd->net.vio->ssl_ ? SSL_get_cipher(thd->net.vio->ssl_) : ""); + break; #endif /* HAVE_OPENSSL */ } |