Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src Update to ipsec-tools 0.6.1
details: https://anonhg.NetBSD.org/src/rev/adbb7d98e953
branches: trunk
changeset: 583715:adbb7d98e953
user: manu <manu%NetBSD.org@localhost>
date: Sat Aug 20 00:57:06 2005 +0000
description:
Update to ipsec-tools 0.6.1
diffstat:
crypto/dist/ipsec-tools/ChangeLog | 23 ++++++++++
crypto/dist/ipsec-tools/netbsd-import.sh | 2 +-
crypto/dist/ipsec-tools/src/include-glibc/glibc-bugs.h | 2 +-
crypto/dist/ipsec-tools/src/include-glibc/net/pfkeyv2.h | 2 +-
crypto/dist/ipsec-tools/src/include-glibc/netinet/ipsec.h | 2 +-
crypto/dist/ipsec-tools/src/include-glibc/sys/queue.h | 2 +-
crypto/dist/ipsec-tools/src/libipsec/ipsec_dump_policy.c | 2 +-
crypto/dist/ipsec-tools/src/libipsec/ipsec_get_policylen.c | 2 +-
crypto/dist/ipsec-tools/src/libipsec/ipsec_set_policy.3 | 2 +-
crypto/dist/ipsec-tools/src/libipsec/ipsec_strerror.3 | 2 +-
crypto/dist/ipsec-tools/src/libipsec/ipsec_strerror.c | 2 +-
crypto/dist/ipsec-tools/src/libipsec/ipsec_strerror.h | 2 +-
crypto/dist/ipsec-tools/src/libipsec/key_debug.c | 4 +-
crypto/dist/ipsec-tools/src/libipsec/libpfkey.h | 2 +-
crypto/dist/ipsec-tools/src/libipsec/pfkey.c | 10 ++--
crypto/dist/ipsec-tools/src/libipsec/pfkey_dump.c | 6 +-
crypto/dist/ipsec-tools/src/libipsec/policy_parse.y | 4 +-
crypto/dist/ipsec-tools/src/libipsec/policy_token.l | 2 +-
crypto/dist/ipsec-tools/src/libipsec/test-policy-priority.c | 2 +-
crypto/dist/ipsec-tools/src/libipsec/test-policy.c | 2 +-
crypto/dist/ipsec-tools/src/racoon/admin.c | 2 +-
crypto/dist/ipsec-tools/src/racoon/admin.h | 2 +-
crypto/dist/ipsec-tools/src/racoon/admin_var.h | 2 +-
crypto/dist/ipsec-tools/src/racoon/algorithm.c | 2 +-
crypto/dist/ipsec-tools/src/racoon/algorithm.h | 2 +-
crypto/dist/ipsec-tools/src/racoon/backupsa.c | 2 +-
crypto/dist/ipsec-tools/src/racoon/backupsa.h | 2 +-
crypto/dist/ipsec-tools/src/racoon/cfparse.y | 2 +-
crypto/dist/ipsec-tools/src/racoon/cfparse_proto.h | 2 +-
crypto/dist/ipsec-tools/src/racoon/cftoken.l | 2 +-
crypto/dist/ipsec-tools/src/racoon/cftoken_proto.h | 2 +-
crypto/dist/ipsec-tools/src/racoon/crypto_openssl.c | 2 +-
crypto/dist/ipsec-tools/src/racoon/crypto_openssl.h | 2 +-
crypto/dist/ipsec-tools/src/racoon/debug.h | 2 +-
crypto/dist/ipsec-tools/src/racoon/debugrm.c | 2 +-
crypto/dist/ipsec-tools/src/racoon/debugrm.h | 2 +-
crypto/dist/ipsec-tools/src/racoon/dhgroup.h | 2 +-
crypto/dist/ipsec-tools/src/racoon/dnssec.c | 2 +-
crypto/dist/ipsec-tools/src/racoon/dnssec.h | 2 +-
crypto/dist/ipsec-tools/src/racoon/dump.c | 2 +-
crypto/dist/ipsec-tools/src/racoon/dump.h | 2 +-
crypto/dist/ipsec-tools/src/racoon/eaytest.c | 2 +-
crypto/dist/ipsec-tools/src/racoon/evt.c | 2 +-
crypto/dist/ipsec-tools/src/racoon/evt.h | 2 +-
crypto/dist/ipsec-tools/src/racoon/gcmalloc.h | 2 +-
crypto/dist/ipsec-tools/src/racoon/genlist.c | 2 +-
crypto/dist/ipsec-tools/src/racoon/genlist.h | 2 +-
crypto/dist/ipsec-tools/src/racoon/getcertsbyname.c | 2 +-
crypto/dist/ipsec-tools/src/racoon/gnuc.h | 2 +-
crypto/dist/ipsec-tools/src/racoon/grabmyaddr.c | 2 +-
crypto/dist/ipsec-tools/src/racoon/grabmyaddr.h | 2 +-
crypto/dist/ipsec-tools/src/racoon/gssapi.c | 2 +-
crypto/dist/ipsec-tools/src/racoon/gssapi.h | 2 +-
crypto/dist/ipsec-tools/src/racoon/handler.c | 2 +-
crypto/dist/ipsec-tools/src/racoon/handler.h | 2 +-
crypto/dist/ipsec-tools/src/racoon/ipsec_doi.c | 2 +-
crypto/dist/ipsec-tools/src/racoon/ipsec_doi.h | 2 +-
crypto/dist/ipsec-tools/src/racoon/isakmp.c | 10 ++--
crypto/dist/ipsec-tools/src/racoon/isakmp.h | 2 +-
crypto/dist/ipsec-tools/src/racoon/isakmp_agg.c | 2 +-
crypto/dist/ipsec-tools/src/racoon/isakmp_agg.h | 2 +-
crypto/dist/ipsec-tools/src/racoon/isakmp_base.c | 2 +-
crypto/dist/ipsec-tools/src/racoon/isakmp_base.h | 2 +-
crypto/dist/ipsec-tools/src/racoon/isakmp_cfg.c | 2 +-
crypto/dist/ipsec-tools/src/racoon/isakmp_cfg.h | 2 +-
crypto/dist/ipsec-tools/src/racoon/isakmp_frag.c | 2 +-
crypto/dist/ipsec-tools/src/racoon/isakmp_frag.h | 2 +-
crypto/dist/ipsec-tools/src/racoon/isakmp_ident.c | 2 +-
crypto/dist/ipsec-tools/src/racoon/isakmp_ident.h | 2 +-
crypto/dist/ipsec-tools/src/racoon/isakmp_inf.c | 2 +-
crypto/dist/ipsec-tools/src/racoon/isakmp_inf.h | 2 +-
crypto/dist/ipsec-tools/src/racoon/isakmp_newg.c | 2 +-
crypto/dist/ipsec-tools/src/racoon/isakmp_newg.h | 2 +-
crypto/dist/ipsec-tools/src/racoon/isakmp_quick.c | 2 +-
crypto/dist/ipsec-tools/src/racoon/isakmp_quick.h | 2 +-
crypto/dist/ipsec-tools/src/racoon/isakmp_unity.c | 2 +-
crypto/dist/ipsec-tools/src/racoon/isakmp_unity.h | 2 +-
crypto/dist/ipsec-tools/src/racoon/isakmp_var.h | 2 +-
crypto/dist/ipsec-tools/src/racoon/isakmp_xauth.c | 2 +-
crypto/dist/ipsec-tools/src/racoon/isakmp_xauth.h | 2 +-
crypto/dist/ipsec-tools/src/racoon/kmpstat.c | 2 +-
crypto/dist/ipsec-tools/src/racoon/localconf.c | 2 +-
crypto/dist/ipsec-tools/src/racoon/localconf.h | 2 +-
crypto/dist/ipsec-tools/src/racoon/logger.c | 2 +-
crypto/dist/ipsec-tools/src/racoon/logger.h | 2 +-
crypto/dist/ipsec-tools/src/racoon/main.c | 2 +-
crypto/dist/ipsec-tools/src/racoon/misc.c | 2 +-
crypto/dist/ipsec-tools/src/racoon/misc.h | 2 +-
crypto/dist/ipsec-tools/src/racoon/missing/crypto/rijndael/rijndael-alg-fst.c | 2 +-
crypto/dist/ipsec-tools/src/racoon/missing/crypto/rijndael/rijndael-alg-fst.h | 2 +-
crypto/dist/ipsec-tools/src/racoon/missing/crypto/rijndael/rijndael-api-fst.c | 2 +-
crypto/dist/ipsec-tools/src/racoon/missing/crypto/rijndael/rijndael-api-fst.h | 2 +-
crypto/dist/ipsec-tools/src/racoon/missing/crypto/rijndael/rijndael.h | 2 +-
crypto/dist/ipsec-tools/src/racoon/missing/crypto/rijndael/rijndael_local.h | 2 +-
crypto/dist/ipsec-tools/src/racoon/missing/crypto/sha2/sha2.c | 2 +-
crypto/dist/ipsec-tools/src/racoon/missing/crypto/sha2/sha2.h | 2 +-
crypto/dist/ipsec-tools/src/racoon/missing/strdup.c | 2 +-
crypto/dist/ipsec-tools/src/racoon/nattraversal.c | 2 +-
crypto/dist/ipsec-tools/src/racoon/nattraversal.h | 2 +-
crypto/dist/ipsec-tools/src/racoon/netdb_dnssec.h | 2 +-
crypto/dist/ipsec-tools/src/racoon/oakley.c | 2 +-
crypto/dist/ipsec-tools/src/racoon/oakley.h | 2 +-
crypto/dist/ipsec-tools/src/racoon/pfkey.c | 2 +-
crypto/dist/ipsec-tools/src/racoon/pfkey.h | 2 +-
crypto/dist/ipsec-tools/src/racoon/plainrsa-gen.8 | 2 +-
crypto/dist/ipsec-tools/src/racoon/plainrsa-gen.c | 2 +-
crypto/dist/ipsec-tools/src/racoon/plog.c | 2 +-
crypto/dist/ipsec-tools/src/racoon/plog.h | 2 +-
crypto/dist/ipsec-tools/src/racoon/policy.c | 2 +-
crypto/dist/ipsec-tools/src/racoon/policy.h | 2 +-
crypto/dist/ipsec-tools/src/racoon/privsep.c | 6 +-
crypto/dist/ipsec-tools/src/racoon/privsep.h | 2 +-
crypto/dist/ipsec-tools/src/racoon/proposal.c | 2 +-
crypto/dist/ipsec-tools/src/racoon/proposal.h | 2 +-
crypto/dist/ipsec-tools/src/racoon/prsa_par.y | 2 +-
crypto/dist/ipsec-tools/src/racoon/prsa_tok.l | 2 +-
crypto/dist/ipsec-tools/src/racoon/racoon.8 | 2 +-
crypto/dist/ipsec-tools/src/racoon/racoon.conf.5 | 2 +-
crypto/dist/ipsec-tools/src/racoon/racoonctl.8 | 2 +-
crypto/dist/ipsec-tools/src/racoon/racoonctl.c | 2 +-
crypto/dist/ipsec-tools/src/racoon/racoonctl.h | 2 +-
crypto/dist/ipsec-tools/src/racoon/remoteconf.c | 2 +-
crypto/dist/ipsec-tools/src/racoon/remoteconf.h | 2 +-
crypto/dist/ipsec-tools/src/racoon/rsalist.c | 2 +-
crypto/dist/ipsec-tools/src/racoon/rsalist.h | 2 +-
crypto/dist/ipsec-tools/src/racoon/safefile.c | 2 +-
crypto/dist/ipsec-tools/src/racoon/safefile.h | 2 +-
crypto/dist/ipsec-tools/src/racoon/sainfo.c | 2 +-
crypto/dist/ipsec-tools/src/racoon/sainfo.h | 2 +-
crypto/dist/ipsec-tools/src/racoon/schedule.c | 2 +-
crypto/dist/ipsec-tools/src/racoon/schedule.h | 2 +-
crypto/dist/ipsec-tools/src/racoon/session.c | 2 +-
crypto/dist/ipsec-tools/src/racoon/session.h | 2 +-
crypto/dist/ipsec-tools/src/racoon/sockmisc.c | 2 +-
crypto/dist/ipsec-tools/src/racoon/sockmisc.h | 2 +-
crypto/dist/ipsec-tools/src/racoon/str2val.c | 2 +-
crypto/dist/ipsec-tools/src/racoon/str2val.h | 2 +-
crypto/dist/ipsec-tools/src/racoon/strnames.c | 2 +-
crypto/dist/ipsec-tools/src/racoon/strnames.h | 2 +-
crypto/dist/ipsec-tools/src/racoon/throttle.c | 2 +-
crypto/dist/ipsec-tools/src/racoon/throttle.h | 2 +-
crypto/dist/ipsec-tools/src/racoon/var.h | 2 +-
crypto/dist/ipsec-tools/src/racoon/vendorid.c | 2 +-
crypto/dist/ipsec-tools/src/racoon/vendorid.h | 2 +-
crypto/dist/ipsec-tools/src/racoon/vmbuf.c | 2 +-
crypto/dist/ipsec-tools/src/racoon/vmbuf.h | 2 +-
crypto/dist/ipsec-tools/src/setkey/extern.h | 2 +-
crypto/dist/ipsec-tools/src/setkey/parse.y | 2 +-
crypto/dist/ipsec-tools/src/setkey/setkey.8 | 6 +-
crypto/dist/ipsec-tools/src/setkey/setkey.c | 4 +-
crypto/dist/ipsec-tools/src/setkey/test-pfkey.c | 2 +-
crypto/dist/ipsec-tools/src/setkey/token.l | 2 +-
crypto/dist/ipsec-tools/src/setkey/vchar.h | 2 +-
doc/CHANGES | 3 +-
lib/libipsec/package_version.h | 4 +-
155 files changed, 196 insertions(+), 172 deletions(-)
diffs (truncated from 1540 to 300 lines):
diff -r bbc01904cf66 -r adbb7d98e953 crypto/dist/ipsec-tools/ChangeLog
--- 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@localhost>
+
+ From Francis Dupont <Francis.Dupont%enst-bretagne.fr@localhost>
+ * src/racoon/dnssec.c: fix bogus test on function result
+
+2005-08-11 Yvan Vanhullebus <vanhu%free.fr@localhost>
+
+ * 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@localhost>
+
+ * src/libipsec/{key_debug.c|pfkey.c|pfkey_dump.c}: de-lint, warnings
+
+2005-08-08 Yvan Vanhullebus <vanhu%free.fr@localhost>
+
+ * src/racoon/privsep.c: Fixed a %d -> %zu in
+ port_check() (reported by Matthias Scheler).
+
---------------------------------------------
0.6.1.rc1 released
diff -r bbc01904cf66 -r adbb7d98e953 crypto/dist/ipsec-tools/netbsd-import.sh
--- 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.
diff -r bbc01904cf66 -r adbb7d98e953 crypto/dist/ipsec-tools/src/include-glibc/glibc-bugs.h
--- 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
diff -r bbc01904cf66 -r adbb7d98e953 crypto/dist/ipsec-tools/src/include-glibc/net/pfkeyv2.h
--- 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
diff -r bbc01904cf66 -r adbb7d98e953 crypto/dist/ipsec-tools/src/include-glibc/netinet/ipsec.h
--- 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>
diff -r bbc01904cf66 -r adbb7d98e953 crypto/dist/ipsec-tools/src/include-glibc/sys/queue.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
diff -r bbc01904cf66 -r adbb7d98e953 crypto/dist/ipsec-tools/src/libipsec/ipsec_dump_policy.c
--- 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 */
diff -r bbc01904cf66 -r adbb7d98e953 crypto/dist/ipsec-tools/src/libipsec/ipsec_get_policylen.c
--- 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 $ */
diff -r bbc01904cf66 -r adbb7d98e953 crypto/dist/ipsec-tools/src/libipsec/ipsec_set_policy.3
--- 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 $
.\"
diff -r bbc01904cf66 -r adbb7d98e953 crypto/dist/ipsec-tools/src/libipsec/ipsec_strerror.3
--- 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 $
.\"
diff -r bbc01904cf66 -r adbb7d98e953 crypto/dist/ipsec-tools/src/libipsec/ipsec_strerror.c
--- 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 $ */
diff -r bbc01904cf66 -r adbb7d98e953 crypto/dist/ipsec-tools/src/libipsec/ipsec_strerror.h
--- 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 */
diff -r bbc01904cf66 -r adbb7d98e953 crypto/dist/ipsec-tools/src/libipsec/key_debug.c
--- 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;
}
diff -r bbc01904cf66 -r adbb7d98e953 crypto/dist/ipsec-tools/src/libipsec/libpfkey.h
--- 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 */
diff -r bbc01904cf66 -r adbb7d98e953 crypto/dist/ipsec-tools/src/libipsec/pfkey.c
--- 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);
diff -r bbc01904cf66 -r adbb7d98e953 crypto/dist/ipsec-tools/src/libipsec/pfkey_dump.c
--- 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));
diff -r bbc01904cf66 -r adbb7d98e953 crypto/dist/ipsec-tools/src/libipsec/policy_parse.y
--- 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) {
diff -r bbc01904cf66 -r adbb7d98e953 crypto/dist/ipsec-tools/src/libipsec/policy_token.l
--- 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 */
diff -r bbc01904cf66 -r adbb7d98e953 crypto/dist/ipsec-tools/src/libipsec/test-policy-priority.c
--- 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 $ */
diff -r bbc01904cf66 -r adbb7d98e953 crypto/dist/ipsec-tools/src/libipsec/test-policy.c
--- 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 $ */
diff -r bbc01904cf66 -r adbb7d98e953 crypto/dist/ipsec-tools/src/racoon/admin.c
--- 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 */
diff -r bbc01904cf66 -r adbb7d98e953 crypto/dist/ipsec-tools/src/racoon/admin.h
--- 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 */
diff -r bbc01904cf66 -r adbb7d98e953 crypto/dist/ipsec-tools/src/racoon/admin_var.h
--- 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 $ */
Home |
Main Index |
Thread Index |
Old Index