Update to ipsec-tools 0.6.1 trunk
authormanu <manu@NetBSD.org>
Sat, 20 Aug 2005 00:57:06 +0000
branchtrunk
changeset 139254 3d94d4b59e61
parent 139253 c302328c2681
child 139255 100a8325c606
Update to ipsec-tools 0.6.1
crypto/dist/ipsec-tools/ChangeLog
crypto/dist/ipsec-tools/netbsd-import.sh
crypto/dist/ipsec-tools/src/include-glibc/glibc-bugs.h
crypto/dist/ipsec-tools/src/include-glibc/net/pfkeyv2.h
crypto/dist/ipsec-tools/src/include-glibc/netinet/ipsec.h
crypto/dist/ipsec-tools/src/include-glibc/sys/queue.h
crypto/dist/ipsec-tools/src/libipsec/ipsec_dump_policy.c
crypto/dist/ipsec-tools/src/libipsec/ipsec_get_policylen.c
crypto/dist/ipsec-tools/src/libipsec/ipsec_set_policy.3
crypto/dist/ipsec-tools/src/libipsec/ipsec_strerror.3
crypto/dist/ipsec-tools/src/libipsec/ipsec_strerror.c
crypto/dist/ipsec-tools/src/libipsec/ipsec_strerror.h
crypto/dist/ipsec-tools/src/libipsec/key_debug.c
crypto/dist/ipsec-tools/src/libipsec/libpfkey.h
crypto/dist/ipsec-tools/src/libipsec/pfkey.c
crypto/dist/ipsec-tools/src/libipsec/pfkey_dump.c
crypto/dist/ipsec-tools/src/libipsec/policy_parse.y
crypto/dist/ipsec-tools/src/libipsec/policy_token.l
crypto/dist/ipsec-tools/src/libipsec/test-policy-priority.c
crypto/dist/ipsec-tools/src/libipsec/test-policy.c
crypto/dist/ipsec-tools/src/racoon/admin.c
crypto/dist/ipsec-tools/src/racoon/admin.h
crypto/dist/ipsec-tools/src/racoon/admin_var.h
crypto/dist/ipsec-tools/src/racoon/algorithm.c
crypto/dist/ipsec-tools/src/racoon/algorithm.h
crypto/dist/ipsec-tools/src/racoon/backupsa.c
crypto/dist/ipsec-tools/src/racoon/backupsa.h
crypto/dist/ipsec-tools/src/racoon/cfparse.y
crypto/dist/ipsec-tools/src/racoon/cfparse_proto.h
crypto/dist/ipsec-tools/src/racoon/cftoken.l
crypto/dist/ipsec-tools/src/racoon/cftoken_proto.h
crypto/dist/ipsec-tools/src/racoon/crypto_openssl.c
crypto/dist/ipsec-tools/src/racoon/crypto_openssl.h
crypto/dist/ipsec-tools/src/racoon/debug.h
crypto/dist/ipsec-tools/src/racoon/debugrm.c
crypto/dist/ipsec-tools/src/racoon/debugrm.h
crypto/dist/ipsec-tools/src/racoon/dhgroup.h
crypto/dist/ipsec-tools/src/racoon/dnssec.c
crypto/dist/ipsec-tools/src/racoon/dnssec.h
crypto/dist/ipsec-tools/src/racoon/dump.c
crypto/dist/ipsec-tools/src/racoon/dump.h
crypto/dist/ipsec-tools/src/racoon/eaytest.c
crypto/dist/ipsec-tools/src/racoon/evt.c
crypto/dist/ipsec-tools/src/racoon/evt.h
crypto/dist/ipsec-tools/src/racoon/gcmalloc.h
crypto/dist/ipsec-tools/src/racoon/genlist.c
crypto/dist/ipsec-tools/src/racoon/genlist.h
crypto/dist/ipsec-tools/src/racoon/getcertsbyname.c
crypto/dist/ipsec-tools/src/racoon/gnuc.h
crypto/dist/ipsec-tools/src/racoon/grabmyaddr.c
crypto/dist/ipsec-tools/src/racoon/grabmyaddr.h
crypto/dist/ipsec-tools/src/racoon/gssapi.c
crypto/dist/ipsec-tools/src/racoon/gssapi.h
crypto/dist/ipsec-tools/src/racoon/handler.c
crypto/dist/ipsec-tools/src/racoon/handler.h
crypto/dist/ipsec-tools/src/racoon/ipsec_doi.c
crypto/dist/ipsec-tools/src/racoon/ipsec_doi.h
crypto/dist/ipsec-tools/src/racoon/isakmp.c
crypto/dist/ipsec-tools/src/racoon/isakmp.h
crypto/dist/ipsec-tools/src/racoon/isakmp_agg.c
crypto/dist/ipsec-tools/src/racoon/isakmp_agg.h
crypto/dist/ipsec-tools/src/racoon/isakmp_base.c
crypto/dist/ipsec-tools/src/racoon/isakmp_base.h
crypto/dist/ipsec-tools/src/racoon/isakmp_cfg.c
crypto/dist/ipsec-tools/src/racoon/isakmp_cfg.h
crypto/dist/ipsec-tools/src/racoon/isakmp_frag.c
crypto/dist/ipsec-tools/src/racoon/isakmp_frag.h
crypto/dist/ipsec-tools/src/racoon/isakmp_ident.c
crypto/dist/ipsec-tools/src/racoon/isakmp_ident.h
crypto/dist/ipsec-tools/src/racoon/isakmp_inf.c
crypto/dist/ipsec-tools/src/racoon/isakmp_inf.h
crypto/dist/ipsec-tools/src/racoon/isakmp_newg.c
crypto/dist/ipsec-tools/src/racoon/isakmp_newg.h
crypto/dist/ipsec-tools/src/racoon/isakmp_quick.c
crypto/dist/ipsec-tools/src/racoon/isakmp_quick.h
crypto/dist/ipsec-tools/src/racoon/isakmp_unity.c
crypto/dist/ipsec-tools/src/racoon/isakmp_unity.h
crypto/dist/ipsec-tools/src/racoon/isakmp_var.h
crypto/dist/ipsec-tools/src/racoon/isakmp_xauth.c
crypto/dist/ipsec-tools/src/racoon/isakmp_xauth.h
crypto/dist/ipsec-tools/src/racoon/kmpstat.c
crypto/dist/ipsec-tools/src/racoon/localconf.c
crypto/dist/ipsec-tools/src/racoon/localconf.h
crypto/dist/ipsec-tools/src/racoon/logger.c
crypto/dist/ipsec-tools/src/racoon/logger.h
crypto/dist/ipsec-tools/src/racoon/main.c
crypto/dist/ipsec-tools/src/racoon/misc.c
crypto/dist/ipsec-tools/src/racoon/misc.h
crypto/dist/ipsec-tools/src/racoon/missing/crypto/rijndael/rijndael-alg-fst.c
crypto/dist/ipsec-tools/src/racoon/missing/crypto/rijndael/rijndael-alg-fst.h
crypto/dist/ipsec-tools/src/racoon/missing/crypto/rijndael/rijndael-api-fst.c
crypto/dist/ipsec-tools/src/racoon/missing/crypto/rijndael/rijndael-api-fst.h
crypto/dist/ipsec-tools/src/racoon/missing/crypto/rijndael/rijndael.h
crypto/dist/ipsec-tools/src/racoon/missing/crypto/rijndael/rijndael_local.h
crypto/dist/ipsec-tools/src/racoon/missing/crypto/sha2/sha2.c
crypto/dist/ipsec-tools/src/racoon/missing/crypto/sha2/sha2.h
crypto/dist/ipsec-tools/src/racoon/missing/strdup.c
crypto/dist/ipsec-tools/src/racoon/nattraversal.c
crypto/dist/ipsec-tools/src/racoon/nattraversal.h
crypto/dist/ipsec-tools/src/racoon/netdb_dnssec.h
crypto/dist/ipsec-tools/src/racoon/oakley.c
crypto/dist/ipsec-tools/src/racoon/oakley.h
crypto/dist/ipsec-tools/src/racoon/pfkey.c
crypto/dist/ipsec-tools/src/racoon/pfkey.h
crypto/dist/ipsec-tools/src/racoon/plainrsa-gen.8
crypto/dist/ipsec-tools/src/racoon/plainrsa-gen.c
crypto/dist/ipsec-tools/src/racoon/plog.c
crypto/dist/ipsec-tools/src/racoon/plog.h
crypto/dist/ipsec-tools/src/racoon/policy.c
crypto/dist/ipsec-tools/src/racoon/policy.h
crypto/dist/ipsec-tools/src/racoon/privsep.c
crypto/dist/ipsec-tools/src/racoon/privsep.h
crypto/dist/ipsec-tools/src/racoon/proposal.c
crypto/dist/ipsec-tools/src/racoon/proposal.h
crypto/dist/ipsec-tools/src/racoon/prsa_par.y
crypto/dist/ipsec-tools/src/racoon/prsa_tok.l
crypto/dist/ipsec-tools/src/racoon/racoon.8
crypto/dist/ipsec-tools/src/racoon/racoon.conf.5
crypto/dist/ipsec-tools/src/racoon/racoonctl.8
crypto/dist/ipsec-tools/src/racoon/racoonctl.c
crypto/dist/ipsec-tools/src/racoon/racoonctl.h
crypto/dist/ipsec-tools/src/racoon/remoteconf.c
crypto/dist/ipsec-tools/src/racoon/remoteconf.h
crypto/dist/ipsec-tools/src/racoon/rsalist.c
crypto/dist/ipsec-tools/src/racoon/rsalist.h
crypto/dist/ipsec-tools/src/racoon/safefile.c
crypto/dist/ipsec-tools/src/racoon/safefile.h
crypto/dist/ipsec-tools/src/racoon/sainfo.c
crypto/dist/ipsec-tools/src/racoon/sainfo.h
crypto/dist/ipsec-tools/src/racoon/schedule.c
crypto/dist/ipsec-tools/src/racoon/schedule.h
crypto/dist/ipsec-tools/src/racoon/session.c
crypto/dist/ipsec-tools/src/racoon/session.h
crypto/dist/ipsec-tools/src/racoon/sockmisc.c
crypto/dist/ipsec-tools/src/racoon/sockmisc.h
crypto/dist/ipsec-tools/src/racoon/str2val.c
crypto/dist/ipsec-tools/src/racoon/str2val.h
crypto/dist/ipsec-tools/src/racoon/strnames.c
crypto/dist/ipsec-tools/src/racoon/strnames.h
crypto/dist/ipsec-tools/src/racoon/throttle.c
crypto/dist/ipsec-tools/src/racoon/throttle.h
crypto/dist/ipsec-tools/src/racoon/var.h
crypto/dist/ipsec-tools/src/racoon/vendorid.c
crypto/dist/ipsec-tools/src/racoon/vendorid.h
crypto/dist/ipsec-tools/src/racoon/vmbuf.c
crypto/dist/ipsec-tools/src/racoon/vmbuf.h
crypto/dist/ipsec-tools/src/setkey/extern.h
crypto/dist/ipsec-tools/src/setkey/parse.y
crypto/dist/ipsec-tools/src/setkey/setkey.8
crypto/dist/ipsec-tools/src/setkey/setkey.c
crypto/dist/ipsec-tools/src/setkey/test-pfkey.c
crypto/dist/ipsec-tools/src/setkey/token.l
crypto/dist/ipsec-tools/src/setkey/vchar.h
doc/CHANGES
lib/libipsec/package_version.h
--- a/crypto/dist/ipsec-tools/ChangeLog	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/ChangeLog	Sat Aug 20 00:57:06 2005 +0000
@@ -1,3 +1,26 @@
+---------------------------------------------
+
+	0.6.1 released
+
+2005-08-14  Emmanuel Dreyfus  <manu@netbsd.org>
+
+	From Francis Dupont <Francis.Dupont@enst-bretagne.fr>
+	* src/racoon/dnssec.c: fix bogus test on function result
+
+2005-08-11  Yvan Vanhullebus  <vanhu@free.fr>
+
+	* src/racoon/isakmp.c: Improved in/out SA addresses check in
+	  purge_remote(). Reported by Patrick Ma.
+
+2005-08-08  Emmanuel Dreyfus  <manu@netbsd.org>
+
+	* src/libipsec/{key_debug.c|pfkey.c|pfkey_dump.c}: de-lint, warnings
+
+2005-08-08  Yvan Vanhullebus  <vanhu@free.fr>
+
+	* src/racoon/privsep.c: Fixed a %d -> %zu in
+	port_check() (reported by Matthias Scheler).
+
 ---------------------------------------------
 
 	0.6.1.rc1 released
