Attachment #77366 for bug #111430

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

Lines 910-916 Link Here

(-)x509.c (-1 / +7 lines)
910	X509_STORE_CTX_init(&csc, x509_cas, cert, NULL);	910	X509_STORE_CTX_init(&csc, x509_cas, cert, NULL);
911	#if OPENSSL_VERSION_NUMBER >= 0x00907000L	911	#if OPENSSL_VERSION_NUMBER >= 0x00907000L
912	/* XXX See comment in x509_read_crls_from_dir. */	912	/* XXX See comment in x509_read_crls_from_dir. */
913	if (x509_cas->flags & X509_V_FLAG_CRL_CHECK) {	913	if (
		914	#if OPENSSL_VERSION_NUMBER >= 0x00908020L
		915	x509_cas->param->flags
		916	#else
		917	x509_cas->flags
		918	#endif
		919	& X509_V_FLAG_CRL_CHECK) {
914	X509_STORE_CTX_set_flags(&csc, X509_V_FLAG_CRL_CHECK);	920	X509_STORE_CTX_set_flags(&csc, X509_V_FLAG_CRL_CHECK);
915	X509_STORE_CTX_set_flags(&csc, X509_V_FLAG_CRL_CHECK_ALL);	921	X509_STORE_CTX_set_flags(&csc, X509_V_FLAG_CRL_CHECK_ALL);
916	}	922	}




LIBSYSDEPDIR=	${.CURDIR}/sysdep/common/libsysdep
.endif

LDADD+=		${LIBSYSDEPDIR}/libsysdep.a -lipsec -L/usr/local/lib
DPADD+=		${LIBGMP} ${LIBSYSDEPDIR}/libsysdep.a

CFLAGS+=	-DHAVE_GETIFADDRS -DHAVE_PCAP \
		-I${.CURDIR}/sysdep/common -I/usr/include -I${OPENSSLINC}/openssl \
		-I/usr/local/include

IPSEC_SRCS=	pf_key_v2.c
IPSEC_CFLAGS=	-DUSE_PF_KEY_V2

GENERATED+=	sysdep-target
sysdep-target:
		cd ${.CURDIR}/sysdep/common/libsysdep; ${MAKE} ${.MAKEFLAGS}

# Kludge around much strange behaviour in /usr/share/mk/bsd.*/mk, don't build certpatch
SUBDIR=		

.if make(clean)
SUBDIR+=	sysdep/common/libsysdep




		goto cleanup;
	addr->sadb_address_exttype = SADB_EXT_ADDRESS_SRC;
	addr->sadb_address_len = len / PF_KEY_V2_CHUNK;
#if defined(LINUX_IPSEC) || defined (__FreeBSD__) 
	addr->sadb_address_proto = tproto;
#else
	addr->sadb_address_proto = IPSEC_ULPROTO_ANY;
#endif
	addr->sadb_address_reserved = 0;
#if defined(LINUX_IPSEC) || defined (__FreeBSD__) 
	pf_key_v2_setup_sockaddr(addr + 1, laddr, 0, sport, 0);
#else
	pf_key_v2_setup_sockaddr(addr + 1, laddr, 0, IPSEC_PORT_ANY, 0);

		goto cleanup;
	addr->sadb_address_exttype = SADB_EXT_ADDRESS_DST;
	addr->sadb_address_len = len / PF_KEY_V2_CHUNK;
#if defined(LINUX_IPSEC) || defined (__FreeBSD__) 
	addr->sadb_address_proto = tproto;
#else
	addr->sadb_address_proto = IPSEC_ULPROTO_ANY;
#endif
	addr->sadb_address_reserved = 0;
#if defined(LINUX_IPSEC) || defined (__FreeBSD__) 
	pf_key_v2_setup_sockaddr(addr + 1, raddr, 0, dport, 0);
#else
	pf_key_v2_setup_sockaddr(addr + 1, raddr, 0, IPSEC_PORT_ANY, 0);

Return to bug 111430

Lines 40-51 Link Here

