Attachment #114966 for bug #156711

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




# $FreeBSD: ports/security/strongswan/Makefile,v 1.2 2010/12/04 07:33:31 ade Exp $

PORTNAME=	strongswan
PORTVERSION=	4.5.1
CATEGORIES=	security
MASTER_SITES=	http://download.strongswan.org/ \
		http://download2.strongswan.org/

COMMENT=	Open Source IPSec-based VPN solution

LIB_DEPENDS=	vstr:${PORTSDIR}/devel/vstr \
				gmp.10:${PORTSDIR}/math/gmp

USE_BZIP2=	yes


CONFIGURE_ARGS=	--enable-kernel-pfkey \
		--enable-kernel-pfroute  \
		--disable-kernel-netlink  \
		--enable-vstr  \
		--disable-tools  \
		--disable-scripts  \
		--disable-pluto  \
		--with-group=wheel  \
        --enable-gmp \
        --enable-vstr \
		--with-lib-prefix=${PREFIX}

MAN3=		anyaddr.3 atoaddr.3 atoasr.3 atoul.3 goodmask.3 \
		initaddr.3 initsubnet.3 portof.3 rangetosubnet.3 \
		sameaddr.3 subnetof.3 ttoaddr.3 ttodata.3 \
		ttosa.3 ttoul.3
MAN5=		ipsec.conf.5 ipsec.secrets.5 strongswan.conf.5
MAN8=		ipsec.8 _updown.8 _updown_espmark.8

.include <bsd.port.pre.mk>

.if ${OSVERSION} < 800000
IGNORE=		Requires at least FreeBSD 8.X
.endif

.include <bsd.port.post.mk>

Lines 1-3 Link Here

(-)strongswan/distinfo (-3 / +2 lines)
1	MD5 (strongswan-4.4.0.tar.bz2) = bfb0f1c8ef1344e1ae8157bdde060fed	1	SHA256 (strongswan-4.5.1.tar.bz2) = 252d7369d94aa2d79e6fad078853b07ca897ea811ab1e1a2b008bcec0d1e758a
2	SHA256 (strongswan-4.4.0.tar.bz2) = df40d9daf963ce4f4bef4177ed02d68c083521b307f52bebb1872c2ded4b2718	2	SIZE (strongswan-4.5.1.tar.bz2) = 3254264
3	SIZE (strongswan-4.4.0.tar.bz2) = 2863754




--- srcold/libcharon/bus/listeners/sys_logger.c	2011-03-10 20:50:01.000000000 +0200
+++ src/libcharon/bus/listeners/sys_logger.c	2011-03-10 20:53:59.000000000 +0200
@@ -79,13 +79,15 @@
 		/* do a syslog with every line */
 		while (current)
 		{
+			char tmp[8192];
 			next = strchr(current, '\n');
 			if (next)
 			{
 				*(next++) = '\0';
 			}
-			syslog(this->facility|LOG_INFO, "%.2d[%N]%s %s\n",
+			snprintf(tmp, 8192, "%.2d[%N]%s %s\n",
 				   thread, debug_names, group, namestr, current);
+			syslog(this->facility|LOG_INFO, tmp);
 			current = next;
 		}
 	}




diff -u -r srcold/libcharon/plugins/kernel_pfkey/kernel_pfkey_ipsec.c src/libcharon/plugins/kernel_pfkey/kernel_pfkey_ipsec.c
--- srcold/libcharon/plugins/kernel_pfkey/kernel_pfkey_ipsec.c	2010-03-19 17:56:54.000000000 +0200
+++ src/libcharon/plugins/kernel_pfkey/kernel_pfkey_ipsec.c	2010-05-28 15:58:12.000000000 +0200
@@ -600,17 +600,43 @@
 }
 
 /**
- * add a host behind a sadb_address extension
+ * Copy a host_t as sockaddr_t to the given memory location. Ports are
+ * reset to zero as per RFC 2367.
+ * @returns		the number of bytes copied
  */
