diff options
| author | Staale Smedseng <staale.smedseng@sun.com> | 2009-07-23 13:53:28 +0200 |
|---|---|---|
| committer | Staale Smedseng <staale.smedseng@sun.com> | 2009-07-23 13:53:28 +0200 |
| commit | 9c708fdf1e0fac8debbfe561a3fd50c9c653a613 (patch) | |
| tree | 6a02d4299946b85a098943cf54be1eca63cf9101 /include/violite.h | |
| parent | 2d716209e62464e526205f6739779f536314f566 (diff) | |
| parent | 1e32574c65ce6b7f8d83e1d3a24998dcd06c0c24 (diff) | |
| download | mariadb-git-9c708fdf1e0fac8debbfe561a3fd50c9c653a613.tar.gz | |
Merge from 5.0
Diffstat (limited to 'include/violite.h')
| -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 d49d0302b5e..f833606233c 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); void free_vio_ssl_acceptor_fd(struct st_VioSSLFd *fd); #endif /* HAVE_OPENSSL */ |