--- a/crypto/dist/ipsec-tools/netbsd-import.sh	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/netbsd-import.sh	Sat Aug 20 00:57:06 2005 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-#	$NetBSD: netbsd-import.sh,v 1.1.1.3 2005/08/07 08:46:13 manu Exp $
+#	$NetBSD: netbsd-import.sh,v 1.2 2005/08/20 00:57:06 manu Exp $
 #
 # Copyright (c) 2000-2005 The NetBSD Foundation, Inc.
 # All rights reserved.
--- a/crypto/dist/ipsec-tools/src/include-glibc/glibc-bugs.h	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/include-glibc/glibc-bugs.h	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: glibc-bugs.h,v 1.1.1.2 2005/02/23 14:54:07 manu Exp $	*/
+/*	$NetBSD: glibc-bugs.h,v 1.2 2005/08/20 00:57:06 manu Exp $	*/
 
 #ifndef __GLIBC_BUGS_H__
 #define __GLIBC_BUGS_H__ 1
--- a/crypto/dist/ipsec-tools/src/include-glibc/net/pfkeyv2.h	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/include-glibc/net/pfkeyv2.h	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: pfkeyv2.h,v 1.1.1.2 2005/02/23 14:54:07 manu Exp $	*/
+/*	$NetBSD: pfkeyv2.h,v 1.2 2005/08/20 00:57:06 manu Exp $	*/
 
 #ifndef __NET_PFKEYV2_H_
 #define __NET_PFKEYV2_H_ 1
--- a/crypto/dist/ipsec-tools/src/include-glibc/netinet/ipsec.h	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/include-glibc/netinet/ipsec.h	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: ipsec.h,v 1.1.1.2 2005/02/23 14:54:07 manu Exp $	*/
+/*	$NetBSD: ipsec.h,v 1.2 2005/08/20 00:57:06 manu Exp $	*/
 
 #include <net/pfkeyv2.h>
 #include <linux/ipsec.h>
--- a/crypto/dist/ipsec-tools/src/include-glibc/sys/queue.h	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/include-glibc/sys/queue.h	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: queue.h,v 1.1.1.2 2005/02/23 14:54:07 manu Exp $	*/
+/*	$NetBSD: queue.h,v 1.2 2005/08/20 00:57:06 manu Exp $	*/
 
 /*
  * Copyright (c) 1991, 1993
--- a/crypto/dist/ipsec-tools/src/libipsec/ipsec_dump_policy.c	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/libipsec/ipsec_dump_policy.c	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: ipsec_dump_policy.c,v 1.4 2005/08/07 09:38:45 manu Exp $	*/
+/*	$NetBSD: ipsec_dump_policy.c,v 1.5 2005/08/20 00:57:06 manu Exp $	*/
 
 /* Id: ipsec_dump_policy.c,v 1.7.4.2 2005/06/29 13:01:27 manubsd Exp */
 
--- a/crypto/dist/ipsec-tools/src/libipsec/ipsec_get_policylen.c	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/libipsec/ipsec_get_policylen.c	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: ipsec_get_policylen.c,v 1.3 2005/08/07 09:38:45 manu Exp $	*/
+/*	$NetBSD: ipsec_get_policylen.c,v 1.4 2005/08/20 00:57:06 manu Exp $	*/
 
 /*	$KAME: ipsec_get_policylen.c,v 1.5 2000/05/07 05:25:03 itojun Exp $	*/
 
--- a/crypto/dist/ipsec-tools/src/libipsec/ipsec_set_policy.3	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/libipsec/ipsec_set_policy.3	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-.\"	$NetBSD: ipsec_set_policy.3,v 1.10 2005/08/07 09:38:45 manu Exp $
+.\"	$NetBSD: ipsec_set_policy.3,v 1.11 2005/08/20 00:57:06 manu Exp $
 .\"
 .\"	$KAME: ipsec_set_policy.3,v 1.16 2003/01/06 21:59:03 sumikawa Exp $
 .\"
--- a/crypto/dist/ipsec-tools/src/libipsec/ipsec_strerror.3	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/libipsec/ipsec_strerror.3	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-.\"	$NetBSD: ipsec_strerror.3,v 1.7 2005/08/07 09:38:45 manu Exp $
+.\"	$NetBSD: ipsec_strerror.3,v 1.8 2005/08/20 00:57:06 manu Exp $
 .\"
 .\"	$KAME: ipsec_strerror.3,v 1.9 2001/08/17 07:21:36 itojun Exp $
 .\"
--- a/crypto/dist/ipsec-tools/src/libipsec/ipsec_strerror.c	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/libipsec/ipsec_strerror.c	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: ipsec_strerror.c,v 1.1.1.2 2005/02/23 14:54:07 manu Exp $	*/
+/*	$NetBSD: ipsec_strerror.c,v 1.2 2005/08/20 00:57:06 manu Exp $	*/
 
 /*	$KAME: ipsec_strerror.c,v 1.7 2000/07/30 00:45:12 itojun Exp $	*/
 
--- a/crypto/dist/ipsec-tools/src/libipsec/ipsec_strerror.h	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/libipsec/ipsec_strerror.h	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: ipsec_strerror.h,v 1.1.1.2 2005/02/23 14:54:07 manu Exp $	*/
+/*	$NetBSD: ipsec_strerror.h,v 1.2 2005/08/20 00:57:06 manu Exp $	*/
 
 /* Id: ipsec_strerror.h,v 1.4 2004/06/07 09:18:46 ludvigm Exp */
 
--- a/crypto/dist/ipsec-tools/src/libipsec/key_debug.c	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/libipsec/key_debug.c	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: key_debug.c,v 1.4 2005/08/07 09:38:45 manu Exp $	*/
+/*	$NetBSD: key_debug.c,v 1.5 2005/08/20 00:57:06 manu Exp $	*/
 
 /*	$KAME: key_debug.c,v 1.29 2001/08/16 14:25:41 itojun Exp $	*/
 
@@ -401,7 +401,7 @@
 	}
 
 	ipsec_hexdump(key + sizeof(struct sadb_key),
-	              (int)(uint32_t)key->sadb_key_bits >> 3);
+	              (int)((uint32_t)key->sadb_key_bits >> 3));
 	printf(" }\n");
 	return;
 }
--- a/crypto/dist/ipsec-tools/src/libipsec/libpfkey.h	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/libipsec/libpfkey.h	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: libpfkey.h,v 1.6 2005/08/07 09:38:45 manu Exp $	*/
+/*	$NetBSD: libpfkey.h,v 1.7 2005/08/20 00:57:06 manu Exp $	*/
 
 /* Id: libpfkey.h,v 1.8.2.3 2005/06/29 13:01:28 manubsd Exp */
 
--- a/crypto/dist/ipsec-tools/src/libipsec/pfkey.c	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/libipsec/pfkey.c	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: pfkey.c,v 1.5 2005/08/07 09:38:45 manu Exp $	*/
+/*	$NetBSD: pfkey.c,v 1.6 2005/08/20 00:57:06 manu Exp $	*/
 
 /*	$KAME: pfkey.c,v 1.47 2003/10/02 19:52:12 itojun Exp $	*/
 
@@ -692,7 +692,7 @@
 		__ipsec_set_strerror(strerror(errno));
 		return -1;
 	}
-	ep = ((void *)newmsg) + len;
+	ep = ((caddr_t)(void *)newmsg) + len;
 
 	p = pfkey_setsadbmsg((void *)newmsg, ep, SADB_DELETE, (u_int)len, 
 	    satype, 0, getpid());
@@ -1335,7 +1335,7 @@
 	}
 	ep = ((caddr_t)(void *)newmsg) + len;
 
