Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

more IPSEC header cleanup: don't install unneeded headers to userland, 

and remove some differences berween KAME and FAST_IPSEC
This commit is contained in:
drochner 2012-01-06 14:17:10 +00:00
parent bd08415c40
commit 47a381e15e
8 changed files with 26 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
distrib/sets/lists/comp/mi
View File

@ -1,4 +1,4 @@
# $NetBSD: mi,v 1.1722 2012/01/04 16:25:14 yamt Exp $
# $NetBSD: mi,v 1.1723 2012/01/06 14:17:10 drochner Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@ -1938,8 +1938,8 @@
./usr/include/netinet/tcpip.h comp-c-include
./usr/include/netinet/udp.h comp-c-include
./usr/include/netinet/udp_var.h comp-c-include
./usr/include/netinet6/ah.h comp-c-include
./usr/include/netinet6/esp.h comp-c-include
./usr/include/netinet6/ah.h comp-obsolete obsolete
./usr/include/netinet6/esp.h comp-obsolete obsolete
./usr/include/netinet6/icmp6.h comp-obsolete obsolete
./usr/include/netinet6/in6.h comp-c-include
./usr/include/netinet6/in6_gif.h comp-c-include
@ -1950,7 +1950,7 @@
./usr/include/netinet6/ip6_mroute.h comp-c-include
./usr/include/netinet6/ip6_var.h comp-c-include
./usr/include/netinet6/ip6protosw.h comp-c-include
./usr/include/netinet6/ipcomp.h comp-c-include
./usr/include/netinet6/ipcomp.h comp-obsolete obsolete
./usr/include/netinet6/ipsec.h comp-c-include
./usr/include/netinet6/mld6_var.h comp-c-include
./usr/include/netinet6/nd6.h comp-c-include
@ -1965,7 +1965,8 @@
./usr/include/netipsec/ipip_var.h comp-c-include
./usr/include/netipsec/ipsec.h comp-c-include
./usr/include/netipsec/ipsec_var.h comp-c-include
./usr/include/netipsec/keydb.h comp-c-include
./usr/include/netipsec/keydb.h comp-obsolete obsolete
./usr/include/netipsec/keysock.h comp-c-include
./usr/include/netisdn/i4b_cause.h comp-c-include
./usr/include/netisdn/i4b_debug.h comp-c-include
./usr/include/netisdn/i4b_ioctl.h comp-c-include
@ -2002,10 +2003,10 @@
./usr/include/netiso/tp_user.h comp-c-include
./usr/include/netiso/tp_var.h comp-c-include
./usr/include/netiso/tuba_table.h comp-obsolete obsolete
./usr/include/netkey/key.h comp-c-include
./usr/include/netkey/key_debug.h comp-c-include
./usr/include/netkey/key_var.h comp-c-include
./usr/include/netkey/keydb.h comp-c-include
./usr/include/netkey/key.h comp-obsolete obsolete
./usr/include/netkey/key_debug.h comp-obsolete obsolete
./usr/include/netkey/key_var.h comp-obsolete obsolete
./usr/include/netkey/keydb.h comp-obsolete obsolete
./usr/include/netkey/keysock.h comp-c-include
./usr/include/netkey/keyv2.h comp-obsolete obsolete
./usr/include/netmpls/mpls.h comp-c-include

4
sys/netinet6/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.7 2012/01/04 15:55:36 drochner Exp $
# $NetBSD: Makefile,v 1.8 2012/01/06 14:17:11 drochner Exp $
INCSDIR= /usr/include/netinet6
@ -7,7 +7,5 @@ INCS= in6.h in6_gif.h in6_ifattach.h in6_pcb.h \
mld6_var.h nd6.h pim6.h pim6_var.h \
raw_ip6.h udp6.h udp6_var.h
INCS+= ipsec.h
# XXX ah.h is used by ping6, rest unneeded
INCS+= ah.h esp.h ipcomp.h
.include <bsd.kinc.mk>

