- Update to new upstream release.

20 files changed, 16 insertions, 1725 deletions

diff --git a/src/libfreeswan/Makefile.in b/src/libfreeswan/Makefile.in
index 97b53d7c0..fa57d5aab 100644
--- a/src/libfreeswan/Makefile.in
+++ b/src/libfreeswan/Makefile.in
@@ -129,6 +129,7 @@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
+LINUX_HEADERS = @LINUX_HEADERS@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
@@ -141,6 +142,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
+PKG_CONFIG = @PKG_CONFIG@
 RANLIB = @RANLIB@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
@@ -151,8 +153,12 @@ USE_LEAK_DETECTIVE_FALSE = @USE_LEAK_DETECTIVE_FALSE@
 USE_LEAK_DETECTIVE_TRUE = @USE_LEAK_DETECTIVE_TRUE@
 USE_LIBCURL_FALSE = @USE_LIBCURL_FALSE@
 USE_LIBCURL_TRUE = @USE_LIBCURL_TRUE@
+USE_LIBDBUS_FALSE = @USE_LIBDBUS_FALSE@
+USE_LIBDBUS_TRUE = @USE_LIBDBUS_TRUE@
 USE_LIBLDAP_FALSE = @USE_LIBLDAP_FALSE@
 USE_LIBLDAP_TRUE = @USE_LIBLDAP_TRUE@
+USE_LIBXML_FALSE = @USE_LIBXML_FALSE@
+USE_LIBXML_TRUE = @USE_LIBXML_TRUE@
 USE_NAT_TRANSPORT_FALSE = @USE_NAT_TRANSPORT_FALSE@
 USE_NAT_TRANSPORT_TRUE = @USE_NAT_TRANSPORT_TRUE@
 USE_SMARTCARD_FALSE = @USE_SMARTCARD_FALSE@
@@ -174,6 +180,7 @@ am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
+backenddir = @backenddir@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@@ -183,6 +190,8 @@ build_vendor = @build_vendor@
 confdir = @confdir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+dbus_CFLAGS = @dbus_CFLAGS@
+dbus_LIBS = @dbus_LIBS@
 docdir = @docdir@
 dvidir = @dvidir@
 eapdir = @eapdir@
@@ -196,9 +205,13 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
+interfacedir = @interfacedir@
 ipsecdir = @ipsecdir@
+ipsecgid = @ipsecgid@
+ipsecuid = @ipsecuid@
 libdir = @libdir@
 libexecdir = @libexecdir@
+linuxdir = @linuxdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
@@ -213,6 +226,8 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+xml_CFLAGS = @xml_CFLAGS@
+xml_LIBS = @xml_LIBS@
 noinst_LIBRARIES = libfreeswan.a
 libfreeswan_a_SOURCES = addrtoa.c addrtot.c addrtypeof.c anyaddr.c atoaddr.c atoasr.c \
 			atosa.c atosubnet.c atoul.c copyright.c datatot.c freeswan.h \
diff --git a/src/libfreeswan/ipsec_ah.h b/src/libfreeswan/ipsec_ah.h
index e088288d3..7a250248e 100644
--- a/src/libfreeswan/ipsec_ah.h
+++ b/src/libfreeswan/ipsec_ah.h
@@ -109,127 +109,3 @@ struct ahhdr				/* Generic AH header */
 extern int debug_ah;
 #endif /* CONFIG_IPSEC_DEBUG */
 #endif /* __KERNEL__ */
-
-/*
- * $Log: ipsec_ah.h,v $
- * Revision 1.2  2004/03/22 21:53:18  as
- * merged alg-0.8.1 branch with HEAD
- *
- * Revision 1.1.4.1  2004/03/16 09:48:18  as
- * alg-0.8.1rc12 patch merged
- *
- * Revision 1.1  2004/03/15 20:35:25  as
- * added files from freeswan-2.04-x509-1.5.3
- *
- * Revision 1.20  2003/02/06 02:21:34  rgb
- *
- * Moved "struct auth_alg" from ipsec_rcv.c to ipsec_ah.h .
- * Changed "struct ah" to "struct ahhdr" and "struct esp" to "struct esphdr".
- * Removed "#ifdef INBOUND_POLICY_CHECK_eroute" dead code.
- *
- * Revision 1.19  2002/09/16 21:19:13  mcr
- * 	fixes for west-ah-icmp-01 - length of AH header must be
- * 	calculated properly, and next_header field properly copied.
- *
- * Revision 1.18  2002/05/14 02:37:02  rgb
- * Change reference from _TDB to _IPSA.
- *
- * Revision 1.17  2002/04/24 07:36:46  mcr
- * Moved from ./klips/net/ipsec/ipsec_ah.h,v
- *
- * Revision 1.16  2002/02/20 01:27:06  rgb
- * Ditched a pile of structs only used by the old Netlink interface.
- *
- * Revision 1.15  2001/12/11 02:35:57  rgb
- * Change "struct net_device" to "struct device" for 2.2 compatibility.
- *
- * Revision 1.14  2001/11/26 09:23:47  rgb
- * Merge MCR's ipsec_sa, eroute, proc and struct lifetime changes.
- *
- * Revision 1.13.2.1  2001/09/25 02:18:24  mcr
- * 	replace "struct device" with "struct netdevice"
- *
- * Revision 1.13  2001/06/14 19:35:08  rgb
- * Update copyright date.
- *
- * Revision 1.12  2000/09/12 03:21:20  rgb
- * Cleared out unused htonq.
- *
- * Revision 1.11  2000/09/08 19:12:55  rgb
- * Change references from DEBUG_IPSEC to CONFIG_IPSEC_DEBUG.
- *
- * Revision 1.10  2000/01/21 06:13:10  rgb
- * Tidied up spacing.
- * Added macros for HMAC padding magic numbers.(kravietz)
- *
- * Revision 1.9  1999/12/07 18:16:23  rgb
- * Fixed comments at end of #endif lines.
- *
- * Revision 1.8  1999/04/11 00:28:56  henry
- * GPL boilerplate
- *
- * Revision 1.7  1999/04/06 04:54:25  rgb
- * Fix/Add RCSID Id: and Log: bits to make PHMDs happy.  This includes
- * patch shell fixes.
- *
- * Revision 1.6  1999/01/26 02:06:01  rgb
- * Removed CONFIG_IPSEC_ALGO_SWITCH macro.
- *
- * Revision 1.5  1999/01/22 06:17:49  rgb
- * Updated macro comments.
- * Added context types to support algorithm switch code.
- * 64-bit clean-up -- converting 'u long long' to __u64.
- *
- * Revision 1.4  1998/07/14 15:54:56  rgb
- * Add #ifdef __KERNEL__ to protect kernel-only structures.
- *
- * Revision 1.3  1998/06/30 18:05:16  rgb
- * Comment out references to htonq.
- *
- * Revision 1.2  1998/06/25 19:33:46  rgb
- * Add prototype for protocol receive function.
- * Rearrange for more logical layout.
- *
- * Revision 1.1  1998/06/18 21:27:43  henry
- * move sources from klips/src to klips/net/ipsec, to keep stupid
- * kernel-build scripts happier in the presence of symlinks
- *
- * Revision 1.4  1998/05/18 22:28:43  rgb
- * Disable key printing facilities from /proc/net/ipsec_*.
- *
- * Revision 1.3  1998/04/21 21:29:07  rgb
- * Rearrange debug switches to change on the fly debug output from user
- * space.  Only kernel changes checked in at this time.  radij.c was also
- * changed to temporarily remove buggy debugging code in rj_delete causing
- * an OOPS and hence, netlink device open errors.
- *
- * Revision 1.2  1998/04/12 22:03:17  rgb
- * Updated ESP-3DES-HMAC-MD5-96,
- * 	ESP-DES-HMAC-MD5-96,
- * 	AH-HMAC-MD5-96,
- * 	AH-HMAC-SHA1-96 since Henry started freeswan cvs repository
- * from old standards (RFC182[5-9] to new (as of March 1998) drafts.
- *
- * Fixed eroute references in /proc/net/ipsec*.
- *
- * Started to patch module unloading memory leaks in ipsec_netlink and
- * radij tree unloading.
- *
- * Revision 1.1  1998/04/09 03:05:55  henry
- * sources moved up from linux/net/ipsec
- *
- * Revision 1.1.1.1  1998/04/08 05:35:02  henry
- * RGB's ipsec-0.8pre2.tar.gz ipsec-0.8
- *
- * Revision 0.4  1997/01/15 01:28:15  ji
- * Added definitions for new AH transforms.
- *
- * Revision 0.3  1996/11/20 14:35:48  ji
- * Minor Cleanup.
- * Rationalized debugging code.
- *
- * Revision 0.2  1996/11/02 00:18:33  ji
- * First limited release.
- *
- *
- */
diff --git a/src/libfreeswan/ipsec_encap.h b/src/libfreeswan/ipsec_encap.h
index 17cd69269..f95259466 100644
--- a/src/libfreeswan/ipsec_encap.h
+++ b/src/libfreeswan/ipsec_encap.h
@@ -53,91 +53,3 @@ struct sockaddr_encap
 
 #define _IPSEC_ENCAP_H_
 #endif /* _IPSEC_ENCAP_H_ */
