Socat failed to compile on platforms without DTLSv1_client_method etc.

This commit is contained in:
Gerhard Rieger 2016-12-09 23:16:00 +01:00
parent f8618f61de
commit d2f748f0bb
2 changed files with 8 additions and 0 deletions

View file

@ -18,6 +18,10 @@ porting:
compilation on FreeBSD 10.1 with clang. Thanks to Emanuel Haupt for compilation on FreeBSD 10.1 with clang. Thanks to Emanuel Haupt for
reporting this bug. reporting this bug.
Socat failed to compile on platforms with OpenSSL without
DTLSv1_client_method or DTLSv1_server_method.
Thanks to Simon Matter for sending a patch.
testing: testing:
socks4echo.sh and socks4a-echo.sh hung with new bash with read -n socks4echo.sh and socks4a-echo.sh hung with new bash with read -n

View file

@ -143,6 +143,7 @@ const SSL_METHOD *sycTLSv1_2_server_method(void) {
} }
#endif #endif
#if HAVE_DTLSv1_client_method
const SSL_METHOD *sycDTLSv1_client_method(void) { const SSL_METHOD *sycDTLSv1_client_method(void) {
const SSL_METHOD *result; const SSL_METHOD *result;
Debug("DTLSv1_client_method()"); Debug("DTLSv1_client_method()");
@ -150,7 +151,9 @@ const SSL_METHOD *sycDTLSv1_client_method(void) {
Debug1("DTLSv1_client_method() -> %p", result); Debug1("DTLSv1_client_method() -> %p", result);
return result; return result;
} }
#endif
#if HAVE_DTLSv1_server_method
const SSL_METHOD *sycDTLSv1_server_method(void) { const SSL_METHOD *sycDTLSv1_server_method(void) {
const SSL_METHOD *result; const SSL_METHOD *result;
Debug("DTLSv1_server_method()"); Debug("DTLSv1_server_method()");
@ -158,6 +161,7 @@ const SSL_METHOD *sycDTLSv1_server_method(void) {
Debug1("DTLSv1_server_method() -> %p", result); Debug1("DTLSv1_server_method() -> %p", result);
return result; return result;
} }
#endif
SSL_CTX *sycSSL_CTX_new(const SSL_METHOD *method) { SSL_CTX *sycSSL_CTX_new(const SSL_METHOD *method) {
SSL_CTX *result; SSL_CTX *result;