5
sys/netinet6/ipsec.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: ipsec.h,v 1.52 2012/01/04 15:55:36 drochner Exp $ */
/* $NetBSD: ipsec.h,v 1.53 2012/01/06 14:17:11 drochner Exp $ */
/* $KAME: ipsec.h,v 1.51 2001/08/05 04:52:58 itojun Exp $ */
/*
@ -42,10 +42,11 @@
#endif
#include <net/pfkeyv2.h>
#include <netkey/keydb.h>
#ifdef _KERNEL
#include <netkey/keydb.h>
/*
* Security Policy Index
* NOTE: Ensure to be same address family and upper layer protocol.

4
sys/netipsec/Makefile
View File

@ -1,9 +1,9 @@
# $NetBSD: Makefile,v 1.4 2012/01/04 16:09:43 drochner Exp $
# $NetBSD: Makefile,v 1.5 2012/01/06 14:17:11 drochner Exp $
INCSDIR= /usr/include/netipsec
INCS= ah_var.h esp_var.h ipcomp_var.h ipip_var.h ipsec_var.h \
keydb.h
keysock.h
INCS+= ipsec.h
.include <bsd.kinc.mk>

4
sys/netipsec/ipsec.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: ipsec.h,v 1.30 2012/01/04 15:55:36 drochner Exp $ */
/* $NetBSD: ipsec.h,v 1.31 2012/01/06 14:17:11 drochner Exp $ */
/* $FreeBSD: /usr/local/www/cvsroot/FreeBSD/src/sys/netipsec/ipsec.h,v 1.2.4.2 2004/02/14 22:23:23 bms Exp $ */
/* $KAME: ipsec.h,v 1.53 2001/11/20 08:32:38 itojun Exp $ */
@ -44,10 +44,10 @@
#endif
#include <net/pfkeyv2.h>
#include <netipsec/keydb.h>
#ifdef _KERNEL
#include <netipsec/keydb.h>
#include <netipsec/ipsec_osdep.h>
/*

4
sys/netkey/Makefile
View File

@ -1,7 +1,7 @@
# $NetBSD: Makefile,v 1.4 2002/11/26 23:30:33 lukem Exp $
# $NetBSD: Makefile,v 1.5 2012/01/06 14:17:11 drochner Exp $
INCSDIR= /usr/include/netkey
INCS= key.h key_debug.h key_var.h keydb.h keysock.h
INCS= keysock.h
.include <bsd.kinc.mk>

6
sys/netkey/keysock.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: keysock.h,v 1.15 2009/03/14 14:46:11 dsl Exp $ */
/* $NetBSD: keysock.h,v 1.16 2012/01/06 14:17:11 drochner Exp $ */
/* $KAME: keysock.h,v 1.8 2000/03/27 05:11:06 sumikawa Exp $ */
/*
@ -61,9 +61,11 @@
#define KEY_SENDUP_ONE 0
#define KEY_SENDUP_ALL 1
#define KEY_SENDUP_REGISTERED 2
#define KEY_SENDUP_CANWAIT 4
#ifdef _KERNEL
#define KEY_SENDUP_CANWAIT 4
struct keycb {
struct rawcb kp_raw; /* rawcb */
int kp_promisc; /* promiscuous mode */

5
usr.bin/netstat/fast_ipsec.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: fast_ipsec.c,v 1.17 2011/05/26 21:50:03 drochner Exp $ */
/* $NetBSD: fast_ipsec.c,v 1.18 2012/01/06 14:17:11 drochner Exp $ */
/* $FreeBSD: src/tools/tools/crypto/ipsecstats.c,v 1.1.4.1 2003/06/03 00:13:13 sam Exp $ */
/*-
@ -33,7 +33,7 @@
#include <sys/cdefs.h>
#ifndef lint
#ifdef __NetBSD__
__RCSID("$NetBSD: fast_ipsec.c,v 1.17 2011/05/26 21:50:03 drochner Exp $");
__RCSID("$NetBSD: fast_ipsec.c,v 1.18 2012/01/06 14:17:11 drochner Exp $");
#endif
#endif /* not lint*/
@ -52,7 +52,6 @@ __RCSID("$NetBSD: fast_ipsec.c,v 1.17 2011/05/26 21:50:03 drochner Exp $");
#include <netipsec/ipip_var.h>
#include <netipsec/ipcomp_var.h>
#include <netipsec/ipsec_var.h>
#include <netipsec/keydb.h>
#include <machine/int_fmtio.h>