-
-/*
- * $Log: ipsec_encap.h,v $
- * Revision 1.1  2004/03/15 20:35:25  as
- * added files from freeswan-2.04-x509-1.5.3
- *
- * Revision 1.17  2002/04/24 07:36:46  mcr
- * Moved from ./klips/net/ipsec/ipsec_encap.h,v
- *
- * Revision 1.16  2001/11/26 09:23:47  rgb
- * Merge MCR's ipsec_sa, eroute, proc and struct lifetime changes.
- *
- * Revision 1.15.2.1  2001/09/25 02:18:54  mcr
- * 	struct eroute moved to ipsec_eroute.h
- *
- * Revision 1.15  2001/09/14 16:58:36  rgb
- * Added support for storing the first and last packets through a HOLD.
- *
- * Revision 1.14  2001/09/08 21:13:31  rgb
- * Added pfkey ident extension support for ISAKMPd. (NetCelo)
- *
- * Revision 1.13  2001/06/14 19:35:08  rgb
- * Update copyright date.
- *
- * Revision 1.12  2001/05/27 06:12:10  rgb
- * Added structures for pid, packet count and last access time to eroute.
- * Added packet count to beginning of /proc/net/ipsec_eroute.
- *
- * Revision 1.11  2000/09/08 19:12:56  rgb
- * Change references from DEBUG_IPSEC to CONFIG_IPSEC_DEBUG.
- *
- * Revision 1.10  2000/03/22 16:15:36  rgb
- * Fixed renaming of dev_get (MB).
- *
- * Revision 1.9  2000/01/21 06:13:26  rgb
- * Added a macro for AF_ENCAP
- *
- * Revision 1.8  1999/12/31 14:56:55  rgb
- * MB fix for 2.3 dev-use-count.
- *
- * Revision 1.7  1999/11/18 04:09:18  rgb
- * Replaced all kernel version macros to shorter, readable form.
- *
- * Revision 1.6  1999/09/24 00:34:13  rgb
- * Add Marc Boucher's support for 2.3.xx+.
- *
- * Revision 1.5  1999/04/11 00:28:57  henry
- * GPL boilerplate
- *
- * Revision 1.4  1999/04/06 04:54:25  rgb
- * Fix/Add RCSID Id: and Log: bits to make PHMDs happy.  This includes
- * patch shell fixes.
- *
- * Revision 1.3  1998/10/19 14:44:28  rgb
- * Added inclusion of freeswan.h.
- * sa_id structure implemented and used: now includes protocol.
- *
- * Revision 1.2  1998/07/14 18:19:33  rgb
- * Added #ifdef __KERNEL__ directives to restrict scope of header.
- *
- * Revision 1.1  1998/06/18 21:27:44  henry
- * move sources from klips/src to klips/net/ipsec, to keep stupid
- * kernel-build scripts happier in the presence of symlinks
- *
- * Revision 1.2  1998/04/21 21:29:10  rgb
- * Rearrange debug switches to change on the fly debug output from user
- * space.  Only kernel changes checked in at this time.  radij.c was also
- * changed to temporarily remove buggy debugging code in rj_delete causing
- * an OOPS and hence, netlink device open errors.
- *
- * Revision 1.1  1998/04/09 03:05:58  henry
- * sources moved up from linux/net/ipsec
- *
- * Revision 1.1.1.1  1998/04/08 05:35:02  henry
- * RGB's ipsec-0.8pre2.tar.gz ipsec-0.8
- *
- * Revision 0.4  1997/01/15 01:28:15  ji
- * Minor cosmetic changes.
- *
- * Revision 0.3  1996/11/20 14:35:48  ji
- * Minor Cleanup.
- * Rationalized debugging code.
- *
- * Revision 0.2  1996/11/02 00:18:33  ji
- * First limited release.
- *
- *
- */
diff --git a/src/libfreeswan/ipsec_eroute.h b/src/libfreeswan/ipsec_eroute.h
index 2ee2a10b8..9bba4bfb4 100644
--- a/src/libfreeswan/ipsec_eroute.h
+++ b/src/libfreeswan/ipsec_eroute.h
@@ -80,24 +80,3 @@ struct eroute
 
 #define _IPSEC_EROUTE_H_
 #endif /* _IPSEC_EROUTE_H_ */
-
-/*
- * $Log: ipsec_eroute.h,v $
- * Revision 1.1  2004/03/15 20:35:25  as
- * added files from freeswan-2.04-x509-1.5.3
- *
- * Revision 1.3  2002/04/24 07:36:46  mcr
- * Moved from ./klips/net/ipsec/ipsec_eroute.h,v
- *
- * Revision 1.2  2001/11/26 09:16:13  rgb
- * Merge MCR's ipsec_sa, eroute, proc and struct lifetime changes.
- *
- * Revision 1.1.2.1  2001/09/25 02:18:54  mcr
- * 	struct eroute moved to ipsec_eroute.h
- *
- *
- * Local variables:
- * c-file-style: "linux"
- * End:
- *
- */
diff --git a/src/libfreeswan/ipsec_errs.h b/src/libfreeswan/ipsec_errs.h
index f14b5e675..39cfece2b 100644
--- a/src/libfreeswan/ipsec_errs.h
+++ b/src/libfreeswan/ipsec_errs.h
@@ -30,24 +30,3 @@ struct ipsec_errs {
 	__u32		ips_encpad_errs;       /* # of encryption pad  errors*/
 	__u32		ips_replaywin_errs;    /* # of pkt sequence errors */
 };
-
-/*
- * $Log: ipsec_errs.h,v $
- * Revision 1.1  2004/03/15 20:35:25  as
- * added files from freeswan-2.04-x509-1.5.3
- *
- * Revision 1.3  2002/04/24 07:36:46  mcr
- * Moved from ./klips/net/ipsec/ipsec_errs.h,v
- *
- * Revision 1.2  2001/11/26 09:16:13  rgb
- * Merge MCR's ipsec_sa, eroute, proc and struct lifetime changes.
- *
- * Revision 1.1.2.1  2001/09/25 02:25:57  mcr
- * 	lifetime structure created and common functions created.
- *
- *
- * Local variables:
- * c-file-style: "linux"
- * End:
- *
- */
diff --git a/src/libfreeswan/ipsec_esp.h b/src/libfreeswan/ipsec_esp.h
index c7d5ea15d..90ef28e9b 100644
--- a/src/libfreeswan/ipsec_esp.h
+++ b/src/libfreeswan/ipsec_esp.h
@@ -78,143 +78,3 @@ struct esphdr
 extern int debug_esp;
 #endif /* CONFIG_IPSEC_DEBUG */
 #endif /* __KERNEL__ */
-
-/*
- * $Log: ipsec_esp.h,v $
- * Revision 1.2  2004/03/22 21:53:18  as
- * merged alg-0.8.1 branch with HEAD
- *
- * Revision 1.1.4.1  2004/03/16 09:48:18  as
- * alg-0.8.1rc12 patch merged
- *
- * Revision 1.1  2004/03/15 20:35:25  as
- * added files from freeswan-2.04-x509-1.5.3
- *
- * Revision 1.21  2003/02/06 02:21:34  rgb
- *
- * Moved "struct auth_alg" from ipsec_rcv.c to ipsec_ah.h .
- * Changed "struct ah" to "struct ahhdr" and "struct esp" to "struct esphdr".
- * Removed "#ifdef INBOUND_POLICY_CHECK_eroute" dead code.
- *
- * Revision 1.20  2002/05/14 02:37:02  rgb
- * Change reference from _TDB to _IPSA.
- *
- * Revision 1.19  2002/04/24 07:55:32  mcr
- * 	#include patches and Makefiles for post-reorg compilation.
- *
- * Revision 1.18  2002/04/24 07:36:46  mcr
- * Moved from ./klips/net/ipsec/ipsec_esp.h,v
- *
- * Revision 1.17  2002/02/20 01:27:07  rgb
- * Ditched a pile of structs only used by the old Netlink interface.
- *
- * Revision 1.16  2001/12/11 02:35:57  rgb
- * Change "struct net_device" to "struct device" for 2.2 compatibility.
- *
- * Revision 1.15  2001/11/26 09:23:48  rgb
- * Merge MCR's ipsec_sa, eroute, proc and struct lifetime changes.
- *
- * Revision 1.14.2.3  2001/10/23 04:16:42  mcr
- * 	get definition of des_key_schedule from des.h
- *
- * Revision 1.14.2.2  2001/10/22 20:33:13  mcr
- * 	use "des_key_schedule" structure instead of cooking our own.
- *
- * Revision 1.14.2.1  2001/09/25 02:18:25  mcr
- * 	replace "struct device" with "struct netdevice"
- *
- * Revision 1.14  2001/06/14 19:35:08  rgb
- * Update copyright date.
- *
- * Revision 1.13  2000/09/08 19:12:56  rgb
- * Change references from DEBUG_IPSEC to CONFIG_IPSEC_DEBUG.
- *
- * Revision 1.12  2000/08/01 14:51:50  rgb
- * Removed _all_ remaining traces of DES.
- *
- * Revision 1.11  2000/01/10 16:36:20  rgb
- * Ditch last of EME option flags, including initiator.
- *
- * Revision 1.10  1999/12/07 18:16:22  rgb
- * Fixed comments at end of #endif lines.
- *
- * Revision 1.9  1999/04/11 00:28:57  henry
- * GPL boilerplate
- *
- * Revision 1.8  1999/04/06 04:54:25  rgb
- * Fix/Add RCSID Id: and Log: bits to make PHMDs happy.  This includes
- * patch shell fixes.
- *
- * Revision 1.7  1999/01/26 02:06:00  rgb
- * Removed CONFIG_IPSEC_ALGO_SWITCH macro.
- *
- * Revision 1.6  1999/01/22 15:22:05  rgb
- * Re-enable IV in the espblkrply_edata structure to avoid breaking pluto
- * until pluto can be fixed properly.
- *
- * Revision 1.5  1999/01/22 06:18:16  rgb
- * Updated macro comments.
- * Added key schedule types to support algorithm switch code.
- *
- * Revision 1.4  1998/08/12 00:07:32  rgb
- * Added data structures for new xforms: null, {,3}dessha1.
- *
- * Revision 1.3  1998/07/14 15:57:01  rgb
- * Add #ifdef __KERNEL__ to protect kernel-only structures.
- *
- * Revision 1.2  1998/06/25 19:33:46  rgb
- * Add prototype for protocol receive function.
- * Rearrange for more logical layout.
- *
- * Revision 1.1  1998/06/18 21:27:45  henry
- * move sources from klips/src to klips/net/ipsec, to keep stupid
- * kernel-build scripts happier in the presence of symlinks
- *
- * Revision 1.6  1998/06/05 02:28:08  rgb
- * Minor comment fix.
- *
- * Revision 1.5  1998/05/27 22:34:00  rgb
- * Changed structures to accomodate key separation.
- *
- * Revision 1.4  1998/05/18 22:28:43  rgb
- * Disable key printing facilities from /proc/net/ipsec_*.
- *
- * Revision 1.3  1998/04/21 21:29:07  rgb
- * Rearrange debug switches to change on the fly debug output from user
- * space.  Only kernel changes checked in at this time.  radij.c was also
- * changed to temporarily remove buggy debugging code in rj_delete causing
- * an OOPS and hence, netlink device open errors.
- *
- * Revision 1.2  1998/04/12 22:03:20  rgb
- * Updated ESP-3DES-HMAC-MD5-96,
- * 	ESP-DES-HMAC-MD5-96,
- * 	AH-HMAC-MD5-96,
- * 	AH-HMAC-SHA1-96 since Henry started freeswan cvs repository
- * from old standards (RFC182[5-9] to new (as of March 1998) drafts.
- *
- * Fixed eroute references in /proc/net/ipsec*.
- *
- * Started to patch module unloading memory leaks in ipsec_netlink and
- * radij tree unloading.
- *
- * Revision 1.1  1998/04/09 03:06:00  henry
- * sources moved up from linux/net/ipsec
- *
- * Revision 1.1.1.1  1998/04/08 05:35:02  henry
- * RGB's ipsec-0.8pre2.tar.gz ipsec-0.8
- *
- * Revision 0.5  1997/06/03 04:24:48  ji
- * Added ESP-3DES-MD5-96 transform.
- *
- * Revision 0.4  1997/01/15 01:28:15  ji
- * Added definitions for new ESP transforms.
- *
- * Revision 0.3  1996/11/20 14:35:48  ji
- * Minor Cleanup.
- * Rationalized debugging code.
- *
- * Revision 0.2  1996/11/02 00:18:33  ji
- * First limited release.
- *
- *
- */
diff --git a/src/libfreeswan/ipsec_ipe4.h b/src/libfreeswan/ipsec_ipe4.h
index 73b6ae899..14d1eadee 100644
--- a/src/libfreeswan/ipsec_ipe4.h
+++ b/src/libfreeswan/ipsec_ipe4.h
@@ -25,44 +25,3 @@ struct ipe4_xdata			/* transform table data */
 };
 
 #define EMT_IPE4_ULEN	8	/* coming from user mode */
