diff options
| author | Georg Richter <georg@mariadb.com> | 2016-10-13 12:07:14 +0200 |
|---|---|---|
| committer | Georg Richter <georg@mariadb.com> | 2016-10-13 12:07:14 +0200 |
| commit | 351e6c8ede92ce2c22b9e7dfe07f992d09661478 (patch) | |
| tree | 99f95ff39c350cc68bdc7406a26793f6e75fcf0c /include/mysql_async.h | |
| parent | 9a0fdab9ffab032aaf70ebf1ed255480b850a462 (diff) | |
| download | mariadb-git-10.2-good_bye_yassl.tar.gz | |
- Replaced yassl by gnutls10.2-good_bye_yassl
TLS functionality is now handled in ma_tls_vio.c
- added new parameter ssl_passphrase for passphrase protected
keys
Diffstat (limited to 'include/mysql_async.h')
| -rw-r--r-- | include/mysql_async.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/include/mysql_async.h b/include/mysql_async.h index 2728b9c1dc7..62e4eaeb5e6 100644 --- a/include/mysql_async.h +++ b/include/mysql_async.h @@ -28,10 +28,12 @@ extern ssize_t my_send_async(struct mysql_async_context *b, int fd, int timeout); extern my_bool my_io_wait_async(struct mysql_async_context *b, enum enum_vio_io_event event, int timeout); -#ifdef HAVE_OPENSSL -extern int my_ssl_read_async(struct mysql_async_context *b, SSL *ssl, +#ifdef HAVE_TLS +extern int my_ssl_read_async(struct mysql_async_context *b, + MA_TLS_SESSION ssl, void *buf, int size); -extern int my_ssl_write_async(struct mysql_async_context *b, SSL *ssl, +extern int my_ssl_write_async(struct mysql_async_context *b, + MA_TLS_SESSION ssl, const void *buf, int size); #endif |