diff options
| author | Satya B <satya.bn@sun.com> | 2009-07-24 11:15:31 +0530 |
|---|---|---|
| committer | Satya B <satya.bn@sun.com> | 2009-07-24 11:15:31 +0530 |
| commit | 559e2f1c1e151baec1ec37796640f53af0bd1b30 (patch) | |
| tree | 8c0c6370decc4d3d7a044069ab1bcc5f30d76410 /include | |
| parent | 342553252fc0315762abe3491889491728d06998 (diff) | |
| parent | 1e32574c65ce6b7f8d83e1d3a24998dcd06c0c24 (diff) | |
| download | mariadb-git-559e2f1c1e151baec1ec37796640f53af0bd1b30.tar.gz | |
merge to mysql-5.0-bugteam
Diffstat (limited to 'include')
| -rw-r--r-- | include/violite.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/include/violite.h b/include/violite.h index 7b57667541a..b04fe108314 100644 --- a/include/violite.h +++ b/include/violite.h @@ -109,6 +109,14 @@ typedef my_socket YASSL_SOCKET_T; #include <openssl/ssl.h> #include <openssl/err.h> +enum enum_ssl_init_error +{ + SSL_INITERR_NOERROR= 0, SSL_INITERR_CERT, SSL_INITERR_KEY, + SSL_INITERR_NOMATCH, SSL_INITERR_BAD_PATHS, SSL_INITERR_CIPHERS, + SSL_INITERR_MEMFAIL, SSL_INITERR_LASTERR +}; +const char* sslGetErrString(enum enum_ssl_init_error err); + struct st_VioSSLFd { SSL_CTX *ssl_context; @@ -124,7 +132,7 @@ struct st_VioSSLFd struct st_VioSSLFd *new_VioSSLAcceptorFd(const char *key_file, const char *cert_file, const char *ca_file,const char *ca_path, - const char *cipher); + const char *cipher, enum enum_ssl_init_error* error); #endif /* HAVE_OPENSSL */ #ifdef HAVE_SMEM |