- 
-
-/*
- * $Log: ipsec_ipe4.h,v $
- * Revision 1.1  2004/03/15 20:35:25  as
- * added files from freeswan-2.04-x509-1.5.3
- *
- * Revision 1.5  2002/04/24 07:36:46  mcr
- * Moved from ./klips/net/ipsec/ipsec_ipe4.h,v
- *
- * Revision 1.4  2001/06/14 19:35:08  rgb
- * Update copyright date.
- *
- * Revision 1.3  1999/04/11 00:28:57  henry
- * GPL boilerplate
- *
- * Revision 1.2  1999/04/06 04:54:25  rgb
- * Fix/Add RCSID Id: and Log: bits to make PHMDs happy.  This includes
- * patch shell fixes.
- *
- * Revision 1.1  1998/06/18 21:27:47  henry
- * move sources from klips/src to klips/net/ipsec, to keep stupid
- * kernel-build scripts happier in the presence of symlinks
- *
- * Revision 1.1  1998/04/09 03:06:07  henry
- * sources moved up from linux/net/ipsec
- *
- * Revision 1.1.1.1  1998/04/08 05:35:03  henry
- * RGB's ipsec-0.8pre2.tar.gz ipsec-0.8
- *
- * Revision 0.4  1997/01/15 01:28:15  ji
- * No changes.
- *
- * Revision 0.3  1996/11/20 14:48:53  ji
- * Release update only.
- *
- * Revision 0.2  1996/11/02 00:18:33  ji
- * First limited release.
- *
- *
- */
diff --git a/src/libfreeswan/ipsec_kversion.h b/src/libfreeswan/ipsec_kversion.h
index 7bf56ac7f..332c21bd5 100644
--- a/src/libfreeswan/ipsec_kversion.h
+++ b/src/libfreeswan/ipsec_kversion.h
@@ -189,39 +189,3 @@
 #endif /* !SPINLOCK_23 */
 
 #endif /* _FREESWAN_KVERSIONS_H */
