Commit ff7db598 authored by unknown's avatar unknown

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
parent 230a116e
...@@ -190,11 +190,17 @@ enum { /* ERR Constants */ ...@@ -190,11 +190,17 @@ enum { /* ERR Constants */
EVP_R_BAD_DECRYPT = 2 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_CTX* SSL_CTX_new(SSL_METHOD*);
SSL* SSL_new(SSL_CTX*); 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_connect(SSL*);
int SSL_write(SSL*, const void*, int); int SSL_write(SSL*, const void*, int);
int SSL_read(SSL*, void*, int); int SSL_read(SSL*, void*, int);
......
...@@ -229,7 +229,7 @@ void SSL_free(SSL* ssl) ...@@ -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); ssl->useSocket().set_fd(fd);
return SSL_SUCCESS; return SSL_SUCCESS;
......
...@@ -102,6 +102,9 @@ void vio_timeout(Vio *vio,uint which, uint timeout); ...@@ -102,6 +102,9 @@ void vio_timeout(Vio *vio,uint which, uint timeout);
#define HEADER_DES_LOCL_H dummy_something #define HEADER_DES_LOCL_H dummy_something
#define YASSL_MYSQL_COMPATIBLE #define YASSL_MYSQL_COMPATIBLE
#define YASSL_PREFIX #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/ssl.h>
#include <openssl/err.h> #include <openssl/err.h>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment