cubixle/packages
1
0
Fork 0
mirror of https://github.com/novatiq/packages.git synced 2026-04-30 07:28:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

softethervpn: added new package 4.21-9613

Browse Source 
- based on the work done by el1n with his authorization (https://github.com/el1n/OpenWRT-package-softether)
- updated softethervpn to latest version
- introduced necessary patches for lede compatibility (nossl3)

Signed-Off-by: Federico Di Marco <fededim@gmail.com>
This commit is contained in:
Rupan
2016-11-09 03:36:22 +01:00
parent a554a1dd30
commit 75fcb14dc0
8 changed files with 248 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
net/softethervpn/patches/103-noeucjp.patch
+29
View File
@@ -0,0 +1,29 @@
--- a/src/Mayaqua/Internat.c
+++ b/src/Mayaqua/Internat.c
@@ -123,7 +123,7 @@
#include <Mayaqua/Mayaqua.h>
extern LOCK *token_lock;
-static char charset[MAX_SIZE] = "EUCJP";
+static char charset[MAX_SIZE] = "utf-8";
static LOCK *iconv_lock = NULL;
void *iconv_cache_wide_to_str = 0;
void *iconv_cache_str_to_wide = 0;
@@ -938,7 +938,7 @@ void InitInternational()
#ifdef UNIX_MACOS
StrCpy(charset, sizeof(charset), "utf-8");
#else // UNIX_MACOS
- StrCpy(charset, sizeof(charset), "EUCJP");
+ StrCpy(charset, sizeof(charset), "utf-8");
#endif // UNIX_MACOS
d = IconvWideToStrInternal();
if (d == (void *)-1)
@@ -1198,7 +1198,7 @@ void GetCurrentCharSet(char *name, UINT
}
else
{
- StrCpy(name, size, "eucJP");
+ StrCpy(name, size, "utf-8");
}
}
FreeToken(t);
net/softethervpn/patches/105-nosslv3.patch
+50
View File
@@ -0,0 +1,50 @@
--- a/src/Mayaqua/Network.c
+++ b/src/Mayaqua/Network.c
@@ -12966,35 +12966,46 @@ bool StartSSLEx(SOCK *sock, X *x, K *pri
{
if (sock->ServerMode)
{
+#ifdef SSL3_SUPPORT
if (sock->AcceptOnlyTls == false)
{
SSL_CTX_set_ssl_version(ssl_ctx, SSLv23_method());
}
else
{
+#endif
SSL_CTX_set_ssl_version(ssl_ctx, TLSv1_method());
+#ifdef SSL3_SUPPORT
}
-
+#endif
Unlock(openssl_lock);
AddChainSslCertOnDirectory(ssl_ctx);
Lock(openssl_lock);
}
else
{
+#ifdef SSL3_SUPPORT
if (client_tls == false)
{
SSL_CTX_set_ssl_version(ssl_ctx, SSLv3_method());
}
else
{
+#endif
SSL_CTX_set_ssl_version(ssl_ctx, TLSv1_client_method());
+#ifdef SSL3_SUPPORT
}
+#endif
}
sock->ssl = SSL_new(ssl_ctx);
SSL_set_fd(sock->ssl, (int)sock->socket);
#ifdef SSL_CTRL_SET_TLSEXT_HOSTNAME
+# ifdef SSL3_SUPPORT
if (sock->ServerMode == false && client_tls)
+# else
+ if (sock->ServerMode == false)
+#endif
{
if (IsEmptyStr(sni_hostname) == false)
{