-
-/*
- * $Log: ipsec_kversion.h,v $
- * Revision 1.1  2004/03/15 20:35:25  as
- * added files from freeswan-2.04-x509-1.5.3
- *
- * Revision 1.7  2003/07/31 22:48:08  mcr
- * 	derive NET25-ness from presence of NETLINK_XFRM macro.
- *
- * Revision 1.6  2003/06/24 20:22:32  mcr
- * 	added new global: ipsecdevices[] so that we can keep track of
- * 	the ipsecX devices. They will be referenced with dev_hold(),
- * 	so 2.2 may need this as well.
- *
- * Revision 1.5  2003/04/03 17:38:09  rgb
- * Centralised ipsec_kfree_skb and ipsec_dev_{get,put}.
- *
- * Revision 1.4  2002/04/24 07:36:46  mcr
- * Moved from ./klips/net/ipsec/ipsec_kversion.h,v
- *
- * Revision 1.3  2002/04/12 03:21:17  mcr
- * 	three parameter version of ip_select_ident appears first
- * 	in 2.4.2 (RH7.1) not 2.4.4.
- *
- * Revision 1.2  2002/03/08 21:35:22  rgb
- * Defined LINUX_KERNEL_HAS_SNPRINTF to shut up compiler warnings after
- * 2.4.9.  (Andreas Piesk).
- *
- * Revision 1.1  2002/01/29 02:11:42  mcr
- * 	removal of kversions.h - sources that needed it now use ipsec_param.h.
- * 	updating of IPv6 structures to match latest in6.h version.
- * 	removed dead code from freeswan.h that also duplicated kversions.h
- * 	code.
- *
- *
- */
diff --git a/src/libfreeswan/ipsec_life.h b/src/libfreeswan/ipsec_life.h
index 4cf270272..598a73665 100644
--- a/src/libfreeswan/ipsec_life.h
+++ b/src/libfreeswan/ipsec_life.h
@@ -88,25 +88,3 @@ enum ipsec_life_type {
 
 #define _IPSEC_LIFE_H_
 #endif /* _IPSEC_LIFE_H_ */
-
-
-/*
- * $Log: ipsec_life.h,v $
- * Revision 1.1  2004/03/15 20:35:25  as
- * added files from freeswan-2.04-x509-1.5.3
- *
- * Revision 1.3  2002/04/24 07:36:46  mcr
- * Moved from ./klips/net/ipsec/ipsec_life.h,v
- *
- * Revision 1.2  2001/11/26 09:16:14  rgb
- * Merge MCR's ipsec_sa, eroute, proc and struct lifetime changes.
- *
- * Revision 1.1.2.1  2001/09/25 02:25:58  mcr
- * 	lifetime structure created and common functions created.
- *
- *
- * Local variables:
- * c-file-style: "linux"
- * End:
- *
- */
diff --git a/src/libfreeswan/ipsec_md5h.h b/src/libfreeswan/ipsec_md5h.h
index 3fc54bc82..a79c8256f 100644
--- a/src/libfreeswan/ipsec_md5h.h
+++ b/src/libfreeswan/ipsec_md5h.h
@@ -81,60 +81,3 @@ void MD5Update PROTO_LIST
 void MD5Final PROTO_LIST ((unsigned char [16], void *));
  
 #endif /* _IPSEC_MD5H_H_ */
-
-/*
- * $Log: ipsec_md5h.h,v $
- * Revision 1.1  2004/03/15 20:35:25  as
- * added files from freeswan-2.04-x509-1.5.3
- *
- * Revision 1.8  2002/09/10 01:45:09  mcr
- * 	changed type of MD5_CTX and SHA1_CTX to void * so that
- * 	the function prototypes would match, and could be placed
- * 	into a pointer to a function.
- *
- * Revision 1.7  2002/04/24 07:36:46  mcr
- * Moved from ./klips/net/ipsec/ipsec_md5h.h,v
- *
- * Revision 1.6  1999/12/13 13:59:13  rgb
- * Quick fix to argument size to Update bugs.
- *
- * Revision 1.5  1999/12/07 18:16:23  rgb
- * Fixed comments at end of #endif lines.
- *
- * Revision 1.4  1999/04/06 04:54:26  rgb
- * Fix/Add RCSID Id: and Log: bits to make PHMDs happy.  This includes
- * patch shell fixes.
- *
- * Revision 1.3  1999/01/22 06:19:58  rgb
- * 64-bit clean-up.
- *
- * Revision 1.2  1998/11/30 13:22:54  rgb
- * Rationalised all the klips kernel file headers.  They are much shorter
- * now and won't conflict under RH5.2.
- *
- * Revision 1.1  1998/06/18 21:27:48  henry
- * move sources from klips/src to klips/net/ipsec, to keep stupid
- * kernel-build scripts happier in the presence of symlinks
- *
- * Revision 1.2  1998/04/23 20:54:03  rgb
- * Fixed md5 and sha1 include file nesting issues, to be cleaned up when
- * verified.
- *
- * Revision 1.1  1998/04/09 03:04:21  henry
- * sources moved up from linux/net/ipsec
- * these two include files modified not to include others except in kernel
- *
- * Revision 1.1.1.1  1998/04/08 05:35:03  henry
- * RGB's ipsec-0.8pre2.tar.gz ipsec-0.8
- *
- * Revision 0.4  1997/01/15 01:28:15  ji
- * No changes.
- *
- * Revision 0.3  1996/11/20 14:48:53  ji
- * Release update only.
- *
- * Revision 0.2  1996/11/02 00:18:33  ji
- * First limited release.
- *
- *
- */
diff --git a/src/libfreeswan/ipsec_rcv.h b/src/libfreeswan/ipsec_rcv.h
index 3ae239bf9..063ccf462 100644
--- a/src/libfreeswan/ipsec_rcv.h
+++ b/src/libfreeswan/ipsec_rcv.h
@@ -70,127 +70,3 @@ extern int debug_rcv;
 #endif /* CONFIG_IPSEC_DEBUG */
 extern int sysctl_ipsec_inbound_policy_check;
 #endif /* __KERNEL__ */
-
-/*
- * $Log: ipsec_rcv.h,v $
- * Revision 1.1  2004/03/15 20:35:25  as
- * added files from freeswan-2.04-x509-1.5.3
- *
- * Revision 1.17  2002/09/03 16:32:32  mcr
- * 	definitions of ipsec_birth_reply.
- *
- * Revision 1.16  2002/05/14 02:36:00  rgb
- * Change references to _TDB to _IPSA.
- *
- * Revision 1.15  2002/04/24 07:36:47  mcr
- * Moved from ./klips/net/ipsec/ipsec_rcv.h,v
- *
- * Revision 1.14  2001/09/07 22:15:48  rgb
- * Fix for removal of transport layer protocol handler arg in 2.4.4.
- *
- * Revision 1.13  2001/06/14 19:35:09  rgb
- * Update copyright date.
- *
- * Revision 1.12  2001/03/16 07:36:44  rgb
- * Fixed #endif comment to sate compiler.
- *
- * Revision 1.11  2000/09/21 04:34:21  rgb
- * Moved declaration of sysctl_ipsec_inbound_policy_check outside
- * CONFIG_IPSEC_DEBUG. (MB)
- *
- * Revision 1.10  2000/09/18 02:36:10  rgb
- * Exported sysctl_ipsec_inbound_policy_check for skb_decompress().
- *
- * Revision 1.9  2000/09/08 19:12:56  rgb
- * Change references from DEBUG_IPSEC to CONFIG_IPSEC_DEBUG.
- *
- * Revision 1.8  1999/11/18 04:09:19  rgb
- * Replaced all kernel version macros to shorter, readable form.
- *
- * Revision 1.7  1999/05/25 01:45:37  rgb
- * Fix version macros for 2.0.x as a module.
- *
- * Revision 1.6  1999/05/08 21:24:27  rgb
- * Add includes for 2.2.x include into net/ipv4/protocol.c
- *
- * Revision 1.5  1999/05/05 22:02:32  rgb
- * Add a quick and dirty port to 2.2 kernels by Marc Boucher <marc@mbsi.ca>.
- *
- * Revision 1.4  1999/04/11 00:28:59  henry
- * GPL boilerplate
- *
- * Revision 1.3  1999/04/06 04:54:27  rgb
- * Fix/Add RCSID Id: and Log: bits to make PHMDs happy.  This includes
- * patch shell fixes.
- *
- * Revision 1.2  1999/01/22 20:06:59  rgb
- * Fixed cut-and-paste error from ipsec_esp.h.
- *
- * Revision 1.1  1999/01/21 20:29:12  rgb
- * Converted from transform switching to algorithm switching.
- *
- * Log: ipsec_esp.h,v 
- * Revision 1.4  1998/08/12 00:07:32  rgb
- * Added data structures for new xforms: null, {,3}dessha1.
- *
- * Revision 1.3  1998/07/14 15:57:01  rgb
- * Add #ifdef __KERNEL__ to protect kernel-only structures.
- *
- * Revision 1.2  1998/06/25 19:33:46  rgb
- * Add prototype for protocol receive function.
- * Rearrange for more logical layout.
- *
- * Revision 1.1  1998/06/18 21:27:45  henry
- * move sources from klips/src to klips/net/ipsec, to keep stupid
- * kernel-build scripts happier in the presence of symlinks
- *
- * Revision 1.6  1998/06/05 02:28:08  rgb
- * Minor comment fix.
- *
- * Revision 1.5  1998/05/27 22:34:00  rgb
- * Changed structures to accomodate key separation.
- *
- * Revision 1.4  1998/05/18 22:28:43  rgb
- * Disable key printing facilities from /proc/net/ipsec_*.
- *
- * Revision 1.3  1998/04/21 21:29:07  rgb
- * Rearrange debug switches to change on the fly debug output from user
- * space.  Only kernel changes checked in at this time.  radij.c was also
- * changed to temporarily remove buggy debugging code in rj_delete causing
- * an OOPS and hence, netlink device open errors.
- *
- * Revision 1.2  1998/04/12 22:03:20  rgb
- * Updated ESP-3DES-HMAC-MD5-96,
- * 	ESP-DES-HMAC-MD5-96,
- * 	AH-HMAC-MD5-96,
- * 	AH-HMAC-SHA1-96 since Henry started freeswan cvs repository
- * from old standards (RFC182[5-9] to new (as of March 1998) drafts.
- *
- * Fixed eroute references in /proc/net/ipsec*.
- *
- * Started to patch module unloading memory leaks in ipsec_netlink and
- * radij tree unloading.
- *
- * Revision 1.1  1998/04/09 03:06:00  henry
- * sources moved up from linux/net/ipsec
- *
- * Revision 1.1.1.1  1998/04/08 05:35:02  henry
- * RGB's ipsec-0.8pre2.tar.gz ipsec-0.8
- *
- * Revision 0.5  1997/06/03 04:24:48  ji
- * Added ESP-3DES-MD5-96 transform.
- *
- * Revision 0.4  1997/01/15 01:28:15  ji
- * Added definitions for new ESP transforms.
- *
- * Revision 0.3  1996/11/20 14:35:48  ji
- * Minor Cleanup.
- * Rationalized debugging code.
- *
- * Revision 0.2  1996/11/02 00:18:33  ji
- * First limited release.
- *
- *
- */
-
-
diff --git a/src/libfreeswan/ipsec_sa.h b/src/libfreeswan/ipsec_sa.h
index 555df42d3..4dd682569 100644
--- a/src/libfreeswan/ipsec_sa.h
+++ b/src/libfreeswan/ipsec_sa.h
@@ -250,89 +250,3 @@ enum ipsec_direction {
 
 #define _IPSEC_SA_H_
 #endif /* _IPSEC_SA_H_ */
-
-/*
- * $Log: ipsec_sa.h,v $
- * Revision 1.3  2004/04/28 08:07:11  as
- * added dhr's freeswan-2.06 changes
- *
- * Revision 1.2  2004/03/22 21:53:18  as
- * merged alg-0.8.1 branch with HEAD
- *
- * Revision 1.1.2.1.2.1  2004/03/16 09:48:18  as
- * alg-0.8.1rc12 patch merged
- *
- * Revision 1.1.2.1  2004/03/15 22:30:06  as
- * nat-0.6c patch merged
- *
- * Revision 1.1  2004/03/15 20:35:25  as
- * added files from freeswan-2.04-x509-1.5.3
- *
- * Revision 1.15  2003/05/11 00:53:09  mcr
- * 	IPsecSAref_t and macros were moved to freeswan.h.
- *
- * Revision 1.14  2003/02/12 19:31:55  rgb
- * Fixed bug in "file seen" machinery.
- * Updated copyright year.
- *
- * Revision 1.13  2003/01/30 02:31:52  rgb
- *
- * Re-wrote comments describing SAref system for accuracy.
- * Rename SAref table macro names for clarity.
- * Convert IPsecSAref_t from signed to unsigned to fix apparent SAref exhaustion bug.
- * Transmit error code through to caller from callee for better diagnosis of problems.
- * Enclose all macro arguments in parens to avoid any possible obscrure bugs.
- *
- * Revision 1.12  2002/10/07 18:31:19  rgb
- * Change comment to reflect the flexible nature of the main and sub-table widths.
- * Added a counter for the number of unused entries in each subtable.
- * Further break up host field type macro to host field.
- * Move field width sanity checks to ipsec_sa.c
- * Define a mask for an entire saref.
- *
- * Revision 1.11  2002/09/20 15:40:33  rgb
- * Re-write most of the SAref macros and types to eliminate any pointer references to Entrys.
- * Fixed SAref/nfmark macros.
- * Rework saref freeslist.
- * Place all ipsec sadb globals into one struct.
- * Restrict some bits to kernel context for use to klips utils.
- *
- * Revision 1.10  2002/09/20 05:00:34  rgb
- * Update copyright date.
- *
- * Revision 1.9  2002/09/17 17:19:29  mcr
- * 	make it compile even if there is no netfilter - we lost
- * 	functionality, but it works, especially on 2.2.
- *
- * Revision 1.8  2002/07/28 22:59:53  mcr
- * 	clarified/expanded one comment.
- *
- * Revision 1.7  2002/07/26 08:48:31  rgb
- * Added SA ref table code.
- *
- * Revision 1.6  2002/05/31 17:27:48  rgb
- * Comment fix.
- *
- * Revision 1.5  2002/05/27 18:55:03  rgb
- * Remove final vistiges of tdb references via IPSEC_KLIPS1_COMPAT.
- *
- * Revision 1.4  2002/05/23 07:13:36  rgb
- * Convert "usecount" to "refcount" to remove ambiguity.
- *
- * Revision 1.3  2002/04/24 07:36:47  mcr
- * Moved from ./klips/net/ipsec/ipsec_sa.h,v
- *
- * Revision 1.2  2001/11/26 09:16:15  rgb
- * Merge MCR's ipsec_sa, eroute, proc and struct lifetime changes.
- *
- * Revision 1.1.2.1  2001/09/25 02:24:58  mcr
- * 	struct tdb -> struct ipsec_sa.
- * 	sa(tdb) manipulation functions renamed and moved to ipsec_sa.c
- * 	ipsec_xform.c removed. header file still contains useful things.
- *
- *
- * Local variables:
- * c-file-style: "linux"
- * End:
- *
- */
diff --git a/src/libfreeswan/ipsec_sha1.h b/src/libfreeswan/ipsec_sha1.h
index 116170e6b..1319081ad 100644
--- a/src/libfreeswan/ipsec_sha1.h
+++ b/src/libfreeswan/ipsec_sha1.h
@@ -30,50 +30,3 @@ void SHA1Final(unsigned char digest[20], void *context);
 
  
 #endif /* _IPSEC_SHA1_H_ */
-
-/*
- * $Log: ipsec_sha1.h,v $
- * Revision 1.1  2004/03/15 20:35:25  as
- * added files from freeswan-2.04-x509-1.5.3
- *
- * Revision 1.7  2002/09/10 01:45:09  mcr
- * 	changed type of MD5_CTX and SHA1_CTX to void * so that
- * 	the function prototypes would match, and could be placed
- * 	into a pointer to a function.
- *
- * Revision 1.6  2002/04/24 07:36:47  mcr
- * Moved from ./klips/net/ipsec/ipsec_sha1.h,v
- *
- * Revision 1.5  1999/12/13 13:59:13  rgb
- * Quick fix to argument size to Update bugs.
- *
- * Revision 1.4  1999/12/07 18:16:23  rgb
- * Fixed comments at end of #endif lines.
- *
- * Revision 1.3  1999/04/06 04:54:27  rgb
- * Fix/Add RCSID Id: and Log: bits to make PHMDs happy.  This includes
- * patch shell fixes.
- *
- * Revision 1.2  1998/11/30 13:22:54  rgb
- * Rationalised all the klips kernel file headers.  They are much shorter
- * now and won't conflict under RH5.2.
- *
- * Revision 1.1  1998/06/18 21:27:50  henry
- * move sources from klips/src to klips/net/ipsec, to keep stupid
- * kernel-build scripts happier in the presence of symlinks
- *
- * Revision 1.2  1998/04/23 20:54:05  rgb
- * Fixed md5 and sha1 include file nesting issues, to be cleaned up when
- * verified.
- *
- * Revision 1.1  1998/04/09 03:04:21  henry
- * sources moved up from linux/net/ipsec
- * these two include files modified not to include others except in kernel
- *
- * Revision 1.1.1.1  1998/04/08 05:35:04  henry
- * RGB's ipsec-0.8pre2.tar.gz ipsec-0.8
- *
- * Revision 0.4  1997/01/15 01:28:15  ji
- * New transform
- *
- */
diff --git a/src/libfreeswan/ipsec_tunnel.h b/src/libfreeswan/ipsec_tunnel.h
index 3b25e95e1..672755946 100644
--- a/src/libfreeswan/ipsec_tunnel.h
+++ b/src/libfreeswan/ipsec_tunnel.h
@@ -16,6 +16,7 @@
  * RCSID $Id: ipsec_tunnel.h,v 1.1 2004/03/15 20:35:25 as Exp $
  */
 
+#include <linux/types.h>
 
 #ifdef NET_21
 # define DEV_QUEUE_XMIT(skb, device, pri) {\
@@ -125,141 +126,3 @@ extern int sysctl_ipsec_debug_verbose;
 #define DB_TN_OXFS	0x0080
 #define DB_TN_REVEC	0x0100
 #endif /* CONFIG_IPSEC_DEBUG */
-
-/*
- * $Log: ipsec_tunnel.h,v $
- * Revision 1.1  2004/03/15 20:35:25  as
- * added files from freeswan-2.04-x509-1.5.3
- *
- * Revision 1.28  2003/06/24 20:22:32  mcr
- * 	added new global: ipsecdevices[] so that we can keep track of
- * 	the ipsecX devices. They will be referenced with dev_hold(),
- * 	so 2.2 may need this as well.
- *
- * Revision 1.27  2003/04/03 17:38:09  rgb
- * Centralised ipsec_kfree_skb and ipsec_dev_{get,put}.
- *
- * Revision 1.26  2003/02/12 19:32:20  rgb
- * Updated copyright year.
- *
- * Revision 1.25  2002/05/27 18:56:07  rgb
- * Convert to dynamic ipsec device allocation.
- *
- * Revision 1.24  2002/04/24 07:36:48  mcr
- * Moved from ./klips/net/ipsec/ipsec_tunnel.h,v
- *
- * Revision 1.23  2001/11/06 19:50:44  rgb
- * Moved IP_SEND, ICMP_SEND, DEV_QUEUE_XMIT macros to ipsec_tunnel.h for
- * use also by pfkey_v2_parser.c
- *
- * Revision 1.22  2001/09/15 16:24:05  rgb
- * Re-inject first and last HOLD packet when an eroute REPLACE is done.
- *
- * Revision 1.21  2001/06/14 19:35:10  rgb
- * Update copyright date.
- *
- * Revision 1.20  2000/09/15 11:37:02  rgb
- * Merge in heavily modified Svenning Soerensen's <svenning@post5.tele.dk>
- * IPCOMP zlib deflate code.
- *
- * Revision 1.19  2000/09/08 19:12:56  rgb
- * Change references from DEBUG_IPSEC to CONFIG_IPSEC_DEBUG.
- *
- * Revision 1.18  2000/07/28 13:50:54  rgb
- * Changed enet_statistics to net_device_stats and added back compatibility
- * for pre-2.1.19.
- *
- * Revision 1.17  1999/11/19 01:12:15  rgb
- * Purge unneeded proc_info prototypes, now that static linking uses
- * dynamic proc_info registration.
- *
- * Revision 1.16  1999/11/18 18:51:00  rgb
- * Changed all device registrations for static linking to
- * dynamic to reduce the number and size of patches.
- *
- * Revision 1.15  1999/11/18 04:14:21  rgb
- * Replaced all kernel version macros to shorter, readable form.
- * Added CONFIG_PROC_FS compiler directives in case it is shut off.
- * Added Marc Boucher's 2.3.25 proc patches.
- *
- * Revision 1.14  1999/05/25 02:50:10  rgb
- * Fix kernel version macros for 2.0.x static linking.
- *
- * Revision 1.13  1999/05/25 02:41:06  rgb
- * Add ipsec_klipsdebug support for static linking.
- *
- * Revision 1.12  1999/05/05 22:02:32  rgb
- * Add a quick and dirty port to 2.2 kernels by Marc Boucher <marc@mbsi.ca>.
- *
- * Revision 1.11  1999/04/29 15:19:50  rgb
- * Add return values to init and cleanup functions.
- *
- * Revision 1.10  1999/04/16 16:02:39  rgb
- * Bump up macro to 4 ipsec I/Fs.
- *
- * Revision 1.9  1999/04/15 15:37:25  rgb
- * Forward check changes from POST1_00 branch.
- *
- * Revision 1.5.2.1  1999/04/02 04:26:14  rgb
- * Backcheck from HEAD, pre1.0.
- *
- * Revision 1.8  1999/04/11 00:29:01  henry
- * GPL boilerplate
- *
- * Revision 1.7  1999/04/06 04:54:28  rgb
- * Fix/Add RCSID Id: and Log: bits to make PHMDs happy.  This includes
- * patch shell fixes.
- *
- * Revision 1.6  1999/03/31 05:44:48  rgb
- * Keep PMTU reduction private.
- *
- * Revision 1.5  1999/02/10 22:31:20  rgb
- * Change rebuild_header member to reflect generality of link layer.
- *
- * Revision 1.4  1998/12/01 13:22:04  rgb
- * Added support for debug printing of version info.
- *
- * Revision 1.3  1998/07/29 20:42:46  rgb
- * Add a macro for clearing all tunnel devices.
- * Rearrange structures and declarations for sharing with userspace.
- *
- * Revision 1.2  1998/06/25 20:01:45  rgb
- * Make prototypes available for ipsec_init and ipsec proc_dir_entries
- * for static linking.
- *
- * Revision 1.1  1998/06/18 21:27:50  henry
- * move sources from klips/src to klips/net/ipsec, to keep stupid
- * kernel-build scripts happier in the presence of symlinks
- *
- * Revision 1.3  1998/05/18 21:51:50  rgb
- * Added macros for num of I/F's and a procfs debug switch.
- *
- * Revision 1.2  1998/04/21 21:29:09  rgb
- * Rearrange debug switches to change on the fly debug output from user
- * space.  Only kernel changes checked in at this time.  radij.c was also
- * changed to temporarily remove buggy debugging code in rj_delete causing
- * an OOPS and hence, netlink device open errors.
- *
- * Revision 1.1  1998/04/09 03:06:13  henry
- * sources moved up from linux/net/ipsec
- *
- * Revision 1.1.1.1  1998/04/08 05:35:05  henry
- * RGB's ipsec-0.8pre2.tar.gz ipsec-0.8
- *
- * Revision 0.5  1997/06/03 04:24:48  ji
- * Added transport mode.
- * Changed the way routing is done.
- * Lots of bug fixes.
- *
- * Revision 0.4  1997/01/15 01:28:15  ji
- * No changes.
- *
- * Revision 0.3  1996/11/20 14:39:04  ji
- * Minor cleanups.
- * Rationalized debugging code.
- *
- * Revision 0.2  1996/11/02 00:18:33  ji
- * First limited release.
- *
- *
- */
diff --git a/src/libfreeswan/ipsec_xform.h b/src/libfreeswan/ipsec_xform.h
index 1dc6b6083..80beb7345 100644
--- a/src/libfreeswan/ipsec_xform.h
+++ b/src/libfreeswan/ipsec_xform.h
@@ -82,193 +82,3 @@ static inline const char *auth_name_id (unsigned id) {
 
 #define _IPSEC_XFORM_H_
 #endif /* _IPSEC_XFORM_H_ */
-
-/*
- * $Log: ipsec_xform.h,v $
- * Revision 1.3  2004/09/29 22:26:13  as
- * included ipsec_policy.h
- *
- * Revision 1.2  2004/03/22 21:53:18  as
- * merged alg-0.8.1 branch with HEAD
- *
- * Revision 1.1.4.1  2004/03/16 09:48:18  as
- * alg-0.8.1rc12 patch merged
- *
- * Revision 1.1  2004/03/15 20:35:25  as
- * added files from freeswan-2.04-x509-1.5.3
- *
- * Revision 1.36  2002/04/24 07:36:48  mcr
- * Moved from ./klips/net/ipsec/ipsec_xform.h,v
- *
- * Revision 1.35  2001/11/26 09:23:51  rgb
- * Merge MCR's ipsec_sa, eroute, proc and struct lifetime changes.
- *
- * Revision 1.33.2.1  2001/09/25 02:24:58  mcr
- * 	struct tdb -> struct ipsec_sa.
- * 	sa(tdb) manipulation functions renamed and moved to ipsec_sa.c
- * 	ipsec_xform.c removed. header file still contains useful things.
- *
- * Revision 1.34  2001/11/06 19:47:17  rgb
- * Changed lifetime_packets to uint32 from uint64.
- *
- * Revision 1.33  2001/09/08 21:13:34  rgb
- * Added pfkey ident extension support for ISAKMPd. (NetCelo)
- *
- * Revision 1.32  2001/07/06 07:40:01  rgb
- * Reformatted for readability.
- * Added inbound policy checking fields for use with IPIP SAs.
- *
- * Revision 1.31  2001/06/14 19:35:11  rgb
- * Update copyright date.
- *
- * Revision 1.30  2001/05/30 08:14:03  rgb
- * Removed vestiges of esp-null transforms.
- *
- * Revision 1.29  2001/01/30 23:42:47  rgb
- * Allow pfkey msgs from pid other than user context required for ACQUIRE
- * and subsequent ADD or UDATE.
- *
- * Revision 1.28  2000/11/06 04:30:40  rgb
- * Add Svenning's adaptive content compression.
- *
- * Revision 1.27  2000/09/19 00:38:25  rgb
- * Fixed algorithm name bugs introduced for ipcomp.
- *
- * Revision 1.26  2000/09/17 21:36:48  rgb
- * Added proto2txt macro.
- *
- * Revision 1.25  2000/09/17 18:56:47  rgb
- * Added IPCOMP support.
- *
- * Revision 1.24  2000/09/12 19:34:12  rgb
- * Defined XF_IP6 from Gerhard for ipv6 tunnel support.
- *
- * Revision 1.23  2000/09/12 03:23:14  rgb
- * Cleaned out now unused tdb_xform and tdb_xdata members of struct tdb.
- *
- * Revision 1.22  2000/09/08 19:12:56  rgb
- * Change references from DEBUG_IPSEC to CONFIG_IPSEC_DEBUG.
- *
- * Revision 1.21  2000/09/01 18:32:43  rgb
- * Added (disabled) sensitivity members to tdb struct.
- *
- * Revision 1.20  2000/08/30 05:31:01  rgb
- * Removed all the rest of the references to tdb_spi, tdb_proto, tdb_dst.
- * Kill remainder of tdb_xform, tdb_xdata, xformsw.
- *
- * Revision 1.19  2000/08/01 14:51:52  rgb
- * Removed _all_ remaining traces of DES.
- *
- * Revision 1.18  2000/01/21 06:17:45  rgb
- * Tidied up spacing.
- *
- * Revision 1.17  1999/11/17 15:53:40  rgb
- * Changed all occurrences of #include "../../../lib/freeswan.h"
- * to #include <freeswan.h> which works due to -Ilibfreeswan in the
- * klips/net/ipsec/Makefile.
- *
- * Revision 1.16  1999/10/16 04:23:07  rgb
- * Add stats for replaywin_errs, replaywin_max_sequence_difference,
- * authentication errors, encryption size errors, encryption padding
- * errors, and time since last packet.
- *
- * Revision 1.15  1999/10/16 00:29:11  rgb
- * Added SA lifetime packet counting variables.
- *
- * Revision 1.14  1999/10/01 00:04:14  rgb
- * Added tdb structure locking.
- * Add function to initialize tdb hash table.
- *
- * Revision 1.13  1999/04/29 15:20:57  rgb
- * dd return values to init and cleanup functions.
- * Eliminate unnessessary usage of tdb_xform member to further switch
- * away from the transform switch to the algorithm switch.
- * Change gettdb parameter to a pointer to reduce stack loading and
- * facilitate parameter sanity checking.
- * Add a parameter to tdbcleanup to be able to delete a class of SAs.
- *
- * Revision 1.12  1999/04/15 15:37:25  rgb
- * Forward check changes from POST1_00 branch.
- *
- * Revision 1.9.2.2  1999/04/13 20:35:57  rgb
- * Fix spelling mistake in comment.
- *
- * Revision 1.9.2.1  1999/03/30 17:13:52  rgb
- * Extend struct tdb to support pfkey.
- *
- * Revision 1.11  1999/04/11 00:29:01  henry
- * GPL boilerplate
- *
- * Revision 1.10  1999/04/06 04:54:28  rgb
- * Fix/Add RCSID Id: and Log: bits to make PHMDs happy.  This includes
- * patch shell fixes.
- *
- * Revision 1.9  1999/01/26 02:09:31  rgb
- * Removed CONFIG_IPSEC_ALGO_SWITCH macro.
- * Removed dead code.
- *
- * Revision 1.8  1999/01/22 06:29:35  rgb
- * Added algorithm switch code.
- * Cruft clean-out.
- *
- * Revision 1.7  1998/11/10 05:37:35  rgb
- * Add support for SA direction flag.
- *
- * Revision 1.6  1998/10/19 14:44:29  rgb
- * Added inclusion of freeswan.h.
- * sa_id structure implemented and used: now includes protocol.
- *
- * Revision 1.5  1998/08/12 00:12:30  rgb
- * Added macros for new xforms.  Added prototypes for new xforms.
- *
- * Revision 1.4  1998/07/28 00:04:20  rgb
- * Add macro for clearing the SA table.
- *
- * Revision 1.3  1998/07/14 18:06:46  rgb
- * Added #ifdef __KERNEL__ directives to restrict scope of header.
- *
- * Revision 1.2  1998/06/23 03:02:19  rgb
- * Created a prototype for ipsec_tdbcleanup when it was moved from
- * ipsec_init.c.
- *
- * Revision 1.1  1998/06/18 21:27:51  henry
- * move sources from klips/src to klips/net/ipsec, to keep stupid
- * kernel-build scripts happier in the presence of symlinks
- *
- * Revision 1.4  1998/06/11 05:55:31  rgb
- * Added transform version string pointer to xformsw structure definition.
- * Added extern declarations for transform version strings.
- *
- * Revision 1.3  1998/05/18 22:02:54  rgb
- * Modify the *_zeroize function prototypes to include one parameter.
- *
- * Revision 1.2  1998/04/21 21:29:08  rgb
- * Rearrange debug switches to change on the fly debug output from user
- * space.  Only kernel changes checked in at this time.  radij.c was also
- * changed to temporarily remove buggy debugging code in rj_delete causing
- * an OOPS and hence, netlink device open errors.
- *
- * Revision 1.1  1998/04/09 03:06:14  henry
- * sources moved up from linux/net/ipsec
- *
- * Revision 1.1.1.1  1998/04/08 05:35:06  henry
- * RGB's ipsec-0.8pre2.tar.gz ipsec-0.8
- *
- * Revision 0.5  1997/06/03 04:24:48  ji
- * Added ESP-3DES-MD5-96
- *
- * Revision 0.4  1997/01/15 01:28:15  ji
- * Added new transforms.
- *
- * Revision 0.3  1996/11/20 14:39:04  ji
- * Minor cleanups.
- * Rationalized debugging code.
- *
- * Revision 0.2  1996/11/02 00:18:33  ji
- * First limited release.
- *
- * Local variables:
- * c-file-style: "linux"
- * End:
- *
- */
diff --git a/src/libfreeswan/pfkey.h b/src/libfreeswan/pfkey.h
index afa5ce032..01c404677 100644
--- a/src/libfreeswan/pfkey.h
+++ b/src/libfreeswan/pfkey.h
@@ -324,175 +324,3 @@ pfkey_v2_sadb_type_string(int sadb_type);
 
 
 #endif /* __NET_IPSEC_PF_KEY_H */
-
-/*
- * $Log: pfkey.h,v $
- * Revision 1.2  2004/03/22 21:53:18  as
- * merged alg-0.8.1 branch with HEAD
- *
- * Revision 1.1.2.1.2.1  2004/03/16 09:48:18  as
- * alg-0.8.1rc12 patch merged
- *
- * Revision 1.1.2.1  2004/03/15 22:30:06  as
- * nat-0.6c patch merged
- *
- * Revision 1.1  2004/03/15 20:35:25  as
- * added files from freeswan-2.04-x509-1.5.3
- *
- * Revision 1.42  2003/08/25 22:08:19  mcr
- * 	removed pfkey_proto_init() from pfkey.h for 2.6 support.
- *
- * Revision 1.41  2003/05/07 17:28:57  mcr
- * 	new function pfkey_debug_func added for us in debugging from
- * 	pfkey library.
- *
- * Revision 1.40  2003/01/30 02:31:34  rgb
- *
- * Convert IPsecSAref_t from signed to unsigned to fix apparent SAref exhaustion bug.
- *
- * Revision 1.39  2002/09/20 15:40:21  rgb
- * Switch from pfkey_alloc_ipsec_sa() to ipsec_sa_alloc().
- * Added ref parameter to pfkey_sa_build().
- * Cleaned out unused cruft.
- *
- * Revision 1.38  2002/05/14 02:37:24  rgb
- * Change all references to tdb, TDB or Tunnel Descriptor Block to ips,
- * ipsec_sa or ipsec_sa.
- * Added function prototypes for the functions moved to
- * pfkey_v2_ext_process.c.
- *
- * Revision 1.37  2002/04/24 07:36:49  mcr
- * Moved from ./lib/pfkey.h,v
- *
- * Revision 1.36  2002/01/20 20:34:49  mcr
- * 	added pfkey_v2_sadb_type_string to decode sadb_type to string.
- *
- * Revision 1.35  2001/11/27 05:27:47  mcr
- * 	pfkey parses are now maintained by a structure
- * 	that includes their name for debug purposes.
- *
- * Revision 1.34  2001/11/26 09:23:53  rgb
- * Merge MCR's ipsec_sa, eroute, proc and struct lifetime changes.
- *
- * Revision 1.33  2001/11/06 19:47:47  rgb
- * Added packet parameter to lifetime and comb structures.
- *
- * Revision 1.32  2001/09/08 21:13:34  rgb
- * Added pfkey ident extension support for ISAKMPd. (NetCelo)
- *
- * Revision 1.31  2001/06/14 19:35:16  rgb
- * Update copyright date.
- *
- * Revision 1.30  2001/02/27 07:04:52  rgb
- * Added satype2name prototype.
- *
- * Revision 1.29  2001/02/26 19:59:33  rgb
- * Ditch unused sadb_satype2proto[], replaced by satype2proto().
- *
- * Revision 1.28  2000/10/10 20:10:19  rgb
- * Added support for debug_ipcomp and debug_verbose to klipsdebug.
- *
- * Revision 1.27  2000/09/21 04:20:45  rgb
- * Fixed array size off-by-one error.  (Thanks Svenning!)
- *
- * Revision 1.26  2000/09/12 03:26:05  rgb
- * Added pfkey_acquire prototype.
- *
- * Revision 1.25  2000/09/08 19:21:28  rgb
- * Fix pfkey_prop_build() parameter to be only single indirection.
- *
- * Revision 1.24  2000/09/01 18:46:42  rgb
- * Added a supported algorithms array lists, one per satype and registered
- * existing algorithms.
- * Fixed pfkey_list_{insert,remove}_{socket,support}() to allow change to
- * list.
- *
- * Revision 1.23  2000/08/27 01:55:26  rgb
- * Define OCTETBITS and PFKEYBITS to avoid using 'magic' numbers in code.
- *
- * Revision 1.22  2000/08/20 21:39:23  rgb
- * Added kernel prototypes for kernel funcitions pfkey_upmsg() and
- * pfkey_expire().
- *
- * Revision 1.21  2000/08/15 17:29:23  rgb
- * Fixes from SZI to untested pfkey_prop_build().
- *
- * Revision 1.20  2000/05/10 20:14:19  rgb
- * Fleshed out sensitivity, proposal and supported extensions.
- *
- * Revision 1.19  2000/03/16 14:07:23  rgb
- * Renamed ALIGN macro to avoid fighting with others in kernel.
- *
- * Revision 1.18  2000/01/22 23:24:06  rgb
- * Added prototypes for proto2satype(), satype2proto() and proto2name().
- *
- * Revision 1.17  2000/01/21 06:26:59  rgb
- * Converted from double tdb arguments to one structure (extr)
- * containing pointers to all temporary information structures.
- * Added klipsdebug switching capability.
- * Dropped unused argument to pfkey_x_satype_build().
- *
- * Revision 1.16  1999/12/29 21:17:41  rgb
- * Changed pfkey_msg_build() I/F to include a struct sadb_msg**
- * parameter for cleaner manipulation of extensions[] and to guard
- * against potential memory leaks.
- * Changed the I/F to pfkey_msg_free() for the same reason.
- *
- * Revision 1.15  1999/12/09 23:12:54  rgb
- * Added macro for BITS_PER_OCTET.
- * Added argument to pfkey_sa_build() to do eroutes.
- *
- * Revision 1.14  1999/12/08 20:33:25  rgb
- * Changed sa_family_t to uint16_t for 2.0.xx compatibility.
- *
- * Revision 1.13  1999/12/07 19:53:40  rgb
- * Removed unused first argument from extension parsers.
- * Changed __u* types to uint* to avoid use of asm/types.h and
- * sys/types.h in userspace code.
- * Added function prototypes for pfkey message and extensions
- * initialisation and cleanup.
- *
- * Revision 1.12  1999/12/01 22:19:38  rgb
- * Change pfkey_sa_build to accept an SPI in network byte order.
- *
- * Revision 1.11  1999/11/27 11:55:26  rgb
- * Added extern sadb_satype2proto to enable moving protocol lookup table
- * to lib/pfkey_v2_parse.c.
- * Delete unused, moved typedefs.
- * Add argument to pfkey_msg_parse() for direction.
- * Consolidated the 4 1-d extension bitmap arrays into one 4-d array.
- *
- * Revision 1.10  1999/11/23 22:29:21  rgb
- * This file has been moved in the distribution from klips/net/ipsec to
- * lib.
- * Add macros for dealing with alignment and rounding up more opaquely.
- * The uint<n>_t type defines have been moved to freeswan.h to avoid
- * chicken-and-egg problems.
- * Add macros for dealing with alignment and rounding up more opaque.
- * Added prototypes for using extention header bitmaps.
- * Added prototypes of all the build functions.
- *
- * Revision 1.9  1999/11/20 21:59:48  rgb
- * Moved socketlist type declarations and prototypes for shared use.
- * Slightly modified scope of sockaddr_key declaration.
- *
- * Revision 1.8  1999/11/17 14:34:25  rgb
- * Protect sa_family_t from being used in userspace with GLIBC<2.
- *
- * Revision 1.7  1999/10/27 19:40:35  rgb
- * Add a maximum PFKEY packet size macro.
- *
- * Revision 1.6  1999/10/26 16:58:58  rgb
- * Created a sockaddr_key and key_opt socket extension structures.
- *
- * Revision 1.5  1999/06/10 05:24:41  rgb
- * Renamed variables to reduce confusion.
- *
- * Revision 1.4  1999/04/29 15:21:11  rgb
- * Add pfkey support to debugging.
- * Add return values to init and cleanup functions.
- *
- * Revision 1.3  1999/04/15 17:58:07  rgb
- * Add RCSID labels.
- *
- */
diff --git a/src/libfreeswan/pfkey_v2_debug.c b/src/libfreeswan/pfkey_v2_debug.c
index 8430766aa..8b4be384f 100644
--- a/src/libfreeswan/pfkey_v2_debug.c
+++ b/src/libfreeswan/pfkey_v2_debug.c
@@ -126,52 +126,3 @@ pfkey_v2_sadb_type_string(int sadb_type)
     return "unknown-sadb-type";
   }
 }
-
-
-
-
-/*
- * $Log: pfkey_v2_debug.c,v $
- * Revision 1.2  2004/03/22 21:53:18  as
- * merged alg-0.8.1 branch with HEAD
- *
- * Revision 1.1.2.1  2004/03/15 22:30:06  as
- * nat-0.6c patch merged
- *
- * Revision 1.1  2004/03/15 20:35:26  as
- * added files from freeswan-2.04-x509-1.5.3
- *
- * Revision 1.7  2002/09/20 05:01:26  rgb
- * Fixed limit inclusion error in both type and ext string conversion.
- *
- * Revision 1.6  2002/04/24 07:55:32  mcr
- * 	#include patches and Makefiles for post-reorg compilation.
- *
- * Revision 1.5  2002/04/24 07:36:40  mcr
- * Moved from ./lib/pfkey_v2_debug.c,v
- *
- * Revision 1.4  2002/01/29 22:25:36  rgb
- * Re-add ipsec_kversion.h to keep MALLOC happy.
- *
- * Revision 1.3  2002/01/29 01:59:09  mcr
- * 	removal of kversions.h - sources that needed it now use ipsec_param.h.
- * 	updating of IPv6 structures to match latest in6.h version.
- * 	removed dead code from freeswan.h that also duplicated kversions.h
- * 	code.
- *
- * Revision 1.2  2002/01/20 20:34:50  mcr
- * 	added pfkey_v2_sadb_type_string to decode sadb_type to string.
- *
- * Revision 1.1  2001/11/27 05:30:06  mcr
- * 	initial set of debug strings for pfkey debugging.
- * 	this will eventually only be included for debug builds.
- *
- * Revision 1.1  2001/09/21 04:12:03  mcr
- * 	first compilable version.
- *
- *
- * Local variables:
- * c-file-style: "linux"
- * End:
- *
- */
diff --git a/src/libfreeswan/pfkey_v2_ext_bits.c b/src/libfreeswan/pfkey_v2_ext_bits.c
index b41941848..280438750 100644
--- a/src/libfreeswan/pfkey_v2_ext_bits.c
+++ b/src/libfreeswan/pfkey_v2_ext_bits.c
@@ -722,68 +722,3 @@ unsigned int extensions_bitmaps[2/*in/out*/][2/*perm/req*/][SADB_MAX + 1/*ext*/]
 }
 }
 };
