upgrade to 20021120.

- fix sha2 computation (was in patch-ag)
- plug some memory leaks
- more strict isakmp header length check
- correct phase 2 proposal reqid handling
- check for fd_set overrun

4 files changed, 12 insertions, 36 deletions

diff --git a/security/racoon/Makefile b/security/racoon/Makefile
index ee22f5946ab..0374a81c18d 100644
--- a/security/racoon/Makefile
+++ b/security/racoon/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.53 2002/08/25 21:50:42 jlam Exp $
+# $NetBSD: Makefile,v 1.54 2002/11/20 03:26:26 itojun Exp $
 #
 
-DISTNAME=	racoon-20020507a
+DISTNAME=	racoon-20021120a
 CATEGORIES=	security net
 MASTER_SITES=	ftp://ftp.kame.net/pub/kame/misc/
 
diff --git a/security/racoon/distinfo b/security/racoon/distinfo
index 7881f084082..04921df1cec 100644
--- a/security/racoon/distinfo
+++ b/security/racoon/distinfo
@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.17 2002/08/25 21:50:42 jlam Exp $
+$NetBSD: distinfo,v 1.18 2002/11/20 03:26:26 itojun Exp $
 
-SHA1 (racoon-20020507a.tar.gz) = 9ecf5fa5660362a967bf6e48499e834eab3a7181
-Size (racoon-20020507a.tar.gz) = 620752 bytes
+SHA1 (racoon-20021120a.tar.gz) = 07b9919a265d778171689a591d71cd2a25e82d98
+Size (racoon-20021120a.tar.gz) = 620362 bytes
 SHA1 (patch-aa) = 586f7bd5129f3be88cb104244fba2b7b13a7b044
-SHA1 (patch-ab) = 2f720e6214bd10064dba84cdfe5446d0e37a5de0
+SHA1 (patch-ab) = 28118a57be0eb2b630fe128d25cdd11261687c62
 SHA1 (patch-ac) = 29ff53ca5a23785253321a9629c32065da56ca9f
 SHA1 (patch-ad) = d4718088c04c72ccfe34c4b53ec4a2f830600877
 SHA1 (patch-ae) = 3b5dcbd2398e95e9bdb0cb69a11d49eecc981a08
 SHA1 (patch-af) = 0d0fb78ae6f3a10be95ff6160dc85140ea09455a
-SHA1 (patch-ag) = 5b78feaca9e7c759964dd8225684d70ef186d65b
diff --git a/security/racoon/patches/patch-ab b/security/racoon/patches/patch-ab
index 20a94953258..06ecb0f0476 100644
--- a/security/racoon/patches/patch-ab
+++ b/security/racoon/patches/patch-ab
@@ -1,9 +1,9 @@
-$NetBSD: patch-ab,v 1.2 2001/06/28 23:34:11 itojun Exp $
+$NetBSD: patch-ab,v 1.3 2002/11/20 03:26:27 itojun Exp $
 
---- Makefile.in.orig	Wed Apr 11 15:11:54 2001
-+++ Makefile.in	Fri Jun 29 08:26:43 2001
+--- Makefile.in.orig	Fri Sep 27 15:04:59 2002
++++ Makefile.in	Wed Nov 20 12:11:10 2002
 @@ -10,7 +10,7 @@
- CFLAGS=	@CFLAGS@ $(CPPFLAGS) @DEFS@ $(CPPFLAGS) $(OPTFLAG) -DIPSEC -I. -I$(srcdir) -Dss_family=__ss_family -Dss_len=__ss_len -DSYSCONFDIR=\"${sysconfdir}\"
+ CFLAGS=	@CFLAGS@ $(CPPFLAGS) @DEFS@ $(CPPFLAGS) $(OPTFLAG) -DIPSEC -I. -I$(srcdir) -DSYSCONFDIR=\"${sysconfdir}\"
  CFLAGS+=-DYY_NO_UNPUT
  CFLAGS+=-I${srcdir}/../libipsec
 -LIBS=	@LIBS@
@@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.2 2001/06/28 23:34:11 itojun Exp $
  YFLAGS+=-d
  
  prefix=	@prefix@
-@@ -78,15 +78,6 @@
+@@ -86,15 +86,6 @@
  	$(INSTALL) -s -o bin -g bin -m 555 racoon $(prefix)/sbin
  	$(INSTALL) -o bin -g bin -m 444 racoon.8 $(mandir)/man8
  	$(INSTALL) -o bin -g bin -m 444 racoon.conf.5 $(mandir)/man5
@@ -26,4 +26,4 @@ $NetBSD: patch-ab,v 1.2 2001/06/28 23:34:11 itojun Exp $
 -	done
  
  clean:
- 	-rm -f $(PROG) *.o *.core y.tab.h
+ 	-rm -f $(PROG) *.o *.core y.tab.h cftoken.c cfparse.c cftoken.h cfparse.h
diff --git a/security/racoon/patches/patch-ag b/security/racoon/patches/patch-ag
deleted file mode 100644
index f3c44a89ea3..00000000000
--- a/security/racoon/patches/patch-ag
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ag,v 1.6 2002/08/25 21:50:43 jlam Exp $
-
---- algorithm.c.orig	Thu Apr 25 18:48:32 2002
-+++ algorithm.c	Mon May 20 22:11:56 2002
-@@ -60,15 +60,15 @@
- { "sha2_256",	algtype_sha2_256,	OAKLEY_ATTR_HASH_ALG_SHA2_256,
- 		eay_sha2_256_init,	eay_sha2_256_update,
- 		eay_sha2_256_final,	eay_sha2_256_hashlen,
--		eay_sha1_one, },
-+		eay_sha2_256_one, },
- { "sha2_384",	algtype_sha2_384,	OAKLEY_ATTR_HASH_ALG_SHA2_384,
- 		eay_sha2_384_init,	eay_sha2_384_update,
- 		eay_sha2_384_final,	eay_sha2_384_hashlen,
--		eay_sha1_one, },
-+		eay_sha2_384_one, },
- { "sha2_512",	algtype_sha2_512,	OAKLEY_ATTR_HASH_ALG_SHA2_512,
- 		eay_sha2_512_init,	eay_sha2_512_update,
- 		eay_sha2_512_final,	eay_sha2_512_hashlen,
--		eay_sha1_one, },
-+		eay_sha2_512_one, },
- };
- 
- static struct hmac_algorithm oakley_hmacdef[] = {