[svn-upgrade] Integrating new upstream version, strongswan (4.1.3)

1 files changed, 0 insertions, 172 deletions

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.
- *
- */