-
-/*
- * $Log: pfkey_v2_ext_bits.c,v $
- * Revision 1.2  2004/03/22 21:53:18  as
- * merged alg-0.8.1 branch with HEAD
- *
- * Revision 1.1.2.1  2004/03/15 22:30:06  as
- * nat-0.6c patch merged
- *
- * Revision 1.1  2004/03/15 20:35:26  as
- * added files from freeswan-2.04-x509-1.5.3
- *
- * Revision 1.15  2002/04/24 07:55:32  mcr
- * 	#include patches and Makefiles for post-reorg compilation.
- *
- * Revision 1.14  2002/04/24 07:36:40  mcr
- * Moved from ./lib/pfkey_v2_ext_bits.c,v
- *
- * Revision 1.13  2002/01/29 22:25:36  rgb
- * Re-add ipsec_kversion.h to keep MALLOC happy.
- *
- * Revision 1.12  2002/01/29 01:59:10  mcr
- * 	removal of kversions.h - sources that needed it now use ipsec_param.h.
- * 	updating of IPv6 structures to match latest in6.h version.
- * 	removed dead code from freeswan.h that also duplicated kversions.h
- * 	code.
- *
- * Revision 1.11  2001/10/18 04:45:24  rgb
- * 2.4.9 kernel deprecates linux/malloc.h in favour of linux/slab.h,
- * lib/freeswan.h version macros moved to lib/kversions.h.
- * Other compiler directive cleanups.
- *
- * Revision 1.10  2001/09/08 21:13:35  rgb
- * Added pfkey ident extension support for ISAKMPd. (NetCelo)
- *
- * Revision 1.9  2001/06/14 19:35:16  rgb
- * Update copyright date.
- *
- * Revision 1.8  2001/03/26 23:07:36  rgb
- * Remove requirement for auth and enc key from UPDATE.
- *
- * Revision 1.7  2000/09/12 22:35:37  rgb
- * Restructured to remove unused extensions from CLEARFLOW messages.
- *
- * Revision 1.6  2000/09/09 06:39:01  rgb
- * Added comments for clarity.
- *
- * Revision 1.5  2000/06/02 22:54:14  rgb
- * Added Gerhard Gessler's struct sockaddr_storage mods for IPv6 support.
- *
- * Revision 1.4  2000/01/21 06:27:56  rgb
- * Added address cases for eroute flows.
- * Added comments for each message type.
- * Added klipsdebug switching capability.
- * Fixed GRPSA bitfields.
- *
- * Revision 1.3  1999/12/01 22:20:27  rgb
- * Remove requirement for a proxy address in an incoming getspi message.
- *
- * Revision 1.2  1999/11/27 11:57:06  rgb
- * Consolidated the 4 1-d extension bitmap arrays into one 4-d array.
- * Add CVS log entry to bottom of file.
- * Cleaned out unused bits.
- *
- */
diff --git a/src/libfreeswan/pfkey_v2_parse.c b/src/libfreeswan/pfkey_v2_parse.c
index 440aa8c1d..c19ec1c99 100644
--- a/src/libfreeswan/pfkey_v2_parse.c
+++ b/src/libfreeswan/pfkey_v2_parse.c
@@ -1597,228 +1597,3 @@ errlab:
 
 	return error;
 }
