From ff7db598a270ba3342ec0f2fc290e43003699241 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 28 Mar 2007 15:34:52 +0200 Subject: 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 --- extra/yassl/include/openssl/ssl.h | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'extra/yassl/include') 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); -- cgit v1.2.1