-static void host2ext(host_t *host, struct sadb_address *ext)
+static size_t hostcpy(void *dest, host_t *host)
 {
-	sockaddr_t *host_addr = host->get_sockaddr(host);
+	sockaddr_t *addr = host->get_sockaddr(host), *dest_addr = dest;
 	socklen_t *len = host->get_sockaddr_len(host);
+	memcpy(dest, addr, *len);
 #ifdef HAVE_STRUCT_SOCKADDR_SA_LEN
-	host_addr->sa_len = *len;
+	dest_addr->sa_len = *len;
 #endif
-	memcpy((char*)(ext + 1), host_addr, *len);
-	ext->sadb_address_len = PFKEY_LEN(sizeof(*ext) + *len);
+	switch (dest_addr->sa_family)
+	{
+		case AF_INET:
+		{
+			struct sockaddr_in *sin = dest;
+			sin->sin_port = 0;
+			break;
+		}
+		case AF_INET6:
+		{
+			struct sockaddr_in6 *sin6 = dest;
+			sin6->sin6_port = 0;
+			break;
+		}
+	}
+	return *len;
+}
+
+/**
+ * add a host behind an sadb_address extension
+ */
+static void host2ext(host_t *host, struct sadb_address *ext)
+{
+	size_t len = hostcpy(ext + 1, host);
+	ext->sadb_address_len = PFKEY_LEN(sizeof(*ext) + len);
 }
 
 /**
@@ -1019,6 +1045,7 @@
 }
 #endif /*SADB_X_MIGRATE*/
 
+#ifndef __FreeBSD__
 #ifdef HAVE_NATT
 /**
  * Process a SADB_X_NAT_T_NEW_MAPPING message from the kernel
@@ -1076,6 +1103,7 @@
 	}
 }
 #endif /*HAVE_NATT*/
+#endif /*__FreeBSD__*/
 
 /**
  * Receives events from kernel
@@ -1137,11 +1165,13 @@
 			process_migrate(this, msg);
 			break;
 #endif /*SADB_X_MIGRATE*/
+#ifndef __FreeBSD__
 #ifdef HAVE_NATT
 		case SADB_X_NAT_T_NEW_MAPPING:
 			process_mapping(this, msg);
 			break;
 #endif /*HAVE_NATT*/
+#endif /*__FreeBSD__*/
 		default:
 			break;
 	}
@@ -1679,14 +1709,10 @@
 	req->sadb_x_ipsecrequest_level = IPSEC_LEVEL_UNIQUE;
 	if (mode == MODE_TUNNEL)
 	{
-		sockaddr_t *sa;
-		socklen_t sl;
-		sa = src->get_sockaddr(src);
-		sl = *src->get_sockaddr_len(src);
-		memcpy(req + 1, sa, sl);
-		sa = dst->get_sockaddr(dst);
-		memcpy((u_int8_t*)(req + 1) + sl, sa, sl);
-		req->sadb_x_ipsecrequest_len += sl * 2;
+		len = hostcpy(req + 1, src);
+		req->sadb_x_ipsecrequest_len += len;
+		len = hostcpy((char*)(req + 1) + len, dst);
+		req->sadb_x_ipsecrequest_len += len;
 	}
 
 	pol->sadb_x_policy_len += PFKEY_LEN(req->sadb_x_ipsecrequest_len);

Return to bug 156711

Lines 5-11 Link Here

(-)strongswan/Makefile (-9 / +10 lines)
5	# $FreeBSD: ports/security/strongswan/Makefile,v 1.2 2010/12/04 07:33:31 ade Exp $	5	# $FreeBSD: ports/security/strongswan/Makefile,v 1.2 2010/12/04 07:33:31 ade Exp $
6		6
7	PORTNAME= strongswan	7	PORTNAME= strongswan
8	PORTVERSION= 4.4.0	8	PORTVERSION= 4.5.1
9	CATEGORIES= security	9	CATEGORIES= security
10	MASTER_SITES= http://download.strongswan.org/ \	10	MASTER_SITES= http://download.strongswan.org/ \
11	http://download2.strongswan.org/	11	http://download2.strongswan.org/
Lines 14-20 Link Here
14	COMMENT= Open Source IPSec-based VPN solution	14	COMMENT= Open Source IPSec-based VPN solution
15		15
16	LIB_DEPENDS= vstr:${PORTSDIR}/devel/vstr \	16	LIB_DEPENDS= vstr:${PORTSDIR}/devel/vstr \
17	gmp.10:${PORTSDIR}/math/gmp	17	gmp.10:${PORTSDIR}/math/gmp
18		18
19	USE_BZIP2= yes	19	USE_BZIP2= yes
20		20
Lines 24-47 Link Here
24	CONFIGURE_ARGS= --enable-kernel-pfkey \	24	CONFIGURE_ARGS= --enable-kernel-pfkey \
25	--enable-kernel-pfroute \	25	--enable-kernel-pfroute \
26	--disable-kernel-netlink \	26	--disable-kernel-netlink \
27	--enable-vstr \
28	--disable-tools \	27	--disable-tools \
29	--disable-scripts \	28	--disable-scripts \
30	--disable-pluto \	29	--disable-pluto \
31	--with-group=wheel \	30	--with-group=wheel \
		31	--enable-gmp \
		32	--enable-vstr \
