sstp-client: updated to 1.0.12

softethervpn: updated to 4.25-9656

Signed-off-by: Federico Di Marco <fededim@gmail.com>
This commit is contained in:
Federico Di Marco
2018-03-04 18:50:46 +01:00
parent 7049eb1746
commit d4d9d74082
3 changed files with 15 additions and 35 deletions
+8 -28
View File
@@ -1,33 +1,13 @@
Index: v4.22-9634/src/Mayaqua/Network.c
Index: v4.25-9656/src/Mayaqua/Network.c
===================================================================
--- v4.22-9634.orig/src/Mayaqua/Network.c
+++ v4.22-9634/src/Mayaqua/Network.c
@@ -13013,20 +13013,28 @@ bool StartSSLEx(SOCK *sock, X *x, K *pri
}
else
--- v4.25-9656.orig/src/Mayaqua/Network.c
+++ v4.25-9656/src/Mayaqua/Network.c
@@ -13025,7 +13025,7 @@ bool StartSSLEx(SOCK *sock, X *x, K *pri
{
+#ifndef SSL_OP_NO_SSLv3
if (client_tls == false)
{
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#ifndef SSL_OP_NO_SSLv3
SSL_CTX_set_ssl_version(ssl_ctx, SSLv3_method());
}
else
{
+#endif // SSL_OP_NO_SSLv3
SSL_CTX_set_ssl_version(ssl_ctx, SSLv23_client_method());
+#ifndef SSL_OP_NO_SSLv3
}
+#endif // SSL_OP_NO_SSLv3
}
sock->ssl = SSL_new(ssl_ctx);
SSL_set_fd(sock->ssl, (int)sock->socket);
#ifdef SSL_CTRL_SET_TLSEXT_HOSTNAME
+#ifndef SSL_OP_NO_SSLv3
if (sock->ServerMode == false && client_tls)
+#else
+ if (sock->ServerMode == false)
+#endif // SSL_OP_NO_SSLv3
{
if (IsEmptyStr(sni_hostname) == false)
{
#else
SSL_CTX_set_ssl_version(ssl_ctx, SSLv23_method());