diff options
| author | unknown <gluh@gluh.(none)> | 2002-11-05 12:05:58 +0400 |
|---|---|---|
| committer | unknown <gluh@gluh.(none)> | 2002-11-05 12:05:58 +0400 |
| commit | 69a5dd196cc89c690b3531b75bb77f9c4a048b50 (patch) | |
| tree | e27e1d7b216164535ab3100467fa0dea7d08a146 /include/violite.h | |
| parent | f6b9a33fb67c9143bda91e2fbdef6272c6d2e209 (diff) | |
| download | mariadb-git-69a5dd196cc89c690b3531b75bb77f9c4a048b50.tar.gz | |
Error code for ssl connection
Fix bug when server hang(with SSL, with modified libmysql)
Add options master-ssl-capath and master-ssl-cipher
Add some error checking(SSL)
include/errmsg.h:
Error code for SSL connection
include/violite.h:
Change return value in sslaccept
Remove unused variable open_
libmysql/errmsg.c:
Add client side descriptive message when ssl handshake fail
libmysql/libmysql.c:
Add ssl error code
Add proper error checking
sql/mysqld.cc:
Add options master-ssl-capath and master-ssl-cipher
sql/sql_parse.cc:
Add error checking after sslaccept
vio/viossl.c:
Add ssl handshake error cheking
vio/viosslfactories.c:
Change error description when using wrong key or certificate
Diffstat (limited to 'include/violite.h')
| -rw-r--r-- | include/violite.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/violite.h b/include/violite.h index f4f40dcb64b..6c8ad1f4b69 100644 --- a/include/violite.h +++ b/include/violite.h @@ -174,7 +174,7 @@ struct st_VioSSLConnectorFd SSL_METHOD* ssl_method_; }; -void sslaccept(struct st_VioSSLAcceptorFd*, Vio*, long timeout); +int sslaccept(struct st_VioSSLAcceptorFd*, Vio*, long timeout); int sslconnect(struct st_VioSSLConnectorFd*, Vio*, long timeout); struct st_VioSSLConnectorFd @@ -231,7 +231,6 @@ struct st_vio #ifdef HAVE_OPENSSL SSL* ssl_; - my_bool open_; #endif /* HAVE_OPENSSL */ #endif /* HAVE_VIO */ }; |