32	--with-lib-prefix=${PREFIX}	33	--with-lib-prefix=${PREFIX}
33		34
34	MAN3= anyaddr.3 atoaddr.3 atoasr.3 atosa.3 atoul.3 goodmask.3 \	35	MAN3= anyaddr.3 atoaddr.3 atoasr.3 atoul.3 goodmask.3 \
35	initaddr.3 initsubnet.3 keyblobtoid.3 portof.3 prng.3 \	36	initaddr.3 initsubnet.3 portof.3 rangetosubnet.3 \
36	rangetosubnet.3 sameaddr.3 subnetof.3 ttoaddr.3 ttodata.3 \	37	sameaddr.3 subnetof.3 ttoaddr.3 ttodata.3 \
37	ttosa.3 ttoul.3	38	ttosa.3 ttoul.3
38	MAN5= ipsec.conf.5	39	MAN5= ipsec.conf.5 ipsec.secrets.5 strongswan.conf.5
39	MAN8= ipsec.8 starter.8 _copyright.8 _updown.8 _updown_espmark.8	40	MAN8= ipsec.8 _updown.8 _updown_espmark.8
40		41
41	.include <bsd.port.pre.mk>	42	.include <bsd.port.pre.mk>
42		43
43	.if ${OSVERSION} < 800000	44	.if ${OSVERSION} < 800000
44	IGNORE= requires at least FreeBSD 8.X	45	IGNORE= Requires at least FreeBSD 8.X
45	.endif	46	.endif
46		47
47	.include <bsd.port.post.mk>	48	.include <bsd.port.post.mk>

Line 0 Link Here

(-)strongswan/files/patch-src__libcharon__bus__listeners__sys_logger.c (+19 lines)
	1	--- srcold/libcharon/bus/listeners/sys_logger.c 2011-03-10 20:50:01.000000000 +0200
	2	+++ src/libcharon/bus/listeners/sys_logger.c 2011-03-10 20:53:59.000000000 +0200
	3	@@ -79,13 +79,15 @@
	4	/* do a syslog with every line */
	5	while (current)
	6	{
	7	+ char tmp[8192];
	8	next = strchr(current, '\n');
	9	if (next)
	10	{
	11	*(next++) = '\0';
	12	}
	13	- syslog(this->facility\|LOG_INFO, "%.2d[%N]%s %s\n",
	14	+ snprintf(tmp, 8192, "%.2d[%N]%s %s\n",
	15	thread, debug_names, group, namestr, current);
	16	+ syslog(this->facility\|LOG_INFO, tmp);
	17	current = next;
	18	}
	19	}

Lines 1-102 Link Here