-
-/*
- * $Log: pfkey_v2_parse.c,v $
- * Revision 1.4  2004/06/13 20:35:07  as
- * removed references to ipsec_netlink.h
- *
- * Revision 1.3  2004/03/30 10:00:17  as
- * 64 bit issues
- *
- * Revision 1.2  2004/03/22 21:53:18  as
- * merged alg-0.8.1 branch with HEAD
- *
- * Revision 1.1.2.1  2004/03/15 22:30:06  as
- * nat-0.6c patch merged
- *
- * Revision 1.1  2004/03/15 20:35:26  as
- * added files from freeswan-2.04-x509-1.5.3
- *
- * Revision 1.53  2003/01/30 02:32:09  rgb
- *
- * Rename SAref table macro names for clarity.
- * Convert IPsecSAref_t from signed to unsigned to fix apparent SAref exhaustion bug.
- *
- * Revision 1.52  2002/12/30 06:53:07  mcr
- * 	deal with short SA structures... #if 0 out for now. Probably
- * 	not quite the right way.
- *
- * Revision 1.51  2002/12/13 18:16:02  mcr
- * 	restored sa_ref code
- *
- * Revision 1.50  2002/12/13 18:06:52  mcr
- * 	temporarily removed sadb_x_sa_ref reference for 2.xx
- *
- * Revision 1.49  2002/10/05 05:02:58  dhr
- *
- * C labels go on statements
- *
- * Revision 1.48  2002/09/20 15:40:45  rgb
- * Added sadb_x_sa_ref to struct sadb_sa.
- *
- * Revision 1.47  2002/09/20 05:01:31  rgb
- * Fixed usage of pfkey_lib_debug.
- * Format for function declaration style consistency.
- * Added text labels to elucidate numeric values presented.
- * Re-organised debug output to reduce noise in output.
- *
- * Revision 1.46  2002/07/24 18:44:54  rgb
- * Type fiddling to tame ia64 compiler.
- *
- * Revision 1.45  2002/05/23 07:14:11  rgb
- * Cleaned up %p variants to 0p%p for test suite cleanup.
- *
- * Revision 1.44  2002/04/24 07:55:32  mcr
- * 	#include patches and Makefiles for post-reorg compilation.
- *
- * Revision 1.43  2002/04/24 07:36:40  mcr
- * Moved from ./lib/pfkey_v2_parse.c,v
- *
- * Revision 1.42  2002/01/29 22:25:36  rgb
- * Re-add ipsec_kversion.h to keep MALLOC happy.
- *
- * Revision 1.41  2002/01/29 01:59:10  mcr
- * 	removal of kversions.h - sources that needed it now use ipsec_param.h.
- * 	updating of IPv6 structures to match latest in6.h version.
- * 	removed dead code from freeswan.h that also duplicated kversions.h
- * 	code.
- *
- * Revision 1.40  2002/01/20 20:34:50  mcr
- * 	added pfkey_v2_sadb_type_string to decode sadb_type to string.
- *
- * Revision 1.39  2001/11/27 05:29:22  mcr
- * 	pfkey parses are now maintained by a structure
- * 	that includes their name for debug purposes.
- * 	DEBUGGING() macro changed so that it takes a debug
- * 	level so that pf_key() can use this to decode the
- * 	structures without innundanting humans.
- * 	Also uses pfkey_v2_sadb_ext_string() in messages.
- *
- * Revision 1.38  2001/11/06 19:47:47  rgb
- * Added packet parameter to lifetime and comb structures.
- *
- * Revision 1.37  2001/10/18 04:45:24  rgb
- * 2.4.9 kernel deprecates linux/malloc.h in favour of linux/slab.h,
- * lib/freeswan.h version macros moved to lib/kversions.h.
- * Other compiler directive cleanups.
- *
- * Revision 1.36  2001/06/14 19:35:16  rgb
- * Update copyright date.
- *
- * Revision 1.35  2001/05/03 19:44:51  rgb
- * Standardise on SENDERR() macro.
- *
- * Revision 1.34  2001/03/16 07:41:51  rgb
- * Put freeswan.h include before pluto includes.
- *
- * Revision 1.33  2001/02/27 07:13:51  rgb
- * Added satype2name() function.
- * Added text to default satype_tbl entry.
- * Added satype2name() conversions for most satype debug output.
- *
- * Revision 1.32  2001/02/26 20:01:09  rgb
- * Added internal IP protocol 61 for magic SAs.
- * Ditch unused sadb_satype2proto[], replaced by satype2proto().
- * Re-formatted debug output (split lines, consistent spacing).
- * Removed acquire, register and expire requirements for a known satype.
- * Changed message type checking to a switch structure.
- * Verify expected NULL auth for IPCOMP.
- * Enforced spi > 0x100 requirement, now that pass uses a magic SA for
- * appropriate message types.
- *
- * Revision 1.31  2000/12/01 07:09:00  rgb
- * Added ipcomp sanity check to require encalgo is set.
- *
- * Revision 1.30  2000/11/17 18:10:30  rgb
- * Fixed bugs mostly relating to spirange, to treat all spi variables as
- * network byte order since this is the way PF_KEYv2 stored spis.
- *
- * Revision 1.29  2000/10/12 00:02:39  rgb
- * Removed 'format, ##' nonsense from debug macros for RH7.0.
- *
- * Revision 1.28  2000/09/20 16:23:04  rgb
- * Remove over-paranoid extension check in the presence of sadb_msg_errno.
- *
- * Revision 1.27  2000/09/20 04:04:21  rgb
- * Changed static functions to DEBUG_NO_STATIC to reveal function names in
- * oopsen.
- *
- * Revision 1.26  2000/09/15 11:37:02  rgb
- * Merge in heavily modified Svenning Soerensen's <svenning@post5.tele.dk>
- * IPCOMP zlib deflate code.
- *
- * Revision 1.25  2000/09/12 22:35:37  rgb
- * Restructured to remove unused extensions from CLEARFLOW messages.
- *
- * Revision 1.24  2000/09/12 18:59:54  rgb
- * Added Gerhard's IPv6 support to pfkey parts of libfreeswan.
- *
- * Revision 1.23  2000/09/12 03:27:00  rgb
- * Moved DEBUGGING definition to compile kernel with debug off.
- *
- * Revision 1.22  2000/09/09 06:39:27  rgb
- * Restrict pfkey errno check to downward messages only.
- *
- * Revision 1.21  2000/09/08 19:22:34  rgb
- * Enabled pfkey_sens_parse().
- * Added check for errno on downward acquire messages only.
- *
- * Revision 1.20  2000/09/01 18:48:23  rgb
- * Fixed reserved check bug and added debug output in
- * pfkey_supported_parse().
- * Fixed debug output label bug in pfkey_ident_parse().
- *
- * Revision 1.19  2000/08/27 01:55:26  rgb
- * Define OCTETBITS and PFKEYBITS to avoid using 'magic' numbers in code.
- *
- * Revision 1.18  2000/08/24 17:00:36  rgb
- * Ignore unknown extensions instead of failing.
- *
- * Revision 1.17  2000/06/02 22:54:14  rgb
- * Added Gerhard Gessler's struct sockaddr_storage mods for IPv6 support.
- *
- * Revision 1.16  2000/05/10 19:25:11  rgb
- * Fleshed out proposal and supported extensions.
- *
- * Revision 1.15  2000/01/24 21:15:31  rgb
- * Added disabled pluto pfkey lib debug flag.
- * Added algo debugging reporting.
- *
- * Revision 1.14  2000/01/22 23:24:29  rgb
- * Added new functions proto2satype() and satype2proto() and lookup
- * table satype_tbl.  Also added proto2name() since it was easy.
- *
- * Revision 1.13  2000/01/21 09:43:59  rgb
- * Cast ntohl(spi) as (unsigned long int) to shut up compiler.
- *
- * Revision 1.12  2000/01/21 06:28:19  rgb
- * Added address cases for eroute flows.
- * Indented compiler directives for readability.
- * Added klipsdebug switching capability.
- *
- * Revision 1.11  1999/12/29 21:14:59  rgb
- * Fixed debug text cut and paste typo.
- *
- * Revision 1.10  1999/12/10 17:45:24  rgb
- * Added address debugging.
- *
- * Revision 1.9  1999/12/09 23:11:42  rgb
- * Ditched <string.h> include since we no longer use memset().
- * Use new pfkey_extensions_init() instead of memset().
- * Added check for SATYPE in pfkey_msg_build().
- * Tidy up comments and debugging comments.
- *
- * Revision 1.8  1999/12/07 19:55:26  rgb
- * Removed unused first argument from extension parsers.
- * Removed static pluto debug flag.
- * Moved message type and state checking to pfkey_msg_parse().
- * Changed print[fk] type from lx to x to quiet compiler.
- * Removed redundant remain check.
- * Changed __u* types to uint* to avoid use of asm/types.h and
- * sys/types.h in userspace code.
- *
- * Revision 1.7  1999/12/01 22:20:51  rgb
- * Moved pfkey_lib_debug variable into the library.
- * Added pfkey version check into header parsing.
- * Added check for SATYPE only for those extensions that require a
- * non-zero value.
- *
- * Revision 1.6  1999/11/27 11:58:05  rgb
- * Added ipv6 headers.
- * Moved sadb_satype2proto protocol lookup table from
- * klips/net/ipsec/pfkey_v2_parser.c.
- * Enable lifetime_current checking.
- * Debugging error messages added.
- * Add argument to pfkey_msg_parse() for direction.
- * Consolidated the 4 1-d extension bitmap arrays into one 4-d array.
- * Add CVS log entry to bottom of file.
- * Moved auth and enc alg check to pfkey_msg_parse().
- * Enable accidentally disabled spirange parsing.
- * Moved protocol/algorithm checks from klips/net/ipsec/pfkey_v2_parser.c
- *
- * Local variables:
- * c-file-style: "linux"
- * End:
- *
- */
diff --git a/src/libfreeswan/radij.h b/src/libfreeswan/radij.h
index 2a66093a0..7fe30a6ea 100644
--- a/src/libfreeswan/radij.h
+++ b/src/libfreeswan/radij.h
@@ -199,82 +199,3 @@ extern int maj_keylen;
 #endif /* __KERNEL__ */
 
 #endif /* _RADIJ_H_ */
