upgrade to 10/4 snapshot.

- disable idea/rc5 in phase 1 by default
- use official DOI # for AES (= rijndael)
- be more careful about parsing variable-length packet content
- have __attribute__((__packed__)), be friendly with align-picky arch
  (confirmed to be working on i386, sh3 and alpha)

5 files changed, 11 insertions, 70 deletions

diff --git a/security/racoon/Makefile b/security/racoon/Makefile
index df666e69500..7e9c520d766 100644
--- a/security/racoon/Makefile
+++ b/security/racoon/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.22 2000/09/23 21:25:06 itojun Exp $
+# $NetBSD: Makefile,v 1.23 2000/10/04 00:31:48 itojun Exp $
 #
 
-DISTNAME=	racoon-20000923a
+DISTNAME=	racoon-20001004a
 CATEGORIES=	security net
 MASTER_SITES=	ftp://ftp.kame.net/pub/kame/misc/
 
diff --git a/security/racoon/files/md5 b/security/racoon/files/md5
index 795c1e789ea..a65557ae777 100644
--- a/security/racoon/files/md5
+++ b/security/racoon/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.10 2000/09/23 21:25:07 itojun Exp $
+$NetBSD: md5,v 1.11 2000/10/04 00:31:48 itojun Exp $
 
-MD5 (racoon-20000923a.tar.gz) = aa57f85d164eddf9f42bc9187db29378
+MD5 (racoon-20001004a.tar.gz) = 2eff084009c2b4234ff0cfd84c2297b0
diff --git a/security/racoon/files/patch-sum b/security/racoon/files/patch-sum
index 9fe83646714..c7f5ac32b41 100644
--- a/security/racoon/files/patch-sum
+++ b/security/racoon/files/patch-sum
@@ -1,7 +1,6 @@
-$NetBSD: patch-sum,v 1.7 2000/09/24 17:28:23 itojun Exp $
+$NetBSD: patch-sum,v 1.8 2000/10/04 00:31:48 itojun Exp $
 
 MD5 (patch-aa) = d22da496fc39e0bc2c926c6ffbb758e1
 MD5 (patch-ab) = 1a2944fbce4cee174eade2cc0726c0ef
-MD5 (patch-ac) = 148e0972689931384d1c55d4f99d3f66
+MD5 (patch-ac) = 40a2125ca09427e050e4d6000c42b2c6
 MD5 (patch-ad) = b99c6e6d3745d87bf62ac622c4ee6756
-MD5 (patch-ae) = 32d05038b794e589cba080a7a8e86112
diff --git a/security/racoon/patches/patch-ac b/security/racoon/patches/patch-ac
index d8f98724994..519a6511f9f 100644
--- a/security/racoon/patches/patch-ac
+++ b/security/racoon/patches/patch-ac
@@ -1,22 +1,17 @@
-$NetBSD: patch-ac,v 1.2 2000/07/30 16:56:38 itojun Exp $
---- samples/racoon.conf.sample.orig	Mon Jul 31 01:48:04 2000
-+++ samples/racoon.conf.sample	Mon Jul 31 01:50:29 2000
-@@ -4,15 +4,15 @@
- # "include" directive with relative file path.
- # you can overwrite "path" directive afterwards, however, doing so may add
+--- samples/racoon.conf.sample.orig	Wed Oct  4 09:24:11 2000
++++ samples/racoon.conf.sample	Wed Oct  4 09:24:39 2000
+@@ -6,3 +6,3 @@
  # more confusion.
 -#path include "/usr/local/v6/etc" ;
 +#path include "/etc/racoon" ;
  #include "remote.conf" ;
- 
+@@ -10,3 +10,3 @@
  # the file should contain key ID/key pairs, for pre-shared key authentication.
 -path pre_shared_key "/usr/local/v6/etc/psk.txt" ;
 +path pre_shared_key "/etc/racoon/psk.txt" ;
  
- # racoon will look for certificate file in the directory,
+@@ -14,3 +14,3 @@
  # if the certificate/certificate request payload is received.
 -#path certificate "/usr/local/openssl/certs" ;
 +#path certificate "/usr/pkg/certs" ;
  
- # identification for our side.
- identifier user_fqdn "foo@kame.net";
diff --git a/security/racoon/patches/patch-ae b/security/racoon/patches/patch-ae
deleted file mode 100644
index f8c3fae8429..00000000000
--- a/security/racoon/patches/patch-ae
+++ /dev/null
@@ -1,53 +0,0 @@
-$NetBSD: patch-ae,v 1.3 2000/09/24 17:28:25 itojun Exp $
-
-Index: session.c
-===================================================================
-RCS file: /cvsroot/kame/kame/kame/kame/racoon/session.c,v
-retrieving revision 1.13
-diff -u -r1.13 session.c
---- session.c	2000/09/22 18:35:53	1.13
-+++ session.c	2000/09/24 17:25:49
-@@ -112,8 +112,10 @@
- 
- 	FD_ZERO(&mask0);
- 
-+#ifdef ENABLE_ADMINPORT
- 	FD_SET(lcconf->sock_admin, &mask0);
- 	nfds = (nfds > lcconf->sock_admin ? nfds : lcconf->sock_admin);
-+#endif
- 	FD_SET(lcconf->sock_pfkey, &mask0);
- 	nfds = (nfds > lcconf->sock_pfkey ? nfds : lcconf->sock_pfkey);
- 	FD_SET(lcconf->rtsock, &mask0);
-@@ -157,8 +159,10 @@
- 			/*NOTREACHED*/
- 		}
- 
-+#ifdef ENABLE_ADMINPORT
- 		if (FD_ISSET(lcconf->sock_admin, &rfds))
- 			admin_handler();
-+#endif
- 
- 		for (p = lcconf->myaddrs; p; p = p->next) {
- 			if (!p->addr)
-@@ -185,9 +189,11 @@
- 			FD_ZERO(&mask0);
- 			nfds = 0;
- 
-+#ifdef ENABLE_ADMINPORT
- 			FD_SET(lcconf->sock_admin, &mask0);
- 			nfds = (nfds > lcconf->sock_admin
- 				? nfds : lcconf->sock_admin);
-+#endif
- 			FD_SET(lcconf->sock_pfkey, &mask0);
- 			nfds = (nfds > lcconf->sock_pfkey
- 				? nfds : lcconf->sock_pfkey);
-@@ -364,7 +370,9 @@
- {
- 	isakmp_close();
- 	pfkey_close(lcconf->sock_pfkey);
-+#ifdef ENABLE_ADMINPORT
- 	(void)admin_close();
-+#endif
- 	return 0;
- }
-