(-)strongswan/files/patch-src__libcharon__plugins__kernel_pfkey__kernel_pfkey_ipsec.c (-102 lines)
1	diff -u -r srcold/libcharon/plugins/kernel_pfkey/kernel_pfkey_ipsec.c src/libcharon/plugins/kernel_pfkey/kernel_pfkey_ipsec.c
2	--- srcold/libcharon/plugins/kernel_pfkey/kernel_pfkey_ipsec.c 2010-03-19 17:56:54.000000000 +0200
3	+++ src/libcharon/plugins/kernel_pfkey/kernel_pfkey_ipsec.c 2010-05-28 15:58:12.000000000 +0200
4	@@ -600,17 +600,43 @@
5	}
6
7	/**
8	- * add a host behind a sadb_address extension
9	+ * Copy a host_t as sockaddr_t to the given memory location. Ports are
10	+ * reset to zero as per RFC 2367.
11	+ * @returns the number of bytes copied
12	*/
13	-static void host2ext(host_t host, struct sadb_address ext)
14	+static size_t hostcpy(void dest, host_t host)
15	{
16	- sockaddr_t *host_addr = host->get_sockaddr(host);
17	+ sockaddr_t addr = host->get_sockaddr(host), dest_addr = dest;
18	socklen_t *len = host->get_sockaddr_len(host);
19	+ memcpy(dest, addr, *len);
20	#ifdef HAVE_STRUCT_SOCKADDR_SA_LEN
21	- host_addr->sa_len = *len;
22	+ dest_addr->sa_len = *len;
23	#endif
24	- memcpy((char)(ext + 1), host_addr, len);
25	- ext->sadb_address_len = PFKEY_LEN(sizeof(ext) + len);
26	+ switch (dest_addr->sa_family)
27	+ {
28	+ case AF_INET:
29	+ {
30	+ struct sockaddr_in *sin = dest;
31	+ sin->sin_port = 0;
32	+ break;
33	+ }
34	+ case AF_INET6:
35	+ {
36	+ struct sockaddr_in6 *sin6 = dest;
37	+ sin6->sin6_port = 0;
38	+ break;
39	+ }
40	+ }
41	+ return *len;
42	+}
43	+
44	+/**
45	+ * add a host behind an sadb_address extension
46	+ */
47	+static void host2ext(host_t host, struct sadb_address ext)
48	+{
49	+ size_t len = hostcpy(ext + 1, host);
50	+ ext->sadb_address_len = PFKEY_LEN(sizeof(*ext) + len);
51	}
52
53	/**
54	@@ -1019,6 +1045,7 @@
55	}
56	#endif /SADB_X_MIGRATE/
57
58	+#ifndef __FreeBSD__
59	#ifdef HAVE_NATT
60	/**
61	* Process a SADB_X_NAT_T_NEW_MAPPING message from the kernel
62	@@ -1076,6 +1103,7 @@
63	}
64	}
65	#endif /HAVE_NATT/
66	+#endif /__FreeBSD__/
67
68	/**
69	* Receives events from kernel
70	@@ -1137,11 +1165,13 @@
71	process_migrate(this, msg);
72	break;
73	#endif /SADB_X_MIGRATE/
74	+#ifndef __FreeBSD__
75	#ifdef HAVE_NATT
76	case SADB_X_NAT_T_NEW_MAPPING:
77	process_mapping(this, msg);
78	break;
79	#endif /HAVE_NATT/
80	+#endif /__FreeBSD__/
81	default:
82	break;
83	}
84	@@ -1679,14 +1709,10 @@
85	req->sadb_x_ipsecrequest_level = IPSEC_LEVEL_UNIQUE;
86	if (mode == MODE_TUNNEL)
87	{
88	- sockaddr_t *sa;
89	- socklen_t sl;
90	- sa = src->get_sockaddr(src);
91	- sl = *src->get_sockaddr_len(src);
92	- memcpy(req + 1, sa, sl);
93	- sa = dst->get_sockaddr(dst);
94	- memcpy((u_int8_t*)(req + 1) + sl, sa, sl);
95	- req->sadb_x_ipsecrequest_len += sl * 2;
96	+ len = hostcpy(req + 1, src);
97	+ req->sadb_x_ipsecrequest_len += len;
98	+ len = hostcpy((char*)(req + 1) + len, dst);
99	+ req->sadb_x_ipsecrequest_len += len;
100	}
101
102	pol->sadb_x_policy_len += PFKEY_LEN(req->sadb_x_ipsecrequest_len);

Lines 25-30 Link Here

(-)strongswan/pkg-plist (+6 lines)
25	libexec/ipsec/plugins/libstrongswan-des.a	25	libexec/ipsec/plugins/libstrongswan-des.a
26	libexec/ipsec/plugins/libstrongswan-des.la	26	libexec/ipsec/plugins/libstrongswan-des.la
27	libexec/ipsec/plugins/libstrongswan-des.so	27	libexec/ipsec/plugins/libstrongswan-des.so
		28	libexec/ipsec/plugins/libstrongswan-constraints.a
		29	libexec/ipsec/plugins/libstrongswan-constraints.la
		30	libexec/ipsec/plugins/libstrongswan-constraints.so
28	libexec/ipsec/plugins/libstrongswan-dnskey.a	31	libexec/ipsec/plugins/libstrongswan-dnskey.a
29	libexec/ipsec/plugins/libstrongswan-dnskey.la	32	libexec/ipsec/plugins/libstrongswan-dnskey.la
30	libexec/ipsec/plugins/libstrongswan-dnskey.so	33	libexec/ipsec/plugins/libstrongswan-dnskey.so
Lines 70-75 Link Here
70	libexec/ipsec/plugins/libstrongswan-sha2.a	73	libexec/ipsec/plugins/libstrongswan-sha2.a
71	libexec/ipsec/plugins/libstrongswan-sha2.la	74	libexec/ipsec/plugins/libstrongswan-sha2.la
72	libexec/ipsec/plugins/libstrongswan-sha2.so	75	libexec/ipsec/plugins/libstrongswan-sha2.so
		76	libexec/ipsec/plugins/libstrongswan-revocation.a
		77	libexec/ipsec/plugins/libstrongswan-revocation.la
		78	libexec/ipsec/plugins/libstrongswan-revocation.so
73	libexec/ipsec/plugins/libstrongswan-socket-default.a	79	libexec/ipsec/plugins/libstrongswan-socket-default.a
74	libexec/ipsec/plugins/libstrongswan-socket-default.la	80	libexec/ipsec/plugins/libstrongswan-socket-default.la
75	libexec/ipsec/plugins/libstrongswan-socket-default.so	81	libexec/ipsec/plugins/libstrongswan-socket-default.so