merge netipsec/key* into netkey/key*. no need for both.
change confusing filename
This commit is contained in:
itojun
parent
72bcf50f26
commit
eb305c3c3c
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: files,v 1.631 2003/08/26 19:23:49 thorpej Exp $
|
||||
# $NetBSD: files,v 1.632 2003/09/12 11:20:57 itojun Exp $
|
||||
|
||||
# @(#)files.newconf 7.5 (Berkeley) 5/10/93
|
||||
|
||||
|
|
@ -111,8 +111,8 @@ include "netccitt/files.netccitt"
|
|||
include "netinet/files.netinet"
|
||||
include "netinet/files.ipfilter"
|
||||
include "netinet6/files.netinet6"
|
||||
include "netinet6/files.netipsec"
|
||||
include "netipsec/files.ipsec"
|
||||
include "netinet6/files.ipsec"
|
||||
include "netipsec/files.netipsec"
|
||||
include "netiso/files.netiso"
|
||||
include "netnatm/files.netnatm"
|
||||
include "netns/files.netns"
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# $Id: files.ipsec,v 1.3 2003/09/12 11:09:30 itojun Exp $
|
||||
# $Id: files.netipsec,v 1.1 2003/09/12 11:20:58 itojun Exp $
|
||||
#
|
||||
#
|
||||
defflag opt_ipsec.h FAST_IPSEC
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: ipsec.c,v 1.2 2003/08/20 22:33:40 jonathan Exp $ */
|
||||
/* $NetBSD: ipsec.c,v 1.3 2003/09/12 11:20:58 itojun Exp $ */
|
||||
/* $FreeBSD: /usr/local/www/cvsroot/FreeBSD/src/sys/netipsec/ipsec.c,v 1.2.2.2 2003/07/01 01:38:13 sam Exp $ */
|
||||
/* $KAME: ipsec.c,v 1.103 2001/05/24 07:14:18 sakane Exp $ */
|
||||
|
||||
|
|
@ -32,7 +32,7 @@
|
|||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: ipsec.c,v 1.2 2003/08/20 22:33:40 jonathan Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: ipsec.c,v 1.3 2003/09/12 11:20:58 itojun Exp $");
|
||||
|
||||
/*
|
||||
* IPsec controller part.
|
||||
|
|
@ -90,9 +90,9 @@ __KERNEL_RCSID(0, "$NetBSD: ipsec.c,v 1.2 2003/08/20 22:33:40 jonathan Exp $");
|
|||
#include <netipsec/ipcomp.h> /*XXX*/
|
||||
#include <netipsec/ipcomp_var.h>
|
||||
|
||||
#include <netipsec/key.h>
|
||||
#include <netipsec/keydb.h>
|
||||
#include <netipsec/key_debug.h>
|
||||
#include <netkey/key.h>
|
||||
#include <netkey/keydb.h>
|
||||
#include <netkey/key_debug.h>
|
||||
|
||||
#include <netipsec/xform.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
/* $NetBSD: ipsec_input.c,v 1.4 2003/08/20 22:33:40 jonathan Exp $ */
|
||||
/* $NetBSD: ipsec_input.c,v 1.5 2003/09/12 11:20:58 itojun Exp $ */
|
||||
/* $FreeBSD: src/sys/netipsec/ipsec_input.c,v 1.2.4.1 2003/01/24 05:11:35 sam Exp $ */
|
||||
/* $KAME: ipsec.c,v 1.103 2001/05/24 07:14:18 sakane Exp $ */
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: ipsec_input.c,v 1.4 2003/08/20 22:33:40 jonathan Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: ipsec_input.c,v 1.5 2003/09/12 11:20:58 itojun Exp $");
|
||||
|
||||
/*
|
||||
* IPsec input processing.
|
||||
|
|
@ -53,8 +53,8 @@ __KERNEL_RCSID(0, "$NetBSD: ipsec_input.c,v 1.4 2003/08/20 22:33:40 jonathan Exp
|
|||
#include <netipsec/esp_var.h>
|
||||
#include <netipsec/ipcomp_var.h>
|
||||
|
||||
#include <netipsec/key.h>
|
||||
#include <netipsec/keydb.h>
|
||||
#include <netkey/key.h>
|
||||
#include <netkey/keydb.h>
|
||||
|
||||
#include <netipsec/xform.h>
|
||||
#include <netinet6/ip6protosw.h>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: ipsec_netbsd.c,v 1.1 2003/08/13 20:06:50 jonathan Exp $ */
|
||||
/* $NetBSD: ipsec_netbsd.c,v 1.2 2003/09/12 11:20:58 itojun Exp $ */
|
||||
/* $KAME: esp_input.c,v 1.60 2001/09/04 08:43:19 itojun Exp $ */
|
||||
/* $KAME: ah_input.c,v 1.64 2001/09/04 08:43:19 itojun Exp $ */
|
||||
|
||||
|
|
@ -32,7 +32,7 @@
|
|||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: ipsec_netbsd.c,v 1.1 2003/08/13 20:06:50 jonathan Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: ipsec_netbsd.c,v 1.2 2003/09/12 11:20:58 itojun Exp $");
|
||||
|
||||
#include "opt_inet.h"
|
||||
#include "opt_ipsec.h"
|
||||
|
|
@ -70,9 +70,9 @@ __KERNEL_RCSID(0, "$NetBSD: ipsec_netbsd.c,v 1.1 2003/08/13 20:06:50 jonathan Ex
|
|||
|
||||
#ifdef FAST_IPSEC
|
||||
#include <netipsec/ipsec.h>
|
||||
#include <netipsec/key.h>
|
||||
#include <netipsec/keydb.h>
|
||||
#include <netipsec/key_debug.h>
|
||||
#include <netkey/key.h>
|
||||
#include <netkey/keydb.h>
|
||||
#include <netkey/key_debug.h>
|
||||
#include <netipsec/ah_var.h>
|
||||
#endif
|
||||
|
||||
|
|
@ -81,7 +81,7 @@ __KERNEL_RCSID(0, "$NetBSD: ipsec_netbsd.c,v 1.1 2003/08/13 20:06:50 jonathan Ex
|
|||
|
||||
|
||||
|
||||
#include <netipsec/key.h>
|
||||
#include <netkey/key.h>
|
||||
|
||||
/* assumes that ip header and ah header are contiguous on mbuf */
|
||||
void *
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
/* $NetBSD: ipsec_output.c,v 1.5 2003/08/22 21:53:10 itojun Exp $ */
|
||||
/* $NetBSD: ipsec_output.c,v 1.6 2003/09/12 11:20:58 itojun Exp $ */
|
||||
/* $FreeBSD: src/sys/netipsec/ipsec_output.c,v 1.3.2.1 2003/01/24 05:11:35 sam Exp $ */
|
||||
/* $KAME: ipsec.c,v 1.103 2001/05/24 07:14:18 sakane Exp $ */
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: ipsec_output.c,v 1.5 2003/08/22 21:53:10 itojun Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: ipsec_output.c,v 1.6 2003/09/12 11:20:58 itojun Exp $");
|
||||
|
||||
/*
|
||||
* IPsec output processing.
|
||||
|
|
@ -55,9 +55,9 @@ __KERNEL_RCSID(0, "$NetBSD: ipsec_output.c,v 1.5 2003/08/22 21:53:10 itojun Exp
|
|||
|
||||
#include <netipsec/xform.h>
|
||||
|
||||
#include <netipsec/key.h>
|
||||
#include <netipsec/keydb.h>
|
||||
#include <netipsec/key_debug.h>
|
||||
#include <netkey/key.h>
|
||||
#include <netkey/keydb.h>
|
||||
#include <netkey/key_debug.h>
|
||||
#include <netipsec/ipsec_osdep.h>
|
||||
|
||||
int
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: xform_ah.c,v 1.2 2003/08/20 22:33:40 jonathan Exp $ */
|
||||
/* $NetBSD: xform_ah.c,v 1.3 2003/09/12 11:21:00 itojun Exp $ */
|
||||
/* $FreeBSD: src/sys/netipsec/xform_ah.c,v 1.1.4.1 2003/01/24 05:11:36 sam Exp $ */
|
||||
/* $OpenBSD: ip_ah.c,v 1.63 2001/06/26 06:18:58 angelos Exp $ */
|
||||
/*
|
||||
|
|
@ -39,7 +39,7 @@
|
|||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: xform_ah.c,v 1.2 2003/08/20 22:33:40 jonathan Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: xform_ah.c,v 1.3 2003/09/12 11:21:00 itojun Exp $");
|
||||
|
||||
#include "opt_inet.h"
|
||||
#ifdef __FreeBSD__
|
||||
|
|
@ -74,8 +74,8 @@ __KERNEL_RCSID(0, "$NetBSD: xform_ah.c,v 1.2 2003/08/20 22:33:40 jonathan Exp $"
|
|||
#include <netinet6/ip6_ecn.h>
|
||||
#endif
|
||||
|
||||
#include <netipsec/key.h>
|
||||
#include <netipsec/key_debug.h>
|
||||
#include <netkey/key.h>
|
||||
#include <netkey/key_debug.h>
|
||||
#include <netipsec/ipsec_osdep.h>
|
||||
|
||||
#include <opencrypto/cryptodev.h>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: xform_esp.c,v 1.2 2003/08/20 22:33:41 jonathan Exp $ */
|
||||
/* $NetBSD: xform_esp.c,v 1.3 2003/09/12 11:21:00 itojun Exp $ */
|
||||
/* $FreeBSD: src/sys/netipsec/xform_esp.c,v 1.2.2.1 2003/01/24 05:11:36 sam Exp $ */
|
||||
/* $OpenBSD: ip_esp.c,v 1.69 2001/06/26 06:18:59 angelos Exp $ */
|
||||
|
||||
|
|
@ -39,7 +39,7 @@
|
|||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: xform_esp.c,v 1.2 2003/08/20 22:33:41 jonathan Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: xform_esp.c,v 1.3 2003/09/12 11:21:00 itojun Exp $");
|
||||
|
||||
#include "opt_inet.h"
|
||||
#ifdef __FreeBSD__
|
||||
|
|
@ -77,8 +77,8 @@ __KERNEL_RCSID(0, "$NetBSD: xform_esp.c,v 1.2 2003/08/20 22:33:41 jonathan Exp $
|
|||
#include <netinet6/ip6_ecn.h>
|
||||
#endif
|
||||
|
||||
#include <netipsec/key.h>
|
||||
#include <netipsec/key_debug.h>
|
||||
#include <netkey/key.h>
|
||||
#include <netkey/key_debug.h>
|
||||
|
||||
#include <netipsec/ipsec_osdep.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: xform_ipcomp.c,v 1.2 2003/08/20 22:33:41 jonathan Exp $ */
|
||||
/* $NetBSD: xform_ipcomp.c,v 1.3 2003/09/12 11:21:00 itojun Exp $ */
|
||||
/* $FreeBSD: src/sys/netipsec/xform_ipcomp.c,v 1.1.4.1 2003/01/24 05:11:36 sam Exp $ */
|
||||
/* $OpenBSD: ip_ipcomp.c,v 1.1 2001/07/05 12:08:52 jjbg Exp $ */
|
||||
|
||||
|
|
@ -30,7 +30,7 @@
|
|||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: xform_ipcomp.c,v 1.2 2003/08/20 22:33:41 jonathan Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: xform_ipcomp.c,v 1.3 2003/09/12 11:21:00 itojun Exp $");
|
||||
|
||||
/* IP payload compression protocol (IPComp), see RFC 2393 */
|
||||
#include "opt_inet.h"
|
||||
|
|
@ -63,8 +63,8 @@ __KERNEL_RCSID(0, "$NetBSD: xform_ipcomp.c,v 1.2 2003/08/20 22:33:41 jonathan Ex
|
|||
#include <netipsec/ipcomp.h>
|
||||
#include <netipsec/ipcomp_var.h>
|
||||
|
||||
#include <netipsec/key.h>
|
||||
#include <netipsec/key_debug.h>
|
||||
#include <netkey/key.h>
|
||||
#include <netkey/key_debug.h>
|
||||
|
||||
#include <netipsec/ipsec_osdep.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: xform_ipip.c,v 1.3 2003/09/12 11:09:31 itojun Exp $ */
|
||||
/* $NetBSD: xform_ipip.c,v 1.4 2003/09/12 11:21:00 itojun Exp $ */
|
||||
/* $FreeBSD: src/sys/netipsec/xform_ipip.c,v 1.3.2.1 2003/01/24 05:11:36 sam Exp $ */
|
||||
/* $OpenBSD: ip_ipip.c,v 1.25 2002/06/10 18:04:55 itojun Exp $ */
|
||||
|
||||
|
|
@ -39,7 +39,7 @@
|
|||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: xform_ipip.c,v 1.3 2003/09/12 11:09:31 itojun Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: xform_ipip.c,v 1.4 2003/09/12 11:21:00 itojun Exp $");
|
||||
|
||||
/*
|
||||
* IP-inside-IP processing
|
||||
|
|
@ -91,8 +91,8 @@ __KERNEL_RCSID(0, "$NetBSD: xform_ipip.c,v 1.3 2003/09/12 11:09:31 itojun Exp $"
|
|||
#include <netinet6/ip6protosw.h>
|
||||
#endif
|
||||
|
||||
#include <netipsec/key.h>
|
||||
#include <netipsec/key_debug.h>
|
||||
#include <netkey/key.h>
|
||||
#include <netkey/key_debug.h>
|
||||
#include <netipsec/ipsec_osdep.h>
|
||||
|
||||
#include <machine/stdarg.h>
|
||||
|
|
|
|||
Loading…
Reference in New Issue