(-)sysdep/freebsd/Makefile.sysdep (-7 / +4 lines)
40	LIBSYSDEPDIR= ${.CURDIR}/sysdep/common/libsysdep	40	LIBSYSDEPDIR= ${.CURDIR}/sysdep/common/libsysdep
41	.endif	41	.endif
42		42
43	LDADD+= -lgmp ${LIBSYSDEPDIR}/libsysdep.a -lipsec -L/usr/local/lib	43	LDADD+= ${LIBSYSDEPDIR}/libsysdep.a -lipsec -L/usr/local/lib
44	DPADD+= ${LIBGMP} ${LIBSYSDEPDIR}/libsysdep.a	44	DPADD+= ${LIBGMP} ${LIBSYSDEPDIR}/libsysdep.a
45		45
46	CFLAGS+= -DHAVE_GETIFADDRS \	46	CFLAGS+= -DHAVE_GETIFADDRS -DHAVE_PCAP \
47	-I${.CURDIR}/sysdep/common -I/usr/include \	47	-I${.CURDIR}/sysdep/common -I/usr/include -I${OPENSSLINC}/openssl \
48	-I/usr/local/include -I/usr/local/include/openssl	48	-I/usr/local/include
49		49
50	IPSEC_SRCS= pf_key_v2.c	50	IPSEC_SRCS= pf_key_v2.c
51	IPSEC_CFLAGS= -DUSE_PF_KEY_V2	51	IPSEC_CFLAGS= -DUSE_PF_KEY_V2
Lines 58-66 Link Here
58	GENERATED+= sysdep-target	58	GENERATED+= sysdep-target
59	sysdep-target:	59	sysdep-target:
60	cd ${.CURDIR}/sysdep/common/libsysdep; ${MAKE} ${.MAKEFLAGS}	60	cd ${.CURDIR}/sysdep/common/libsysdep; ${MAKE} ${.MAKEFLAGS}
61
62	# Kludge around much strange behaviour in /usr/share/mk/bsd.*/mk, don't build certpatch
63	SUBDIR=
64		61
65	.if make(clean)	62	.if make(clean)
66	SUBDIR+= sysdep/common/libsysdep	63	SUBDIR+= sysdep/common/libsysdep

Lines 2204-2216 Link Here

(-)pf_key_v2.c (-4 / +4 lines)
2204	goto cleanup;	2204	goto cleanup;
2205	addr->sadb_address_exttype = SADB_EXT_ADDRESS_SRC;	2205	addr->sadb_address_exttype = SADB_EXT_ADDRESS_SRC;
2206	addr->sadb_address_len = len / PF_KEY_V2_CHUNK;	2206	addr->sadb_address_len = len / PF_KEY_V2_CHUNK;
2207	#ifdef LINUX_IPSEC	2207	#if defined(LINUX_IPSEC) \|\| defined (__FreeBSD__)
2208	addr->sadb_address_proto = tproto;	2208	addr->sadb_address_proto = tproto;
2209	#else	2209	#else
2210	addr->sadb_address_proto = IPSEC_ULPROTO_ANY;	2210	addr->sadb_address_proto = IPSEC_ULPROTO_ANY;
2211	#endif	2211	#endif
2212	addr->sadb_address_reserved = 0;	2212	addr->sadb_address_reserved = 0;
2213	#ifdef LINUX_IPSEC	2213	#if defined(LINUX_IPSEC) \|\| defined (__FreeBSD__)
2214	pf_key_v2_setup_sockaddr(addr + 1, laddr, 0, sport, 0);	2214	pf_key_v2_setup_sockaddr(addr + 1, laddr, 0, sport, 0);
2215	#else	2215	#else
2216	pf_key_v2_setup_sockaddr(addr + 1, laddr, 0, IPSEC_PORT_ANY, 0);	2216	pf_key_v2_setup_sockaddr(addr + 1, laddr, 0, IPSEC_PORT_ANY, 0);
Lines 2238-2250 Link Here
2238	goto cleanup;	2238	goto cleanup;
2239	addr->sadb_address_exttype = SADB_EXT_ADDRESS_DST;	2239	addr->sadb_address_exttype = SADB_EXT_ADDRESS_DST;
2240	addr->sadb_address_len = len / PF_KEY_V2_CHUNK;	2240	addr->sadb_address_len = len / PF_KEY_V2_CHUNK;
2241	#ifdef LINUX_IPSEC	2241	#if defined(LINUX_IPSEC) \|\| defined (__FreeBSD__)
2242	addr->sadb_address_proto = tproto;	2242	addr->sadb_address_proto = tproto;
2243	#else	2243	#else
2244	addr->sadb_address_proto = IPSEC_ULPROTO_ANY;	2244	addr->sadb_address_proto = IPSEC_ULPROTO_ANY;
2245	#endif	2245	#endif
2246	addr->sadb_address_reserved = 0;	2246	addr->sadb_address_reserved = 0;
2247	#ifdef LINUX_IPSEC	2247	#if defined(LINUX_IPSEC) \|\| defined (__FreeBSD__)
2248	pf_key_v2_setup_sockaddr(addr + 1, raddr, 0, dport, 0);	2248	pf_key_v2_setup_sockaddr(addr + 1, raddr, 0, dport, 0);
2249	#else	2249	#else
2250	pf_key_v2_setup_sockaddr(addr + 1, raddr, 0, IPSEC_PORT_ANY, 0);	2250	pf_key_v2_setup_sockaddr(addr + 1, raddr, 0, IPSEC_PORT_ANY, 0);