-	p = pfkey_setsadbmsg((void *)newmsg, ep, type, len,
+	p = pfkey_setsadbmsg((void *)newmsg, ep, type, (u_int)len,
 	                     satype, seq, getpid());
 	if (!p) {
 		free(newmsg);
@@ -1508,7 +1508,7 @@
 	}
 	ep = ((caddr_t)(void *)newmsg) + len;
 
-	p = pfkey_setsadbmsg((void *)newmsg, ep, type, len, satype, 0,
+	p = pfkey_setsadbmsg((void *)newmsg, ep, type, (u_int)len, satype, 0,
 	    getpid());
 	if (!p) {
 		free(newmsg);
@@ -1590,7 +1590,7 @@
 	}
 	ep = ((caddr_t)(void *)newmsg) + len;
 
-	p = pfkey_setsadbmsg((void *)newmsg, ep, type, len, satype, 0,
+	p = pfkey_setsadbmsg((void *)newmsg, ep, type, (u_int)len, satype, 0,
 	    getpid());
 	if (!p || p != ep) {
 		free(newmsg);
--- a/crypto/dist/ipsec-tools/src/libipsec/pfkey_dump.c	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/libipsec/pfkey_dump.c	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: pfkey_dump.c,v 1.8 2005/08/07 09:38:45 manu Exp $	*/
+/*	$NetBSD: pfkey_dump.c,v 1.9 2005/08/20 00:57:06 manu Exp $	*/
 
 /*	$KAME: pfkey_dump.c,v 1.45 2003/09/08 10:14:56 itojun Exp $	*/
 
@@ -91,7 +91,7 @@
 		printf("%u ", (num)); \
 	else \
 		printf("%s ", (str)[(num)]); \
-} while (0/*CONSTCOND*/)
+} while (/*CONSTCOND*/0)
 
 #define GETMSGV2S(v2s, num) \
 do { \
@@ -104,7 +104,7 @@
 		printf("%s ", p->str); \
 	else \
 		printf("%u ", (num)); \
-} while (0/*CONSTCOND*/)
+} while (/*CONSTCOND*/0)
 
 static char *str_ipaddr __P((struct sockaddr *));
 static char *str_prefport __P((u_int, u_int, u_int, u_int));
--- a/crypto/dist/ipsec-tools/src/libipsec/policy_parse.y	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/libipsec/policy_parse.y	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: policy_parse.y,v 1.5 2005/08/07 09:38:45 manu Exp $	*/
+/*	$NetBSD: policy_parse.y,v 1.6 2005/08/20 00:57:06 manu Exp $	*/
 
 /*	$KAME: policy_parse.y,v 1.21 2003/12/12 08:01:26 itojun Exp $	*/
 
@@ -641,7 +641,7 @@
 	__ipsec_const char *msg;
 	int msglen;
 {
-	void *policy;
+	caddr_t policy;
 
 	policy = policy_parse(msg, msglen);
 	if (policy == NULL) {
--- a/crypto/dist/ipsec-tools/src/libipsec/policy_token.l	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/libipsec/policy_token.l	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: policy_token.l,v 1.3 2005/08/07 09:38:45 manu Exp $	*/
+/*	$NetBSD: policy_token.l,v 1.4 2005/08/20 00:57:06 manu Exp $	*/
 
 /* Id: policy_token.l,v 1.10.4.1 2005/05/07 14:30:38 manubsd Exp */
 
--- a/crypto/dist/ipsec-tools/src/libipsec/test-policy-priority.c	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/libipsec/test-policy-priority.c	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: test-policy-priority.c,v 1.1.1.2 2005/02/23 14:54:09 manu Exp $	*/
+/*	$NetBSD: test-policy-priority.c,v 1.2 2005/08/20 00:57:06 manu Exp $	*/
 
 /*	$KAME: test-policy.c,v 1.16 2003/08/26 03:24:08 itojun Exp $	*/
 
--- a/crypto/dist/ipsec-tools/src/libipsec/test-policy.c	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/libipsec/test-policy.c	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: test-policy.c,v 1.1.1.2 2005/02/23 14:54:09 manu Exp $	*/
+/*	$NetBSD: test-policy.c,v 1.2 2005/08/20 00:57:06 manu Exp $	*/
 
 /*	$KAME: test-policy.c,v 1.16 2003/08/26 03:24:08 itojun Exp $	*/
 
--- a/crypto/dist/ipsec-tools/src/racoon/admin.c	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/admin.c	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: admin.c,v 1.5 2005/08/07 09:38:45 manu Exp $	*/
+/*	$NetBSD: admin.c,v 1.6 2005/08/20 00:57:06 manu Exp $	*/
 
 /* Id: admin.c,v 1.17.2.4 2005/07/12 11:49:44 manubsd Exp */
 
--- a/crypto/dist/ipsec-tools/src/racoon/admin.h	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/admin.h	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: admin.h,v 1.1.1.2 2005/02/23 14:54:10 manu Exp $	*/
+/*	$NetBSD: admin.h,v 1.2 2005/08/20 00:57:06 manu Exp $	*/
 
 /* Id: admin.h,v 1.10 2004/12/30 13:45:49 manubsd Exp */
 
--- a/crypto/dist/ipsec-tools/src/racoon/admin_var.h	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/admin_var.h	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: admin_var.h,v 1.1.1.2 2005/02/23 14:54:10 manu Exp $	*/
+/*	$NetBSD: admin_var.h,v 1.2 2005/08/20 00:57:06 manu Exp $	*/
 
 /* Id: admin_var.h,v 1.7 2004/12/30 00:08:30 manubsd Exp */
 
--- a/crypto/dist/ipsec-tools/src/racoon/algorithm.c	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/algorithm.c	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: algorithm.c,v 1.3 2005/08/07 09:38:45 manu Exp $	*/
+/*	$NetBSD: algorithm.c,v 1.4 2005/08/20 00:57:06 manu Exp $	*/
 
 /* Id: algorithm.c,v 1.11.4.1 2005/06/28 22:38:02 manubsd Exp */
 
--- a/crypto/dist/ipsec-tools/src/racoon/algorithm.h	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/algorithm.h	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: algorithm.h,v 1.1.1.2 2005/02/23 14:54:11 manu Exp $	*/
+/*	$NetBSD: algorithm.h,v 1.2 2005/08/20 00:57:06 manu Exp $	*/
 
 /* Id: algorithm.h,v 1.8 2004/11/18 15:14:44 ludvigm Exp */
 
--- a/crypto/dist/ipsec-tools/src/racoon/backupsa.c	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/backupsa.c	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: backupsa.c,v 1.1.1.2 2005/02/23 14:54:11 manu Exp $	*/
+/*	$NetBSD: backupsa.c,v 1.2 2005/08/20 00:57:06 manu Exp $	*/
 
 /*	$KAME: backupsa.c,v 1.16 2001/12/31 20:13:40 thorpej Exp $	*/
 
--- a/crypto/dist/ipsec-tools/src/racoon/backupsa.h	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/backupsa.h	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: backupsa.h,v 1.1.1.2 2005/02/23 14:54:11 manu Exp $	*/
+/*	$NetBSD: backupsa.h,v 1.2 2005/08/20 00:57:06 manu Exp $	*/
 
 /* Id: backupsa.h,v 1.3 2004/06/11 16:00:15 ludvigm Exp */
 
--- a/crypto/dist/ipsec-tools/src/racoon/cfparse.y	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/cfparse.y	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: cfparse.y,v 1.3 2005/08/07 09:38:45 manu Exp $	*/
+/*	$NetBSD: cfparse.y,v 1.4 2005/08/20 00:57:06 manu Exp $	*/
 
 /* Id: cfparse.y,v 1.37.2.4 2005/05/10 09:45:45 manubsd Exp */
 
--- a/crypto/dist/ipsec-tools/src/racoon/cfparse_proto.h	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/cfparse_proto.h	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: cfparse_proto.h,v 1.1.1.2 2005/02/23 14:54:12 manu Exp $	*/
+/*	$NetBSD: cfparse_proto.h,v 1.2 2005/08/20 00:57:06 manu Exp $	*/
 
 /* Id: cfparse_proto.h,v 1.3 2004/06/11 16:00:15 ludvigm Exp */
 
--- a/crypto/dist/ipsec-tools/src/racoon/cftoken.l	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/cftoken.l	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: cftoken.l,v 1.4 2005/08/07 09:38:45 manu Exp $	*/
+/*	$NetBSD: cftoken.l,v 1.5 2005/08/20 00:57:06 manu Exp $	*/
 
 /* Id: cftoken.l,v 1.31.2.5 2005/06/28 22:38:02 manubsd Exp */
 
--- a/crypto/dist/ipsec-tools/src/racoon/cftoken_proto.h	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/cftoken_proto.h	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: cftoken_proto.h,v 1.1.1.2 2005/02/23 14:54:12 manu Exp $	*/
+/*	$NetBSD: cftoken_proto.h,v 1.2 2005/08/20 00:57:06 manu Exp $	*/
 
 /* Id: cftoken_proto.h,v 1.3 2004/06/11 16:00:15 ludvigm Exp */
 
--- a/crypto/dist/ipsec-tools/src/racoon/crypto_openssl.c	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/crypto_openssl.c	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: crypto_openssl.c,v 1.4 2005/08/07 09:38:45 manu Exp $	*/
+/*	$NetBSD: crypto_openssl.c,v 1.5 2005/08/20 00:57:06 manu Exp $	*/
 
 /* Id: crypto_openssl.c,v 1.40.4.5 2005/07/12 11:50:15 manubsd Exp */
 
--- a/crypto/dist/ipsec-tools/src/racoon/crypto_openssl.h	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/crypto_openssl.h	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: crypto_openssl.h,v 1.1.1.2 2005/02/23 14:54:13 manu Exp $	*/
+/*	$NetBSD: crypto_openssl.h,v 1.2 2005/08/20 00:57:06 manu Exp $	*/
 
 /* Id: crypto_openssl.h,v 1.11 2004/11/13 11:28:01 manubsd Exp */
 
--- a/crypto/dist/ipsec-tools/src/racoon/debug.h	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/debug.h	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: debug.h,v 1.1.1.2 2005/02/23 14:54:13 manu Exp $	*/
+/*	$NetBSD: debug.h,v 1.2 2005/08/20 00:57:06 manu Exp $	*/
 
 /* Id: debug.h,v 1.3 2004/06/11 16:00:16 ludvigm Exp */
 
--- a/crypto/dist/ipsec-tools/src/racoon/debugrm.c	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/debugrm.c	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: debugrm.c,v 1.1.1.2 2005/02/23 14:54:13 manu Exp $	*/
+/*	$NetBSD: debugrm.c,v 1.2 2005/08/20 00:57:06 manu Exp $	*/
 
 /*	$KAME: debugrm.c,v 1.6 2001/12/13 16:07:46 sakane Exp $	*/
 
--- a/crypto/dist/ipsec-tools/src/racoon/debugrm.h	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/debugrm.h	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: debugrm.h,v 1.1.1.2 2005/02/23 14:54:13 manu Exp $	*/
+/*	$NetBSD: debugrm.h,v 1.2 2005/08/20 00:57:06 manu Exp $	*/
 
 /* Id: debugrm.h,v 1.3 2004/06/11 16:00:16 ludvigm Exp */
 
--- a/crypto/dist/ipsec-tools/src/racoon/dhgroup.h	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/dhgroup.h	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: dhgroup.h,v 1.1.1.2 2005/02/23 14:54:13 manu Exp $	*/
+/*	$NetBSD: dhgroup.h,v 1.2 2005/08/20 00:57:06 manu Exp $	*/
 
 /* Id: dhgroup.h,v 1.3 2004/06/11 16:00:16 ludvigm Exp */
 
--- a/crypto/dist/ipsec-tools/src/racoon/dnssec.c	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/dnssec.c	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: dnssec.c,v 1.1.1.3 2005/08/20 00:41:13 manu Exp $	*/
+/*	$NetBSD: dnssec.c,v 1.2 2005/08/20 00:57:06 manu Exp $	*/
 
 /*	$KAME: dnssec.c,v 1.2 2001/08/05 18:46:07 itojun Exp $	*/
 
--- a/crypto/dist/ipsec-tools/src/racoon/dnssec.h	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/dnssec.h	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: dnssec.h,v 1.1.1.2 2005/02/23 14:54:13 manu Exp $	*/
+/*	$NetBSD: dnssec.h,v 1.2 2005/08/20 00:57:06 manu Exp $	*/
 
 /* Id: dnssec.h,v 1.3 2004/06/11 16:00:16 ludvigm Exp */
 
--- a/crypto/dist/ipsec-tools/src/racoon/dump.c	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/dump.c	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: dump.c,v 1.1.1.2 2005/02/23 14:54:13 manu Exp $	*/
+/*	$NetBSD: dump.c,v 1.2 2005/08/20 00:57:06 manu Exp $	*/
 
 /*	$KAME: dump.c,v 1.3 2000/09/23 15:31:05 itojun Exp $	*/
 
--- a/crypto/dist/ipsec-tools/src/racoon/dump.h	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/dump.h	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: dump.h,v 1.1.1.2 2005/02/23 14:54:13 manu Exp $	*/
+/*	$NetBSD: dump.h,v 1.2 2005/08/20 00:57:06 manu Exp $	*/
 
 /* Id: dump.h,v 1.3 2004/06/11 16:00:16 ludvigm Exp */
 
--- a/crypto/dist/ipsec-tools/src/racoon/eaytest.c	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/eaytest.c	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: eaytest.c,v 1.3 2005/08/07 09:38:45 manu Exp $	*/
+/*	$NetBSD: eaytest.c,v 1.4 2005/08/20 00:57:06 manu Exp $	*/
 
 /* Id: eaytest.c,v 1.20.4.2 2005/06/28 22:38:02 manubsd Exp */
 
--- a/crypto/dist/ipsec-tools/src/racoon/evt.c	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/evt.c	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: evt.c,v 1.1.1.2 2005/02/23 14:54:14 manu Exp $	*/
+/*	$NetBSD: evt.c,v 1.2 2005/08/20 00:57:06 manu Exp $	*/
 
 /* Id: evt.c,v 1.2 2004/11/29 23:30:39 manubsd Exp */
 
--- a/crypto/dist/ipsec-tools/src/racoon/evt.h	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/evt.h	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: evt.h,v 1.1.1.2 2005/02/23 14:54:14 manu Exp $	*/
+/*	$NetBSD: evt.h,v 1.2 2005/08/20 00:57:06 manu Exp $	*/
 
 /* Id: evt.h,v 1.3 2004/11/29 23:30:39 manubsd Exp */
 
--- a/crypto/dist/ipsec-tools/src/racoon/gcmalloc.h	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/gcmalloc.h	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: gcmalloc.h,v 1.1.1.2 2005/02/23 14:54:14 manu Exp $	*/
+/*	$NetBSD: gcmalloc.h,v 1.2 2005/08/20 00:57:06 manu Exp $	*/
 
 /*	$KAME: gcmalloc.h,v 1.4 2001/11/16 04:34:57 sakane Exp $	*/
 
--- a/crypto/dist/ipsec-tools/src/racoon/genlist.c	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/genlist.c	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: genlist.c,v 1.1.1.2 2005/02/23 14:54:14 manu Exp $	*/
+/*	$NetBSD: genlist.c,v 1.2 2005/08/20 00:57:06 manu Exp $	*/
 
 /* Id: genlist.c,v 1.2 2004/07/12 20:43:50 ludvigm Exp */
 
--- a/crypto/dist/ipsec-tools/src/racoon/genlist.h	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/genlist.h	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: genlist.h,v 1.1.1.2 2005/02/23 14:54:14 manu Exp $	*/
+/*	$NetBSD: genlist.h,v 1.2 2005/08/20 00:57:06 manu Exp $	*/
 
 /* Id: genlist.h,v 1.2 2004/07/12 20:43:50 ludvigm Exp */
 
--- a/crypto/dist/ipsec-tools/src/racoon/getcertsbyname.c	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/getcertsbyname.c	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: getcertsbyname.c,v 1.1.1.3 2005/08/07 08:46:35 manu Exp $	*/
+/*	$NetBSD: getcertsbyname.c,v 1.2 2005/08/20 00:57:06 manu Exp $	*/
 
 /*	$KAME: getcertsbyname.c,v 1.7 2001/11/16 04:12:59 sakane Exp $	*/
 
--- a/crypto/dist/ipsec-tools/src/racoon/gnuc.h	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/gnuc.h	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: gnuc.h,v 1.1.1.2 2005/02/23 14:54:14 manu Exp $	*/
+/*	$NetBSD: gnuc.h,v 1.2 2005/08/20 00:57:06 manu Exp $	*/
 
 /* Id: gnuc.h,v 1.4 2004/11/18 15:14:44 ludvigm Exp */
 
--- a/crypto/dist/ipsec-tools/src/racoon/grabmyaddr.c	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/grabmyaddr.c	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: grabmyaddr.c,v 1.1.1.3 2005/08/07 08:46:36 manu Exp $	*/
+/*	$NetBSD: grabmyaddr.c,v 1.2 2005/08/20 00:57:06 manu Exp $	*/
 
 /* Id: grabmyaddr.c,v 1.23.4.2 2005/07/16 04:41:01 monas Exp */
 
--- a/crypto/dist/ipsec-tools/src/racoon/grabmyaddr.h	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/grabmyaddr.h	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: grabmyaddr.h,v 1.1.1.2 2005/02/23 14:54:14 manu Exp $	*/
+/*	$NetBSD: grabmyaddr.h,v 1.2 2005/08/20 00:57:06 manu Exp $	*/
 
 /* Id: grabmyaddr.h,v 1.5 2004/06/11 16:00:16 ludvigm Exp */
 
--- a/crypto/dist/ipsec-tools/src/racoon/gssapi.c	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/gssapi.c	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: gssapi.c,v 1.1.1.2 2005/02/23 14:54:14 manu Exp $	*/
+/*	$NetBSD: gssapi.c,v 1.2 2005/08/20 00:57:06 manu Exp $	*/
 
 /*	$KAME: gssapi.c,v 1.19 2001/04/03 15:51:55 thorpej Exp $	*/
 
--- a/crypto/dist/ipsec-tools/src/racoon/gssapi.h	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/gssapi.h	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: gssapi.h,v 1.1.1.2 2005/02/23 14:54:14 manu Exp $	*/
+/*	$NetBSD: gssapi.h,v 1.2 2005/08/20 00:57:06 manu Exp $	*/
 
 /* Id: gssapi.h,v 1.5 2005/02/11 06:59:01 manubsd Exp */
 
--- a/crypto/dist/ipsec-tools/src/racoon/handler.c	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/handler.c	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: handler.c,v 1.5 2005/08/07 09:38:45 manu Exp $	*/
+/*	$NetBSD: handler.c,v 1.6 2005/08/20 00:57:06 manu Exp $	*/
 
 /* Id: handler.c,v 1.13.4.4 2005/07/14 12:00:36 vanhu Exp */
 
--- a/crypto/dist/ipsec-tools/src/racoon/handler.h	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/handler.h	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: handler.h,v 1.6 2005/08/07 09:38:45 manu Exp $	*/
+/*	$NetBSD: handler.h,v 1.7 2005/08/20 00:57:06 manu Exp $	*/
 
 /* Id: handler.h,v 1.11.4.3 2005/05/07 17:26:05 manubsd Exp */
 
--- a/crypto/dist/ipsec-tools/src/racoon/ipsec_doi.c	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/ipsec_doi.c	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: ipsec_doi.c,v 1.9 2005/08/07 09:38:45 manu Exp $	*/
+/*	$NetBSD: ipsec_doi.c,v 1.10 2005/08/20 00:57:06 manu Exp $	*/
 
 /* Id: ipsec_doi.c,v 1.26.2.12 2005/07/12 11:50:15 manubsd Exp */
 
--- a/crypto/dist/ipsec-tools/src/racoon/ipsec_doi.h	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/ipsec_doi.h	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: ipsec_doi.h,v 1.3 2005/08/07 09:38:45 manu Exp $	*/
+/*	$NetBSD: ipsec_doi.h,v 1.4 2005/08/20 00:57:06 manu Exp $	*/
 
 /* Id: ipsec_doi.h,v 1.9.2.1 2005/06/28 22:38:03 manubsd Exp */
 
--- a/crypto/dist/ipsec-tools/src/racoon/isakmp.c	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/isakmp.c	Sat Aug 20 00:57:06 2005 +0000
@@ -1,6 +1,6 @@
-/*	$NetBSD: isakmp.c,v 1.8 2005/08/07 09:38:45 manu Exp $	*/
-
-/* Id: isakmp.c,v 1.34.2.18 2005/07/26 14:58:16 vanhu Exp */
+/*	$NetBSD: isakmp.c,v 1.9 2005/08/20 00:57:06 manu Exp $	*/
+
+/* Id: isakmp.c,v 1.34.2.19 2005/08/11 14:58:51 vanhu Exp */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -3133,8 +3133,8 @@
 		}
 
 		/* check in/outbound SAs */
-		if (CMPSADDR(iph1->remote, dst) &&
-		    CMPSADDR(iph1->remote, src)) {
+		if ((CMPSADDR(iph1->local, src) || CMPSADDR(iph1->remote, dst)) &&
+			(CMPSADDR(iph1->local, dst) || CMPSADDR(iph1->remote, src))) {
 			msg = next;
 			continue;
 		}
--- a/crypto/dist/ipsec-tools/src/racoon/isakmp.h	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/isakmp.h	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: isakmp.h,v 1.1.1.2 2005/02/23 14:54:18 manu Exp $	*/
+/*	$NetBSD: isakmp.h,v 1.2 2005/08/20 00:57:06 manu Exp $	*/
 
 /* Id: isakmp.h,v 1.10 2005/01/29 16:34:25 vanhu Exp */
 
--- a/crypto/dist/ipsec-tools/src/racoon/isakmp_agg.c	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/isakmp_agg.c	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: isakmp_agg.c,v 1.3 2005/08/07 09:38:45 manu Exp $	*/
+/*	$NetBSD: isakmp_agg.c,v 1.4 2005/08/20 00:57:06 manu Exp $	*/
 
 /* Id: isakmp_agg.c,v 1.20.2.1 2005/04/09 22:32:06 manubsd Exp */
 
--- a/crypto/dist/ipsec-tools/src/racoon/isakmp_agg.h	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/isakmp_agg.h	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: isakmp_agg.h,v 1.1.1.2 2005/02/23 14:54:18 manu Exp $	*/
+/*	$NetBSD: isakmp_agg.h,v 1.2 2005/08/20 00:57:06 manu Exp $	*/
 
 /* Id: isakmp_agg.h,v 1.3 2004/06/11 16:00:16 ludvigm Exp */
 
--- a/crypto/dist/ipsec-tools/src/racoon/isakmp_base.c	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/isakmp_base.c	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: isakmp_base.c,v 1.1.1.2 2005/02/23 14:54:18 manu Exp $	*/
+/*	$NetBSD: isakmp_base.c,v 1.2 2005/08/20 00:57:06 manu Exp $	*/
 
 /*	$KAME: isakmp_base.c,v 1.49 2003/11/13 02:30:20 sakane Exp $	*/
 
--- a/crypto/dist/ipsec-tools/src/racoon/isakmp_base.h	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/isakmp_base.h	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: isakmp_base.h,v 1.1.1.2 2005/02/23 14:54:18 manu Exp $	*/
+/*	$NetBSD: isakmp_base.h,v 1.2 2005/08/20 00:57:06 manu Exp $	*/
 
 /* Id: isakmp_base.h,v 1.3 2004/06/11 16:00:16 ludvigm Exp */
 
--- a/crypto/dist/ipsec-tools/src/racoon/isakmp_cfg.c	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/isakmp_cfg.c	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: isakmp_cfg.c,v 1.6 2005/08/07 09:38:45 manu Exp $	*/
+/*	$NetBSD: isakmp_cfg.c,v 1.7 2005/08/20 00:57:06 manu Exp $	*/
 
 /* Id: isakmp_cfg.c,v 1.26.2.5 2005/05/10 09:45:46 manubsd Exp */
 
--- a/crypto/dist/ipsec-tools/src/racoon/isakmp_cfg.h	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/isakmp_cfg.h	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: isakmp_cfg.h,v 1.3 2005/08/07 09:38:45 manu Exp $	*/
+/*	$NetBSD: isakmp_cfg.h,v 1.4 2005/08/20 00:57:06 manu Exp $	*/
 
 /*	$KAME$ */
 
--- a/crypto/dist/ipsec-tools/src/racoon/isakmp_frag.c	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/isakmp_frag.c	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: isakmp_frag.c,v 1.1.1.2 2005/02/23 14:54:19 manu Exp $	*/
+/*	$NetBSD: isakmp_frag.c,v 1.2 2005/08/20 00:57:06 manu Exp $	*/
 
 /* Id: isakmp_frag.c,v 1.4 2004/11/13 17:31:36 manubsd Exp */
 
--- a/crypto/dist/ipsec-tools/src/racoon/isakmp_frag.h	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/isakmp_frag.h	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: isakmp_frag.h,v 1.1.1.2 2005/02/23 14:54:19 manu Exp $	*/
+/*	$NetBSD: isakmp_frag.h,v 1.2 2005/08/20 00:57:06 manu Exp $	*/
 
 /*	Id: isakmp_frag.h,v 1.2 2004/10/24 16:51:24 manubsd Exp */
 
--- a/crypto/dist/ipsec-tools/src/racoon/isakmp_ident.c	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/isakmp_ident.c	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: isakmp_ident.c,v 1.1.1.2 2005/02/23 14:54:19 manu Exp $	*/
+/*	$NetBSD: isakmp_ident.c,v 1.2 2005/08/20 00:57:06 manu Exp $	*/
 
 /* Id: isakmp_ident.c,v 1.13 2005/01/29 16:34:25 vanhu Exp */
 
--- a/crypto/dist/ipsec-tools/src/racoon/isakmp_ident.h	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/isakmp_ident.h	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: isakmp_ident.h,v 1.1.1.2 2005/02/23 14:54:19 manu Exp $	*/
+/*	$NetBSD: isakmp_ident.h,v 1.2 2005/08/20 00:57:06 manu Exp $	*/
 
 /* Id: isakmp_ident.h,v 1.3 2004/06/11 16:00:16 ludvigm Exp */
 
--- a/crypto/dist/ipsec-tools/src/racoon/isakmp_inf.c	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/isakmp_inf.c	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: isakmp_inf.c,v 1.8 2005/08/07 09:38:45 manu Exp $	*/
+/*	$NetBSD: isakmp_inf.c,v 1.9 2005/08/20 00:57:06 manu Exp $	*/
 
 /* Id: isakmp_inf.c,v 1.14.4.9 2005/08/02 15:09:26 vanhu Exp */
 
--- a/crypto/dist/ipsec-tools/src/racoon/isakmp_inf.h	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/isakmp_inf.h	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: isakmp_inf.h,v 1.1.1.2 2005/02/23 14:54:21 manu Exp $	*/
+/*	$NetBSD: isakmp_inf.h,v 1.2 2005/08/20 00:57:06 manu Exp $	*/
 
 /* Id: isakmp_inf.h,v 1.4 2004/11/16 15:44:46 ludvigm Exp */
 
--- a/crypto/dist/ipsec-tools/src/racoon/isakmp_newg.c	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/isakmp_newg.c	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: isakmp_newg.c,v 1.1.1.2 2005/02/23 14:54:21 manu Exp $	*/
+/*	$NetBSD: isakmp_newg.c,v 1.2 2005/08/20 00:57:06 manu Exp $	*/
 
 /*	$KAME: isakmp_newg.c,v 1.10 2002/09/27 05:55:52 itojun Exp $	*/
 
--- a/crypto/dist/ipsec-tools/src/racoon/isakmp_newg.h	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/isakmp_newg.h	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: isakmp_newg.h,v 1.1.1.2 2005/02/23 14:54:21 manu Exp $	*/
+/*	$NetBSD: isakmp_newg.h,v 1.2 2005/08/20 00:57:06 manu Exp $	*/
 
 /* Id: isakmp_newg.h,v 1.3 2004/06/11 16:00:16 ludvigm Exp */
 
--- a/crypto/dist/ipsec-tools/src/racoon/isakmp_quick.c	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/isakmp_quick.c	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: isakmp_quick.c,v 1.6 2005/08/07 09:38:45 manu Exp $	*/
+/*	$NetBSD: isakmp_quick.c,v 1.7 2005/08/20 00:57:06 manu Exp $	*/
 
 /* Id: isakmp_quick.c,v 1.13.2.7 2005/07/20 08:02:05 vanhu Exp */
 
--- a/crypto/dist/ipsec-tools/src/racoon/isakmp_quick.h	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/isakmp_quick.h	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: isakmp_quick.h,v 1.1.1.2 2005/02/23 14:54:21 manu Exp $	*/
+/*	$NetBSD: isakmp_quick.h,v 1.2 2005/08/20 00:57:06 manu Exp $	*/
 
 /* Id: isakmp_quick.h,v 1.3 2004/06/11 16:00:16 ludvigm Exp */
 
--- a/crypto/dist/ipsec-tools/src/racoon/isakmp_unity.c	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/isakmp_unity.c	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: isakmp_unity.c,v 1.3 2005/08/07 09:38:45 manu Exp $	*/
+/*	$NetBSD: isakmp_unity.c,v 1.4 2005/08/20 00:57:06 manu Exp $	*/
 
 /* Id: isakmp_unity.c,v 1.5.4.1 2005/05/10 09:45:46 manubsd Exp */
 
--- a/crypto/dist/ipsec-tools/src/racoon/isakmp_unity.h	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/isakmp_unity.h	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: isakmp_unity.h,v 1.1.1.2 2005/02/23 14:54:21 manu Exp $	*/
+/*	$NetBSD: isakmp_unity.h,v 1.2 2005/08/20 00:57:06 manu Exp $	*/
 
 /*	$KAME$ */
 
--- a/crypto/dist/ipsec-tools/src/racoon/isakmp_var.h	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/isakmp_var.h	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: isakmp_var.h,v 1.3 2005/08/07 09:38:45 manu Exp $	*/
+/*	$NetBSD: isakmp_var.h,v 1.4 2005/08/20 00:57:06 manu Exp $	*/
 
 /* Id: isakmp_var.h,v 1.9.2.1 2005/05/07 17:26:06 manubsd Exp */
 
--- a/crypto/dist/ipsec-tools/src/racoon/isakmp_xauth.c	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/isakmp_xauth.c	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: isakmp_xauth.c,v 1.3 2005/08/07 09:38:46 manu Exp $	*/
+/*	$NetBSD: isakmp_xauth.c,v 1.4 2005/08/20 00:57:06 manu Exp $	*/
 
 /* Id: isakmp_xauth.c,v 1.17.2.5 2005/05/20 07:31:09 manubsd Exp */
 
--- a/crypto/dist/ipsec-tools/src/racoon/isakmp_xauth.h	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/isakmp_xauth.h	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: isakmp_xauth.h,v 1.1.1.2 2005/02/23 14:54:21 manu Exp $	*/
+/*	$NetBSD: isakmp_xauth.h,v 1.2 2005/08/20 00:57:06 manu Exp $	*/
 
 /*	$KAME$ */
 
--- a/crypto/dist/ipsec-tools/src/racoon/kmpstat.c	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/kmpstat.c	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: kmpstat.c,v 1.1.1.2 2005/02/23 14:54:21 manu Exp $	*/
+/*	$NetBSD: kmpstat.c,v 1.2 2005/08/20 00:57:06 manu Exp $	*/
 
 /*	$KAME: kmpstat.c,v 1.33 2004/08/16 08:20:28 itojun Exp $	*/
 
--- a/crypto/dist/ipsec-tools/src/racoon/localconf.c	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/localconf.c	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: localconf.c,v 1.1.1.3 2005/02/24 20:53:34 manu Exp $	*/
+/*	$NetBSD: localconf.c,v 1.2 2005/08/20 00:57:06 manu Exp $	*/
 
 /*	$KAME: localconf.c,v 1.33 2001/08/09 07:32:19 sakane Exp $	*/
 
--- a/crypto/dist/ipsec-tools/src/racoon/localconf.h	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/localconf.h	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: localconf.h,v 1.1.1.4 2005/03/16 23:52:56 manu Exp $	*/
+/*	$NetBSD: localconf.h,v 1.2 2005/08/20 00:57:06 manu Exp $	*/
 
 /* Id: localconf.h,v 1.9.2.2 2005/03/16 23:18:43 manubsd Exp */
 
--- a/crypto/dist/ipsec-tools/src/racoon/logger.c	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/logger.c	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: logger.c,v 1.1.1.2 2005/02/23 14:54:22 manu Exp $	*/
+/*	$NetBSD: logger.c,v 1.2 2005/08/20 00:57:06 manu Exp $	*/
 
 /*	$KAME: logger.c,v 1.9 2002/09/03 14:37:03 itojun Exp $	*/
 
--- a/crypto/dist/ipsec-tools/src/racoon/logger.h	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/logger.h	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: logger.h,v 1.1.1.2 2005/02/23 14:54:22 manu Exp $	*/
+/*	$NetBSD: logger.h,v 1.2 2005/08/20 00:57:06 manu Exp $	*/
 
 /* Id: logger.h,v 1.3 2004/06/11 16:00:16 ludvigm Exp */
 
--- a/crypto/dist/ipsec-tools/src/racoon/main.c	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/main.c	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: main.c,v 1.3 2005/02/23 15:17:51 manu Exp $	*/
+/*	$NetBSD: main.c,v 1.4 2005/08/20 00:57:06 manu Exp $	*/
 
 /* Id: main.c,v 1.14.2.2 2005/02/23 12:18:40 manubsd Exp */
 
--- a/crypto/dist/ipsec-tools/src/racoon/misc.c	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/misc.c	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: misc.c,v 1.1.1.2 2005/02/23 14:54:22 manu Exp $	*/
+/*	$NetBSD: misc.c,v 1.2 2005/08/20 00:57:06 manu Exp $	*/
 
 /*	$KAME: misc.c,v 1.23 2001/08/16 14:37:29 itojun Exp $	*/
 
--- a/crypto/dist/ipsec-tools/src/racoon/misc.h	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/misc.h	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: misc.h,v 1.1.1.2 2005/02/23 14:54:22 manu Exp $	*/
+/*	$NetBSD: misc.h,v 1.2 2005/08/20 00:57:06 manu Exp $	*/
 
 /* Id: misc.h,v 1.6 2004/06/11 16:00:17 ludvigm Exp */
 
--- a/crypto/dist/ipsec-tools/src/racoon/missing/crypto/rijndael/rijndael-alg-fst.c	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/missing/crypto/rijndael/rijndael-alg-fst.c	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: rijndael-alg-fst.c,v 1.1.1.2 2005/02/23 14:54:37 manu Exp $	*/
+/*	$NetBSD: rijndael-alg-fst.c,v 1.2 2005/08/20 00:57:29 manu Exp $	*/
 
 /*	$KAME: rijndael-alg-fst.c,v 1.1.1.1 2001/08/08 09:56:23 sakane Exp $	*/
 
--- a/crypto/dist/ipsec-tools/src/racoon/missing/crypto/rijndael/rijndael-alg-fst.h	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/missing/crypto/rijndael/rijndael-alg-fst.h	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: rijndael-alg-fst.h,v 1.1.1.2 2005/02/23 14:54:37 manu Exp $	*/
+/*	$NetBSD: rijndael-alg-fst.h,v 1.2 2005/08/20 00:57:29 manu Exp $	*/
 
 /*	$KAME: rijndael-alg-fst.h,v 1.1.1.1 2001/08/08 09:56:23 sakane Exp $	*/
 
--- a/crypto/dist/ipsec-tools/src/racoon/missing/crypto/rijndael/rijndael-api-fst.c	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/missing/crypto/rijndael/rijndael-api-fst.c	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: rijndael-api-fst.c,v 1.1.1.2 2005/02/23 14:54:37 manu Exp $	*/
+/*	$NetBSD: rijndael-api-fst.c,v 1.2 2005/08/20 00:57:29 manu Exp $	*/
 
 /*	$KAME: rijndael-api-fst.c,v 1.8 2002/11/18 23:32:54 itojun Exp $	*/
 
--- a/crypto/dist/ipsec-tools/src/racoon/missing/crypto/rijndael/rijndael-api-fst.h	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/missing/crypto/rijndael/rijndael-api-fst.h	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: rijndael-api-fst.h,v 1.1.1.2 2005/02/23 14:54:37 manu Exp $	*/
+/*	$NetBSD: rijndael-api-fst.h,v 1.2 2005/08/20 00:57:29 manu Exp $	*/
 
 /*	$KAME: rijndael-api-fst.h,v 1.1.1.1 2001/08/08 09:56:27 sakane Exp $	*/
 
--- a/crypto/dist/ipsec-tools/src/racoon/missing/crypto/rijndael/rijndael.h	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/missing/crypto/rijndael/rijndael.h	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: rijndael.h,v 1.1.1.2 2005/02/23 14:54:37 manu Exp $	*/
+/*	$NetBSD: rijndael.h,v 1.2 2005/08/20 00:57:29 manu Exp $	*/
 
 /*	$KAME: rijndael.h,v 1.1.1.1 2001/08/08 09:56:27 sakane Exp $	*/
 
--- a/crypto/dist/ipsec-tools/src/racoon/missing/crypto/rijndael/rijndael_local.h	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/missing/crypto/rijndael/rijndael_local.h	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: rijndael_local.h,v 1.1.1.2 2005/02/23 14:54:37 manu Exp $	*/
+/*	$NetBSD: rijndael_local.h,v 1.2 2005/08/20 00:57:29 manu Exp $	*/
 
 /*	$KAME: rijndael_local.h,v 1.1.1.1 2001/08/08 09:56:27 sakane Exp $	*/
 
--- a/crypto/dist/ipsec-tools/src/racoon/missing/crypto/sha2/sha2.c	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/missing/crypto/sha2/sha2.c	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: sha2.c,v 1.1.1.2 2005/02/23 14:54:38 manu Exp $	*/
+/*	$NetBSD: sha2.c,v 1.2 2005/08/20 00:57:29 manu Exp $	*/
 
 /* Id: sha2.c,v 1.6 2004/09/21 14:35:25 ludvigm Exp */
 
--- a/crypto/dist/ipsec-tools/src/racoon/missing/crypto/sha2/sha2.h	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/missing/crypto/sha2/sha2.h	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: sha2.h,v 1.1.1.3 2005/08/07 08:48:26 manu Exp $	*/
+/*	$NetBSD: sha2.h,v 1.2 2005/08/20 00:57:29 manu Exp $	*/
 
 /*	$KAME: sha2.h,v 1.2 2001/08/08 22:09:27 sakane Exp $	*/
 
--- a/crypto/dist/ipsec-tools/src/racoon/missing/strdup.c	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/missing/strdup.c	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: strdup.c,v 1.1.1.2 2005/02/23 14:54:36 manu Exp $	*/
+/*	$NetBSD: strdup.c,v 1.2 2005/08/20 00:57:29 manu Exp $	*/
 
 /*	$KAME: strdup.c,v 1.2 2000/10/04 17:41:07 itojun Exp $	*/
 
--- a/crypto/dist/ipsec-tools/src/racoon/nattraversal.c	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/nattraversal.c	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: nattraversal.c,v 1.3 2005/08/07 09:38:46 manu Exp $	*/
+/*	$NetBSD: nattraversal.c,v 1.4 2005/08/20 00:57:06 manu Exp $	*/
 
 /*
  * Copyright (C) 2004 SuSE Linux AG, Nuernberg, Germany.
--- a/crypto/dist/ipsec-tools/src/racoon/nattraversal.h	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/nattraversal.h	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: nattraversal.h,v 1.3 2005/08/07 09:38:46 manu Exp $	*/
+/*	$NetBSD: nattraversal.h,v 1.4 2005/08/20 00:57:06 manu Exp $	*/
 
 /*
  * Copyright (C) 2004 SuSE Linux AG, Nuernberg, Germany.
--- a/crypto/dist/ipsec-tools/src/racoon/netdb_dnssec.h	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/netdb_dnssec.h	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: netdb_dnssec.h,v 1.1.1.2 2005/02/23 14:54:22 manu Exp $	*/
+/*	$NetBSD: netdb_dnssec.h,v 1.2 2005/08/20 00:57:06 manu Exp $	*/
 
 /* Id: netdb_dnssec.h,v 1.3 2004/06/11 16:00:17 ludvigm Exp */
 
--- a/crypto/dist/ipsec-tools/src/racoon/oakley.c	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/oakley.c	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: oakley.c,v 1.4 2005/08/07 09:38:46 manu Exp $	*/
+/*	$NetBSD: oakley.c,v 1.5 2005/08/20 00:57:06 manu Exp $	*/
 
 /* Id: oakley.c,v 1.17.2.4 2005/07/12 11:50:15 manubsd Exp */
 
--- a/crypto/dist/ipsec-tools/src/racoon/oakley.h	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/oakley.h	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: oakley.h,v 1.1.1.2 2005/02/23 14:54:23 manu Exp $	*/
+/*	$NetBSD: oakley.h,v 1.2 2005/08/20 00:57:06 manu Exp $	*/
 
 /* Id: oakley.h,v 1.9 2004/10/24 17:37:00 manubsd Exp */
 
--- a/crypto/dist/ipsec-tools/src/racoon/pfkey.c	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/pfkey.c	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: pfkey.c,v 1.8 2005/08/07 09:38:46 manu Exp $	*/
+/*	$NetBSD: pfkey.c,v 1.9 2005/08/20 00:57:06 manu Exp $	*/
 
 /* Id: pfkey.c,v 1.31.2.9 2005/07/28 05:05:52 manubsd Exp */
 
--- a/crypto/dist/ipsec-tools/src/racoon/pfkey.h	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/pfkey.h	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: pfkey.h,v 1.1.1.2 2005/02/23 14:54:24 manu Exp $	*/
+/*	$NetBSD: pfkey.h,v 1.2 2005/08/20 00:57:06 manu Exp $	*/
 
 /* Id: pfkey.h,v 1.3 2004/06/11 16:00:17 ludvigm Exp */
 
--- a/crypto/dist/ipsec-tools/src/racoon/plainrsa-gen.8	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/plainrsa-gen.8	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-.\"	$NetBSD: plainrsa-gen.8,v 1.8 2005/08/07 09:38:46 manu Exp $
+.\"	$NetBSD: plainrsa-gen.8,v 1.9 2005/08/20 00:57:06 manu Exp $
 .\"
 .\" Id: plainrsa-gen.8,v 1.2.10.1 2005/04/18 11:10:55 manubsd Exp
 .\"
--- a/crypto/dist/ipsec-tools/src/racoon/plainrsa-gen.c	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/plainrsa-gen.c	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: plainrsa-gen.c,v 1.1.1.3 2005/08/07 08:47:45 manu Exp $	*/
+/*	$NetBSD: plainrsa-gen.c,v 1.2 2005/08/20 00:57:06 manu Exp $	*/
 
 /* Id: plainrsa-gen.c,v 1.4.8.2 2005/04/21 09:07:20 monas Exp */
 /*
--- a/crypto/dist/ipsec-tools/src/racoon/plog.c	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/plog.c	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: plog.c,v 1.1.1.2 2005/02/23 14:54:24 manu Exp $	*/
+/*	$NetBSD: plog.c,v 1.2 2005/08/20 00:57:06 manu Exp $	*/
 
 /* Id: plog.c,v 1.6 2004/07/12 20:15:08 ludvigm Exp */
 
--- a/crypto/dist/ipsec-tools/src/racoon/plog.h	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/plog.h	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: plog.h,v 1.1.1.2 2005/02/23 14:54:24 manu Exp $	*/
+/*	$NetBSD: plog.h,v 1.2 2005/08/20 00:57:06 manu Exp $	*/
 
 /* Id: plog.h,v 1.5 2004/06/11 16:00:17 ludvigm Exp */
 
--- a/crypto/dist/ipsec-tools/src/racoon/policy.c	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/policy.c	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: policy.c,v 1.1.1.2 2005/02/23 14:54:24 manu Exp $	*/
+/*	$NetBSD: policy.c,v 1.2 2005/08/20 00:57:06 manu Exp $	*/
 
 /*	$KAME: policy.c,v 1.46 2001/11/16 04:08:10 sakane Exp $	*/
 
--- a/crypto/dist/ipsec-tools/src/racoon/policy.h	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/policy.h	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: policy.h,v 1.1.1.2 2005/02/23 14:54:24 manu Exp $	*/
+/*	$NetBSD: policy.h,v 1.2 2005/08/20 00:57:06 manu Exp $	*/
 
 /* Id: policy.h,v 1.5 2004/06/11 16:00:17 ludvigm Exp */
 
--- a/crypto/dist/ipsec-tools/src/racoon/privsep.c	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/privsep.c	Sat Aug 20 00:57:06 2005 +0000
@@ -1,6 +1,6 @@
-/*	$NetBSD: privsep.c,v 1.3 2005/08/07 09:38:46 manu Exp $	*/
+/*	$NetBSD: privsep.c,v 1.4 2005/08/20 00:57:06 manu Exp $	*/
 
-/* Id: privsep.c,v 1.6.2.6 2005/06/04 22:08:15 manubsd Exp */
+/* Id: privsep.c,v 1.6.2.7 2005/08/08 11:25:01 vanhu Exp */
 
 /*
  * Copyright (C) 2004 Emmanuel Dreyfus
@@ -914,7 +914,7 @@
 {
 	if ((port < 0) || (port >= isakmp_cfg_config.pool_size)) {
 		plog(LLV_ERROR, LOCATION, NULL, 
-		    "privsep: port %d outsied of allowed range [0,%d]\n",
+		    "privsep: port %d outside of allowed range [0,%zu]\n",
 		    port, isakmp_cfg_config.pool_size - 1);
 		return -1;
 	}
--- a/crypto/dist/ipsec-tools/src/racoon/privsep.h	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/privsep.h	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: privsep.h,v 1.1.1.2 2005/02/23 14:54:25 manu Exp $	*/
+/*	$NetBSD: privsep.h,v 1.2 2005/08/20 00:57:06 manu Exp $	*/
 
 /* Id: privsep.h,v 1.3 2005/02/10 02:02:56 manubsd Exp */
 
--- a/crypto/dist/ipsec-tools/src/racoon/proposal.c	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/proposal.c	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: proposal.c,v 1.4 2005/08/07 09:38:46 manu Exp $	*/
+/*	$NetBSD: proposal.c,v 1.5 2005/08/20 00:57:06 manu Exp $	*/
 
 /* Id: proposal.c,v 1.13.8.5 2005/07/28 05:05:52 manubsd Exp */
 
--- a/crypto/dist/ipsec-tools/src/racoon/proposal.h	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/proposal.h	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: proposal.h,v 1.1.1.3 2005/08/07 08:47:50 manu Exp $	*/
+/*	$NetBSD: proposal.h,v 1.2 2005/08/20 00:57:06 manu Exp $	*/
 
 /* Id: proposal.h,v 1.5.10.1 2005/05/12 19:34:10 manubsd Exp */
 
--- a/crypto/dist/ipsec-tools/src/racoon/prsa_par.y	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/prsa_par.y	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: prsa_par.y,v 1.1.1.2 2005/02/23 14:54:25 manu Exp $	*/
+/*	$NetBSD: prsa_par.y,v 1.2 2005/08/20 00:57:06 manu Exp $	*/
 
 /* Id: prsa_par.y,v 1.3 2004/11/08 12:04:23 ludvigm Exp */
 
--- a/crypto/dist/ipsec-tools/src/racoon/prsa_tok.l	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/prsa_tok.l	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: prsa_tok.l,v 1.1.1.2 2005/02/23 14:54:25 manu Exp $	*/
+/*	$NetBSD: prsa_tok.l,v 1.2 2005/08/20 00:57:06 manu Exp $	*/
 
 /* Id: prsa_tok.l,v 1.2 2004/07/12 20:43:51 ludvigm Exp */
 
--- a/crypto/dist/ipsec-tools/src/racoon/racoon.8	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/racoon.8	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-.\"	$NetBSD: racoon.8,v 1.7 2005/08/07 09:38:46 manu Exp $
+.\"	$NetBSD: racoon.8,v 1.8 2005/08/20 00:57:06 manu Exp $
 .\"
 .\" Id: racoon.8,v 1.3.10.1 2005/04/18 11:10:55 manubsd Exp
 .\"
--- a/crypto/dist/ipsec-tools/src/racoon/racoon.conf.5	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/racoon.conf.5	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-.\"	$NetBSD: racoon.conf.5,v 1.19 2005/08/07 09:38:46 manu Exp $
+.\"	$NetBSD: racoon.conf.5,v 1.20 2005/08/20 00:57:06 manu Exp $
 .\"
 .\" Id: racoon.conf.5,v 1.27.2.8 2005/07/07 14:55:58 manubsd Exp
 .\"
--- a/crypto/dist/ipsec-tools/src/racoon/racoonctl.8	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/racoonctl.8	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-.\"	$NetBSD: racoonctl.8,v 1.10 2005/08/07 09:38:46 manu Exp $
+.\"	$NetBSD: racoonctl.8,v 1.11 2005/08/20 00:57:06 manu Exp $
 .\"
 .\" Id: racoonctl.8,v 1.2.4.2 2005/04/18 11:10:55 manubsd Exp
 .\"
--- a/crypto/dist/ipsec-tools/src/racoon/racoonctl.c	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/racoonctl.c	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: racoonctl.c,v 1.1.1.3 2005/08/07 08:47:57 manu Exp $	*/
+/*	$NetBSD: racoonctl.c,v 1.2 2005/08/20 00:57:06 manu Exp $	*/
 
 /*	Id: racoonctl.c,v 1.2.2.1 2005/04/21 09:07:20 monas Exp */
 
--- a/crypto/dist/ipsec-tools/src/racoon/racoonctl.h	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/racoonctl.h	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: racoonctl.h,v 1.1.1.2 2005/02/23 14:54:27 manu Exp $	*/
+/*	$NetBSD: racoonctl.h,v 1.2 2005/08/20 00:57:06 manu Exp $	*/
 
 /* Id: racoonctl.h,v 1.2 2004/12/30 11:08:32 manubsd Exp */
 
--- a/crypto/dist/ipsec-tools/src/racoon/remoteconf.c	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/remoteconf.c	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: remoteconf.c,v 1.4 2005/08/07 09:38:46 manu Exp $	*/
+/*	$NetBSD: remoteconf.c,v 1.5 2005/08/20 00:57:06 manu Exp $	*/
 
 /* Id: remoteconf.c,v 1.26.2.4 2005/05/20 00:37:41 manubsd Exp */
 
--- a/crypto/dist/ipsec-tools/src/racoon/remoteconf.h	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/remoteconf.h	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: remoteconf.h,v 1.3 2005/08/07 09:38:46 manu Exp $	*/
+/*	$NetBSD: remoteconf.h,v 1.4 2005/08/20 00:57:06 manu Exp $	*/
 
 /* Id: remoteconf.h,v 1.19.2.1 2005/05/20 00:37:42 manubsd Exp */
 
--- a/crypto/dist/ipsec-tools/src/racoon/rsalist.c	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/rsalist.c	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: rsalist.c,v 1.1.1.2 2005/02/23 14:54:27 manu Exp $	*/
+/*	$NetBSD: rsalist.c,v 1.2 2005/08/20 00:57:06 manu Exp $	*/
 
 /* Id: rsalist.c,v 1.3 2004/11/08 12:04:23 ludvigm Exp */
 
--- a/crypto/dist/ipsec-tools/src/racoon/rsalist.h	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/rsalist.h	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: rsalist.h,v 1.1.1.2 2005/02/23 14:54:27 manu Exp $	*/
+/*	$NetBSD: rsalist.h,v 1.2 2005/08/20 00:57:06 manu Exp $	*/
 
 /* Id: rsalist.h,v 1.2 2004/07/12 20:43:51 ludvigm Exp */
 /*
--- a/crypto/dist/ipsec-tools/src/racoon/safefile.c	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/safefile.c	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: safefile.c,v 1.1.1.2 2005/02/23 14:54:27 manu Exp $	*/
+/*	$NetBSD: safefile.c,v 1.2 2005/08/20 00:57:06 manu Exp $	*/
 
 /*	$KAME: safefile.c,v 1.5 2001/03/05 19:54:06 thorpej Exp $	*/
 
--- a/crypto/dist/ipsec-tools/src/racoon/safefile.h	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/safefile.h	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: safefile.h,v 1.1.1.2 2005/02/23 14:54:27 manu Exp $	*/
+/*	$NetBSD: safefile.h,v 1.2 2005/08/20 00:57:06 manu Exp $	*/
 
 /* Id: safefile.h,v 1.4 2004/07/12 18:32:12 ludvigm Exp */
 
--- a/crypto/dist/ipsec-tools/src/racoon/sainfo.c	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/sainfo.c	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: sainfo.c,v 1.1.1.2 2005/02/23 14:54:27 manu Exp $	*/
+/*	$NetBSD: sainfo.c,v 1.2 2005/08/20 00:57:06 manu Exp $	*/
 
 /*	$KAME: sainfo.c,v 1.16 2003/06/27 07:32:39 sakane Exp $	*/
 
--- a/crypto/dist/ipsec-tools/src/racoon/sainfo.h	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/sainfo.h	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: sainfo.h,v 1.1.1.2 2005/02/23 14:54:27 manu Exp $	*/
+/*	$NetBSD: sainfo.h,v 1.2 2005/08/20 00:57:06 manu Exp $	*/
 
 /* Id: sainfo.h,v 1.3 2004/06/11 16:00:17 ludvigm Exp */
 
--- a/crypto/dist/ipsec-tools/src/racoon/schedule.c	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/schedule.c	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: schedule.c,v 1.1.1.2 2005/02/23 14:54:27 manu Exp $	*/
+/*	$NetBSD: schedule.c,v 1.2 2005/08/20 00:57:06 manu Exp $	*/
 
 /*	$KAME: schedule.c,v 1.19 2001/11/05 10:53:19 sakane Exp $	*/
 
--- a/crypto/dist/ipsec-tools/src/racoon/schedule.h	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/schedule.h	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: schedule.h,v 1.1.1.2 2005/02/23 14:54:27 manu Exp $	*/
+/*	$NetBSD: schedule.h,v 1.2 2005/08/20 00:57:06 manu Exp $	*/
 
 /* Id: schedule.h,v 1.4 2004/11/18 15:14:44 ludvigm Exp */
 
--- a/crypto/dist/ipsec-tools/src/racoon/session.c	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/session.c	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: session.c,v 1.3 2005/08/07 09:38:46 manu Exp $	*/
+/*	$NetBSD: session.c,v 1.4 2005/08/20 00:57:06 manu Exp $	*/
 
 /*	$KAME: session.c,v 1.32 2003/09/24 02:01:17 jinmei Exp $	*/
 
--- a/crypto/dist/ipsec-tools/src/racoon/session.h	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/session.h	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: session.h,v 1.1.1.2 2005/02/23 14:54:27 manu Exp $	*/
+/*	$NetBSD: session.h,v 1.2 2005/08/20 00:57:06 manu Exp $	*/
 
 /* Id: session.h,v 1.3 2004/06/11 16:00:17 ludvigm Exp */
 
--- a/crypto/dist/ipsec-tools/src/racoon/sockmisc.c	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/sockmisc.c	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: sockmisc.c,v 1.1.1.3 2005/08/07 08:48:05 manu Exp $	*/
+/*	$NetBSD: sockmisc.c,v 1.2 2005/08/20 00:57:06 manu Exp $	*/
 
 /* Id: sockmisc.c,v 1.17.4.3 2005/06/29 13:01:29 manubsd Exp */
 
--- a/crypto/dist/ipsec-tools/src/racoon/sockmisc.h	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/sockmisc.h	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: sockmisc.h,v 1.3 2005/08/07 09:38:46 manu Exp $	*/
+/*	$NetBSD: sockmisc.h,v 1.4 2005/08/20 00:57:06 manu Exp $	*/
 
 /* Id: sockmisc.h,v 1.5.10.3 2005/06/29 13:01:29 manubsd Exp */
 
--- a/crypto/dist/ipsec-tools/src/racoon/str2val.c	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/str2val.c	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: str2val.c,v 1.1.1.2 2005/02/23 14:54:28 manu Exp $	*/
+/*	$NetBSD: str2val.c,v 1.2 2005/08/20 00:57:06 manu Exp $	*/
 
 /*	$KAME: str2val.c,v 1.11 2001/08/16 14:37:29 itojun Exp $	*/
 
--- a/crypto/dist/ipsec-tools/src/racoon/str2val.h	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/str2val.h	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: str2val.h,v 1.1.1.2 2005/02/23 14:54:28 manu Exp $	*/
+/*	$NetBSD: str2val.h,v 1.2 2005/08/20 00:57:06 manu Exp $	*/
 
 /* Id: str2val.h,v 1.3 2004/06/11 16:00:17 ludvigm Exp */
 
--- a/crypto/dist/ipsec-tools/src/racoon/strnames.c	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/strnames.c	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: strnames.c,v 1.3 2005/08/07 09:38:46 manu Exp $	*/
+/*	$NetBSD: strnames.c,v 1.4 2005/08/20 00:57:06 manu Exp $	*/
 
 /*	$KAME: strnames.c,v 1.25 2003/11/13 10:53:26 itojun Exp $	*/
 
--- a/crypto/dist/ipsec-tools/src/racoon/strnames.h	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/strnames.h	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: strnames.h,v 1.1.1.2 2005/02/23 14:54:28 manu Exp $	*/
+/*	$NetBSD: strnames.h,v 1.2 2005/08/20 00:57:06 manu Exp $	*/
 
 /* Id: strnames.h,v 1.5 2004/07/12 20:37:13 ludvigm Exp */
 
--- a/crypto/dist/ipsec-tools/src/racoon/throttle.c	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/throttle.c	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: throttle.c,v 1.1.1.2 2005/02/23 14:54:28 manu Exp $	*/
+/*	$NetBSD: throttle.c,v 1.2 2005/08/20 00:57:06 manu Exp $	*/
 
 /* Id: throttle.c,v 1.2 2004/11/30 07:40:13 manubsd Exp */
 
--- a/crypto/dist/ipsec-tools/src/racoon/throttle.h	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/throttle.h	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: throttle.h,v 1.1.1.2 2005/02/23 14:54:28 manu Exp $	*/
+/*	$NetBSD: throttle.h,v 1.2 2005/08/20 00:57:06 manu Exp $	*/
 
 /* Id: throttle.h,v 1.1 2004/11/30 00:46:09 manubsd Exp */
 
--- a/crypto/dist/ipsec-tools/src/racoon/var.h	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/var.h	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: var.h,v 1.1.1.2 2005/02/23 14:54:28 manu Exp $	*/
+/*	$NetBSD: var.h,v 1.2 2005/08/20 00:57:06 manu Exp $	*/
 
 /* Id: var.h,v 1.6 2004/11/20 16:16:59 monas Exp */
 
--- a/crypto/dist/ipsec-tools/src/racoon/vendorid.c	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/vendorid.c	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: vendorid.c,v 1.1.1.2 2005/02/23 14:54:28 manu Exp $	*/
+/*	$NetBSD: vendorid.c,v 1.2 2005/08/20 00:57:06 manu Exp $	*/
 
 /* Id: vendorid.c,v 1.7 2005/01/29 16:34:25 vanhu Exp */
 
--- a/crypto/dist/ipsec-tools/src/racoon/vendorid.h	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/vendorid.h	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: vendorid.h,v 1.1.1.2 2005/02/23 14:54:28 manu Exp $	*/
+/*	$NetBSD: vendorid.h,v 1.2 2005/08/20 00:57:06 manu Exp $	*/
 
 /* Id: vendorid.h,v 1.10 2005/01/29 16:34:25 vanhu Exp */
 
--- a/crypto/dist/ipsec-tools/src/racoon/vmbuf.c	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/vmbuf.c	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: vmbuf.c,v 1.1.1.2 2005/02/23 14:54:28 manu Exp $	*/
+/*	$NetBSD: vmbuf.c,v 1.2 2005/08/20 00:57:06 manu Exp $	*/
 
 /*	$KAME: vmbuf.c,v 1.11 2001/11/26 16:54:29 sakane Exp $	*/
 
--- a/crypto/dist/ipsec-tools/src/racoon/vmbuf.h	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/vmbuf.h	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: vmbuf.h,v 1.1.1.2 2005/02/23 14:54:28 manu Exp $	*/
+/*	$NetBSD: vmbuf.h,v 1.2 2005/08/20 00:57:06 manu Exp $	*/
 
 /* Id: vmbuf.h,v 1.3 2004/06/11 16:00:17 ludvigm Exp */
 
--- a/crypto/dist/ipsec-tools/src/setkey/extern.h	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/setkey/extern.h	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: extern.h,v 1.1.1.1 2005/08/07 08:49:26 manu Exp $	*/
+/*	$NetBSD: extern.h,v 1.2 2005/08/20 00:57:29 manu Exp $	*/
 
 
 
--- a/crypto/dist/ipsec-tools/src/setkey/parse.y	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/setkey/parse.y	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: parse.y,v 1.5 2005/08/07 09:38:46 manu Exp $	*/
+/*	$NetBSD: parse.y,v 1.6 2005/08/20 00:57:29 manu Exp $	*/
 
 /*	$KAME: parse.y,v 1.81 2003/07/01 04:01:48 itojun Exp $	*/
 
--- a/crypto/dist/ipsec-tools/src/setkey/setkey.8	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/setkey/setkey.8	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-.\"	$NetBSD: setkey.8,v 1.15 2005/08/07 11:19:35 wiz Exp $
+.\"	$NetBSD: setkey.8,v 1.16 2005/08/20 00:57:29 manu Exp $
 .\"
 .\" Copyright (C) 1995, 1996, 1997, 1998, and 1999 WIDE Project.
 .\" All rights reserved.
@@ -94,10 +94,10 @@
 Dump the SAD entries.
 If
 .Fl P
-is also specified, the SPD entries are dumped.
+is also specified, the SPD entries are dumped. 
 If
 .Fl p
-is specified with
+is specified with 
 .FL P ,
 the ports that can be used for ESP over UDP are displayed.
 .It Fl F
--- a/crypto/dist/ipsec-tools/src/setkey/setkey.c	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/setkey/setkey.c	Sat Aug 20 00:57:06 2005 +0000
@@ -1,6 +1,6 @@
-/*	$NetBSD: setkey.c,v 1.7 2005/08/07 09:38:46 manu Exp $	*/
+/*	$NetBSD: setkey.c,v 1.8 2005/08/20 00:57:29 manu Exp $	*/
 
-/*	KAME: setkey.c,v 1.36 2003/09/24 23:52:51 itojun Exp	*/
+/*	$KAME: setkey.c,v 1.36 2003/09/24 23:52:51 itojun Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, 1998, and 1999 WIDE Project.
--- a/crypto/dist/ipsec-tools/src/setkey/test-pfkey.c	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/setkey/test-pfkey.c	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: test-pfkey.c,v 1.3 2005/08/07 09:38:46 manu Exp $	*/
+/*	$NetBSD: test-pfkey.c,v 1.4 2005/08/20 00:57:29 manu Exp $	*/
 
 /*	$KAME: test-pfkey.c,v 1.4 2000/06/07 00:29:14 itojun Exp $	*/
 
--- a/crypto/dist/ipsec-tools/src/setkey/token.l	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/setkey/token.l	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: token.l,v 1.6 2005/08/07 09:38:46 manu Exp $	*/
+/*	$NetBSD: token.l,v 1.7 2005/08/20 00:57:29 manu Exp $	*/
 
 /*	$KAME: token.l,v 1.44 2003/10/21 07:20:58 itojun Exp $	*/
 
--- a/crypto/dist/ipsec-tools/src/setkey/vchar.h	Sat Aug 20 00:40:43 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/setkey/vchar.h	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: vchar.h,v 1.1.1.2 2005/02/23 14:54:40 manu Exp $	*/
+/*	$NetBSD: vchar.h,v 1.2 2005/08/20 00:57:29 manu Exp $	*/
 
 /* Id: vchar.h,v 1.2 2004/06/07 09:18:47 ludvigm Exp */
 
--- a/doc/CHANGES	Sat Aug 20 00:40:43 2005 +0000
+++ b/doc/CHANGES	Sat Aug 20 00:57:06 2005 +0000
@@ -1,4 +1,4 @@
-LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.508 $>
+LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.509 $>
 
 
 [Note: This file does not mention every change made to the NetBSD source tree.
@@ -82,3 +82,4 @@
 		peers, viewable with netstat(1). [rpaulo 20050805]
 	postfix: Updated to 2.2.5. [rpaulo 20050818]
 	kernel: 64 bit inode changes [christos 20050819]
+	racoon(8): ipsec-tools updated to 0.6.1 [manu 20050820]
--- a/lib/libipsec/package_version.h	Sat Aug 20 00:40:43 2005 +0000
+++ b/lib/libipsec/package_version.h	Sat Aug 20 00:57:06 2005 +0000
@@ -1,5 +1,5 @@
 #define TOP_PACKAGE "ipsec-tools"
 #define TOP_PACKAGE_NAME "ipsec-tools"
-#define TOP_PACKAGE_VERSION  "0.6.1rc1"
-#define TOP_PACKAGE_STRING  "ipsec-tools 0.6.1rc1"
+#define TOP_PACKAGE_VERSION  "0.6.1"
+#define TOP_PACKAGE_STRING  "ipsec-tools 0.6.1"
 #define TOP_PACKAGE_URL "http://ipsec-tools.sourceforge.net"