Attachment #162699 for bug #204184

View | Details | Raw Unified | Return to bug 204184
Collapse All | Expand All




		src/Mayaqua/Cfg.c \
		src/Mayaqua/Cfg.h \
		src/Mayaqua/Kernel.c \
		src/Mayaqua/Network.c \
		src/Mayaqua/Table.h \
		src/Mayaqua/Unix.c


ONLY_FOR_ARCHS=	i386 amd64

USE_OPENSSL=	yes
USES=		dos2unix gmake iconv:translit iconv:wchar_t ncurses readline
USE_RC_SUBR=	softether_bridge softether_client softether_server
SUB_FILES=	vpncmd


MAKE_JOBS_UNSAFE=	yes
.endif

.if ${OSVERSION} >= 1000000
BUILD_DEPENDS=		libiconv>=1.14:${PORTSDIR}/converters/libiconv
.endif

# skip configure at all and copy the corresponding Makefile in place
post-extract:
.if ${ARCH} != "amd64"




--- src/Mayaqua/Network.c.orig  2015-07-26 08:38:18.000000000 +0200
+++ src/Mayaqua/Network.c       2015-10-02 16:12:32.566180580 +0200
@@ -12920,7 +12920,16 @@ bool StartSSLEx(SOCK *sock, X *x, K *pri
                {
                        if (client_tls == false)
                        {
+#ifndef OPENSSL_NO_SSL3
                                SSL_CTX_set_ssl_version(ssl_ctx, SSLv3_method());
+#else
+                               SSL_CTX_set_ssl_version(ssl_ctx, SSLv23_method());
+                               SSL_CTX_set_options(ssl_ctx, SSL_OP_NO_SSLv2 | SSL_OP_NO_TLSv1
+#ifdef SSL_OP_NO_TLSv1_2
+                               | SSL_OP_NO_TLSv1_1 | SSL_OP_NO_TLSv1_2
+#endif
+                               );
+#endif
                        }
                        else
                        {

Return to bug 204184

Lines 25-30 Link Here

(-)softether/Makefile (-5 / +2 lines)
25	src/Mayaqua/Cfg.c \	25	src/Mayaqua/Cfg.c \
26	src/Mayaqua/Cfg.h \	26	src/Mayaqua/Cfg.h \
27	src/Mayaqua/Kernel.c \	27	src/Mayaqua/Kernel.c \
		28	src/Mayaqua/Network.c \
28	src/Mayaqua/Table.h \	29	src/Mayaqua/Table.h \
29	src/Mayaqua/Unix.c	30	src/Mayaqua/Unix.c
30		31
Lines 33-39 Link Here
33	ONLY_FOR_ARCHS= i386 amd64	34	ONLY_FOR_ARCHS= i386 amd64
34		35
35	USE_OPENSSL= yes	36	USE_OPENSSL= yes
36	USES= dos2unix gmake iconv ncurses readline	37	USES= dos2unix gmake iconv:translit iconv:wchar_t ncurses readline
37	USE_RC_SUBR= softether_bridge softether_client softether_server	38	USE_RC_SUBR= softether_bridge softether_client softether_server
38	SUB_FILES= vpncmd	39	SUB_FILES= vpncmd
39		40
Lines 50-59 Link Here
50	MAKE_JOBS_UNSAFE= yes	51	MAKE_JOBS_UNSAFE= yes
51	.endif	52	.endif
52		53
53	.if ${OSVERSION} >= 1000000
54	BUILD_DEPENDS= libiconv>=1.14:${PORTSDIR}/converters/libiconv
55	.endif
56
57	# skip configure at all and copy the corresponding Makefile in place	54	# skip configure at all and copy the corresponding Makefile in place
58	post-extract:	55	post-extract:
59	.if ${ARCH} != "amd64"	56	.if ${ARCH} != "amd64"

Line 0 Link Here

(-)softether/files/patch-src__Mayaqua__Network.c (+19 lines)
	1	--- src/Mayaqua/Network.c.orig 2015-07-26 08:38:18.000000000 +0200
	2	+++ src/Mayaqua/Network.c 2015-10-02 16:12:32.566180580 +0200
	3	@@ -12920,7 +12920,16 @@ bool StartSSLEx(SOCK sock, X x, K *pri
	4	{
	5	if (client_tls == false)
	6	{
	7	+#ifndef OPENSSL_NO_SSL3
	8	SSL_CTX_set_ssl_version(ssl_ctx, SSLv3_method());
	9	+#else
	10	+ SSL_CTX_set_ssl_version(ssl_ctx, SSLv23_method());
	11	+ SSL_CTX_set_options(ssl_ctx, SSL_OP_NO_SSLv2 \| SSL_OP_NO_TLSv1
	12	+#ifdef SSL_OP_NO_TLSv1_2
	13	+ \| SSL_OP_NO_TLSv1_1 \| SSL_OP_NO_TLSv1_2
	14	+#endif
	15	+ );
	16	+#endif
	17	}
	18	else
	19	{