diff options
| author | unknown <msvensson@pilot.blaudden> | 2007-03-28 15:34:52 +0200 |
|---|---|---|
| committer | unknown <msvensson@pilot.blaudden> | 2007-03-28 15:34:52 +0200 |
| commit | ff7db598a270ba3342ec0f2fc290e43003699241 (patch) | |
| tree | b13e2d20a3576dc87b2c4970c8e1c8cba6d6f40f | |
| parent | 230a116ed201ace7d9b4b703cfc2b65d9076cf36 (diff) | |
| download | mariadb-git-ff7db598a270ba3342ec0f2fc290e43003699241.tar.gz | |
Set yaSSL to use same type as MySQL do for socket handles
extra/yassl/include/openssl/ssl.h:
Import patch yassl.diff
extra/yassl/src/ssl.cpp:
Import patch yassl.diff
| -rw-r--r-- | extra/yassl/include/openssl/ssl.h | 10 | ||||
| -rw-r--r-- | extra/yassl/src/ssl.cpp | 2 | ||||
| -rw-r--r-- | include/violite.h | 3 |
3 files changed, 12 insertions, 3 deletions
diff --git a/extra/yassl/include/openssl/ssl.h b/extra/yassl/include/openssl/ssl.h index 29add5ca37d..7dd33e3fcad 100644 --- a/extra/yassl/include/openssl/ssl.h +++ b/extra/yassl/include/openssl/ssl.h @@ -190,11 +190,17 @@ enum { /* ERR Constants */ EVP_R_BAD_DECRYPT = 2 }; - +/* + Allow type used by SSL_set_fd to be changed, default to int + in order to be compatible with OpenSSL + */ +#ifndef YASSL_SOCKET_T_DEFINED +typedef int YASSL_SOCKET_T; +#endif SSL_CTX* SSL_CTX_new(SSL_METHOD*); SSL* SSL_new(SSL_CTX*); -int SSL_set_fd (SSL*, int); +int SSL_set_fd (SSL*, YASSL_SOCKET_T); int SSL_connect(SSL*); int SSL_write(SSL*, const void*, int); int SSL_read(SSL*, void*, int); diff --git a/extra/yassl/src/ssl.cpp b/extra/yassl/src/ssl.cpp index 5bbde13a652..5ccc45ded2a 100644 --- a/extra/yassl/src/ssl.cpp +++ b/extra/yassl/src/ssl.cpp @@ -229,7 +229,7 @@ void SSL_free(SSL* ssl) } -int SSL_set_fd(SSL* ssl, int fd) +int SSL_set_fd(SSL* ssl, YASSL_SOCKET_T fd) { ssl->useSocket().set_fd(fd); return SSL_SUCCESS; diff --git a/include/violite.h b/include/violite.h index 4122e581a0f..63388c170c9 100644 --- a/include/violite.h +++ b/include/violite.h @@ -102,6 +102,9 @@ void vio_timeout(Vio *vio,uint which, uint timeout); #define HEADER_DES_LOCL_H dummy_something #define YASSL_MYSQL_COMPATIBLE #define YASSL_PREFIX +/* Set yaSSL to use same type as MySQL do for socket handles */ +typedef my_socket YASSL_SOCKET_T; +#define YASSL_SOCKET_T_DEFINED #include <openssl/ssl.h> #include <openssl/err.h> |