Attachment 77366 Details for Bug 111430 – file.diff

[patch] file.diff

file.diff (text/plain), 2.70 KB, created by Dan Lukes on 2007-04-09 23:50:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dan Lukes

Created: 2007-04-09 23:50:02 UTC

Size: 2.70 KB

patch

obsolete

>--- x509.c~	Mon Apr  9 23:38:38 2007
>+++ x509.c	Mon Apr  9 23:38:38 2007
>@@ -910,7 +910,13 @@
> 	X509_STORE_CTX_init(&csc, x509_cas, cert, NULL);
> #if OPENSSL_VERSION_NUMBER >= 0x00907000L
> 	/* XXX See comment in x509_read_crls_from_dir.  */
>-	if (x509_cas->flags & X509_V_FLAG_CRL_CHECK) {
>+	if (
>+#if OPENSSL_VERSION_NUMBER >= 0x00908020L
>+	    x509_cas->param->flags
>+#else
>+	    x509_cas->flags
>+#endif
>+	                    & X509_V_FLAG_CRL_CHECK) {
> 		X509_STORE_CTX_set_flags(&csc, X509_V_FLAG_CRL_CHECK);
> 		X509_STORE_CTX_set_flags(&csc, X509_V_FLAG_CRL_CHECK_ALL);
> 	}
>--- sysdep/freebsd/Makefile.sysdep.orig	Sat Jun 26 05:40:57 2004
>+++ sysdep/freebsd/Makefile.sysdep	Mon Apr  9 23:21:10 2007
>@@ -40,12 +40,12 @@
> LIBSYSDEPDIR=	${.CURDIR}/sysdep/common/libsysdep
> .endif
> 
>-LDADD+=		-lgmp ${LIBSYSDEPDIR}/libsysdep.a -lipsec -L/usr/local/lib
>+LDADD+=		${LIBSYSDEPDIR}/libsysdep.a -lipsec -L/usr/local/lib
> DPADD+=		${LIBGMP} ${LIBSYSDEPDIR}/libsysdep.a
> 
>-CFLAGS+=	-DHAVE_GETIFADDRS \
>-		-I${.CURDIR}/sysdep/common -I/usr/include \
>-		-I/usr/local/include -I/usr/local/include/openssl
>+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
>@@ -58,9 +58,6 @@
> 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
>--- pf_key_v2.c~	Mon Apr  9 23:10:51 2007
>+++ pf_key_v2.c	Mon Apr  9 23:10:51 2007
>@@ -2204,13 +2204,13 @@
> 		goto cleanup;
> 	addr->sadb_address_exttype = SADB_EXT_ADDRESS_SRC;
> 	addr->sadb_address_len = len / PF_KEY_V2_CHUNK;
>-#ifdef LINUX_IPSEC
>+#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;
>-#ifdef LINUX_IPSEC
>+#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);
>@@ -2238,13 +2238,13 @@
> 		goto cleanup;
> 	addr->sadb_address_exttype = SADB_EXT_ADDRESS_DST;
> 	addr->sadb_address_len = len / PF_KEY_V2_CHUNK;
>-#ifdef LINUX_IPSEC
>+#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;
>-#ifdef LINUX_IPSEC
>+#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);

Actions: View | Diff

Attachments on bug 111430: 77366