-
-
-/*
- * $Log: radij.h,v $
- * Revision 1.1  2004/03/15 20:35:25  as
- * added files from freeswan-2.04-x509-1.5.3
- *
- * Revision 1.12  2002/04/24 07:36:48  mcr
- * Moved from ./klips/net/ipsec/radij.h,v
- *
- * Revision 1.11  2001/09/20 15:33:00  rgb
- * Min/max cleanup.
- *
- * Revision 1.10  1999/11/18 04:09:20  rgb
- * Replaced all kernel version macros to shorter, readable form.
- *
- * Revision 1.9  1999/05/05 22:02:33  rgb
- * Add a quick and dirty port to 2.2 kernels by Marc Boucher <marc@mbsi.ca>.
- *
- * Revision 1.8  1999/04/29 15:24:58  rgb
- * Add check for existence of macros min/max.
- *
- * Revision 1.7  1999/04/11 00:29:02  henry
- * GPL boilerplate
- *
- * Revision 1.6  1999/04/06 04:54:29  rgb
- * Fix/Add RCSID Id: and Log: bits to make PHMDs happy.  This includes
- * patch shell fixes.
- *
- * Revision 1.5  1999/01/22 06:30:32  rgb
- * 64-bit clean-up.
- *
- * Revision 1.4  1998/11/30 13:22:55  rgb
- * Rationalised all the klips kernel file headers.  They are much shorter
- * now and won't conflict under RH5.2.
- *
- * Revision 1.3  1998/10/25 02:43:27  rgb
- * Change return type on rj_addroute and rj_delete and add and argument
- * to the latter to be able to transmit more infomation about errors.
- *
- * Revision 1.2  1998/07/14 18:09:51  rgb
- * Add a routine to clear eroute table.
- * Added #ifdef __KERNEL__ directives to restrict scope of header.
- *
- * Revision 1.1  1998/06/18 21:30:22  henry
- * move sources from klips/src to klips/net/ipsec to keep stupid kernel
- * build scripts happier about symlinks
- *
- * Revision 1.4  1998/05/25 20:34:16  rgb
- * Remove temporary ipsec_walk, rj_deltree and rj_delnodes functions.
- *
- * Rename ipsec_rj_walker (ipsec_walk) to ipsec_rj_walker_procprint and
- * add ipsec_rj_walker_delete.
- *
- * Recover memory for eroute table on unload of module.
- *
- * Revision 1.3  1998/04/22 16:51:37  rgb
- * Tidy up radij debug code from recent rash of modifications to debug code.
- *
- * Revision 1.2  1998/04/14 17:30:38  rgb
- * Fix up compiling errors for radij tree memory reclamation.
- *
- * Revision 1.1  1998/04/09 03:06:16  henry
- * sources moved up from linux/net/ipsec
- *
- * Revision 1.1.1.1  1998/04/08 05:35:04  henry
- * RGB's ipsec-0.8pre2.tar.gz ipsec-0.8
- *
- * Revision 0.4  1997/01/15 01:28:15  ji
- * No changes.
- *
- * Revision 0.3  1996/11/20 14:44:45  ji
- * Release update only.
- *
- * Revision 0.2  1996/11/02 00:18:33  ji
- * First limited release.
- *
- *
- */