Module Name:	src
Committed By:	tls
Date:		Mon Oct  6 22:05:15 UTC 2003

Modified Files:
	src/sys/netipsec: ipsec.c ipsec.h ipsec_input.c ipsec_netbsd.c
	    ipsec_osdep.h ipsec_output.c key.c key_debug.c keysock.c xform_ah.c
	    xform_esp.c xform_ipcomp.c xform_ipip.c

Log Message:
Reversion of "netkey merge", part 2 (replacement of removed files in the
repository by christos was part 1).  netipsec should now be back as it
was on 2003-09-11, with some very minor changes:

1) Some residual platform-dependent code was moved from ipsec.h to
   ipsec_osdep.h; without this, IPSEC_ASSERT() was multiply defined.  ipsec.h
   now includes ipsec_osdep.h

2) itojun's renaming of netipsec/files.ipsec to netipsec/files.netipsec has
   been left in place (it's arguable which name is less confusing but the
   rename is pretty harmless).

3) Some #endif TOKEN has been replaced by #endif /* TOKEN */; #endif TOKEN
   is invalid and GCC 3 won't compile it.

An i386 kernel with "options FAST_IPSEC" and "options OPENCRYPTO" now
gets through "make depend" but fails to build with errors in ip_input.c.
But it's better than it was (thank heaven for small favors).


To generate a diff of this commit:
cvs rdiff -r1.3 -r1.4 src/sys/netipsec/ipsec.c src/sys/netipsec/xform_ah.c \
    src/sys/netipsec/xform_esp.c src/sys/netipsec/xform_ipcomp.c
cvs rdiff -r1.2 -r1.3 src/sys/netipsec/ipsec.h \
    src/sys/netipsec/ipsec_netbsd.c src/sys/netipsec/ipsec_osdep.h \
    src/sys/netipsec/key.c src/sys/netipsec/key_debug.c
cvs rdiff -r1.5 -r1.6 src/sys/netipsec/ipsec_input.c
cvs rdiff -r1.6 -r1.7 src/sys/netipsec/ipsec_output.c
cvs rdiff -r1.1 -r1.2 src/sys/netipsec/keysock.c
cvs rdiff -r1.4 -r1.5 src/sys/netipsec/xform_ipip.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.