Module Name:	basesrc
Committed By:	thorpej
Date:		Fri Jan 26 23:54:07 UTC 2001

Update of /cvsroot/basesrc/crypto/dist/kame
In directory netbsd.hut.fi:/tmp/cvs-serv23713

Log Message:
Bring in latest racoon/libipsec from KAME (not part of a snap
kit).  Includes a few bugfixes from, including a re-key problem
and memory leak when doing GSSAPI authentication for Phase 1.
Also some better config file documentation.


Vendor Tag:	KAME
Release Tags:	notsnap20010126
		
U basesrc/crypto/dist/kame/racoon/admin.c
U basesrc/crypto/dist/kame/racoon/admin.h
U basesrc/crypto/dist/kame/racoon/admin_var.h
U basesrc/crypto/dist/kame/racoon/cfparse.h
C basesrc/crypto/dist/kame/racoon/cfparse.y
U basesrc/crypto/dist/kame/racoon/cftoken.h
U basesrc/crypto/dist/kame/racoon/cftoken.l
U basesrc/crypto/dist/kame/racoon/config.guess
U basesrc/crypto/dist/kame/racoon/config.sub
U basesrc/crypto/dist/kame/racoon/configure
U basesrc/crypto/dist/kame/racoon/configure.in
U basesrc/crypto/dist/kame/racoon/crypto_openssl.c
U basesrc/crypto/dist/kame/racoon/crypto_openssl.h
U basesrc/crypto/dist/kame/racoon/debug.h
U basesrc/crypto/dist/kame/racoon/dump.c
U basesrc/crypto/dist/kame/racoon/dump.h
U basesrc/crypto/dist/kame/racoon/eaytest.c
U basesrc/crypto/dist/kame/racoon/gcmalloc.h
U basesrc/crypto/dist/kame/racoon/gnuc.h
U basesrc/crypto/dist/kame/racoon/grabmyaddr.c
U basesrc/crypto/dist/kame/racoon/grabmyaddr.h
U basesrc/crypto/dist/kame/racoon/handler.c
U basesrc/crypto/dist/kame/racoon/handler.h
U basesrc/crypto/dist/kame/racoon/install-sh
C basesrc/crypto/dist/kame/racoon/ipsec_doi.c
U basesrc/crypto/dist/kame/racoon/ipsec_doi.h
U basesrc/crypto/dist/kame/racoon/isakmp.c
U basesrc/crypto/dist/kame/racoon/isakmp.h
U basesrc/crypto/dist/kame/racoon/isakmp_agg.c
U basesrc/crypto/dist/kame/racoon/isakmp_agg.h
U basesrc/crypto/dist/kame/racoon/isakmp_base.c
U basesrc/crypto/dist/kame/racoon/isakmp_base.h
U basesrc/crypto/dist/kame/racoon/isakmp_ident.c
U basesrc/crypto/dist/kame/racoon/isakmp_ident.h
U basesrc/crypto/dist/kame/racoon/isakmp_inf.c
U basesrc/crypto/dist/kame/racoon/isakmp_inf.h
U basesrc/crypto/dist/kame/racoon/isakmp_newg.c
U basesrc/crypto/dist/kame/racoon/isakmp_newg.h
U basesrc/crypto/dist/kame/racoon/isakmp_quick.c
U basesrc/crypto/dist/kame/racoon/isakmp_quick.h
U basesrc/crypto/dist/kame/racoon/isakmp_var.h
U basesrc/crypto/dist/kame/racoon/kmpstat.c
U basesrc/crypto/dist/kame/racoon/main.c
U basesrc/crypto/dist/kame/racoon/localconf.c
U basesrc/crypto/dist/kame/racoon/localconf.h
U basesrc/crypto/dist/kame/racoon/logger.c
U basesrc/crypto/dist/kame/racoon/logger.h
U basesrc/crypto/dist/kame/racoon/misc.c
U basesrc/crypto/dist/kame/racoon/misc.h
U basesrc/crypto/dist/kame/racoon/oakley.c
U basesrc/crypto/dist/kame/racoon/oakley.h
U basesrc/crypto/dist/kame/racoon/pfkey.c
U basesrc/crypto/dist/kame/racoon/pfkey.h
U basesrc/crypto/dist/kame/racoon/plog.c
U basesrc/crypto/dist/kame/racoon/plog.h
U basesrc/crypto/dist/kame/racoon/policy.c
U basesrc/crypto/dist/kame/racoon/policy.h
U basesrc/crypto/dist/kame/racoon/proposal.c
U basesrc/crypto/dist/kame/racoon/proposal.h
U basesrc/crypto/dist/kame/racoon/racoon.8
C basesrc/crypto/dist/kame/racoon/racoon.conf.5
U basesrc/crypto/dist/kame/racoon/random.c
U basesrc/crypto/dist/kame/racoon/random.h
U basesrc/crypto/dist/kame/racoon/remoteconf.c
U basesrc/crypto/dist/kame/racoon/remoteconf.h
U basesrc/crypto/dist/kame/racoon/safefile.c
U basesrc/crypto/dist/kame/racoon/safefile.h
U basesrc/crypto/dist/kame/racoon/sainfo.c
U basesrc/crypto/dist/kame/racoon/sainfo.h
U basesrc/crypto/dist/kame/racoon/schedule.c
U basesrc/crypto/dist/kame/racoon/schedule.h
U basesrc/crypto/dist/kame/racoon/session.c
U basesrc/crypto/dist/kame/racoon/session.h
U basesrc/crypto/dist/kame/racoon/sockmisc.c
U basesrc/crypto/dist/kame/racoon/sockmisc.h
U basesrc/crypto/dist/kame/racoon/str2val.c
U basesrc/crypto/dist/kame/racoon/str2val.h
U basesrc/crypto/dist/kame/racoon/strnames.c
U basesrc/crypto/dist/kame/racoon/strnames.h
U basesrc/crypto/dist/kame/racoon/var.h
U basesrc/crypto/dist/kame/racoon/vendorid.c
U basesrc/crypto/dist/kame/racoon/vendorid.h
U basesrc/crypto/dist/kame/racoon/vmbuf.c
U basesrc/crypto/dist/kame/racoon/vmbuf.h
U basesrc/crypto/dist/kame/racoon/algorithm.c
U basesrc/crypto/dist/kame/racoon/algorithm.h
U basesrc/crypto/dist/kame/racoon/gssapi.c
U basesrc/crypto/dist/kame/racoon/gssapi.h
U basesrc/crypto/dist/kame/racoon/.cvsignore
U basesrc/crypto/dist/kame/racoon/Makefile.in
U basesrc/crypto/dist/kame/racoon/TODO
U basesrc/crypto/dist/kame/racoon/aclocal.m4
U basesrc/crypto/dist/kame/racoon/samples/.cvsignore
U basesrc/crypto/dist/kame/racoon/samples/Makefile
U basesrc/crypto/dist/kame/racoon/samples/psk.txt.in
U basesrc/crypto/dist/kame/racoon/samples/psk.txt.sample
U basesrc/crypto/dist/kame/racoon/samples/racoon.conf.in
U basesrc/crypto/dist/kame/racoon/samples/racoon.conf.sample
U basesrc/crypto/dist/kame/racoon/samples/sandiego.conf
U basesrc/crypto/dist/kame/racoon/samples/sandiego.pl
U basesrc/crypto/dist/kame/racoon/samples/racoon.conf.sample-gssapi
U basesrc/crypto/dist/kame/racoon/contrib/sp.pl
U basesrc/crypto/dist/kame/racoon/doc/pattern
U basesrc/crypto/dist/kame/racoon/doc/FAQ
U basesrc/crypto/dist/kame/racoon/doc/README.certificate
U basesrc/crypto/dist/kame/racoon/doc/SantaBarbara-result.jp
U basesrc/crypto/dist/kame/racoon/doc/ibm-result.jp
U basesrc/crypto/dist/kame/racoon/doc/question
U basesrc/crypto/dist/kame/racoon/doc/redmond.txt
U basesrc/crypto/dist/kame/racoon/doc/rules.jp
U basesrc/crypto/dist/kame/racoon/doc/sandiego-result.en
U basesrc/crypto/dist/kame/racoon/doc/sandiego-result.jp
U basesrc/crypto/dist/kame/racoon/doc/sandiego0009-result.en
U basesrc/crypto/dist/kame/racoon/doc/README.gssapi
U basesrc/crypto/dist/kame/racoon/missing/addrinfo.h
U basesrc/crypto/dist/kame/racoon/missing/getaddrinfo.c
U basesrc/crypto/dist/kame/racoon/missing/getnameinfo.c
U basesrc/crypto/dist/kame/racoon/missing/strdup.c
U basesrc/crypto/dist/kame/libipsec/Makefile
U basesrc/crypto/dist/kame/libipsec/ipsec_dump_policy.c
U basesrc/crypto/dist/kame/libipsec/ipsec_get_policylen.c
U basesrc/crypto/dist/kame/libipsec/ipsec_set_policy.3
U basesrc/crypto/dist/kame/libipsec/ipsec_strerror.3
U basesrc/crypto/dist/kame/libipsec/ipsec_strerror.c
U basesrc/crypto/dist/kame/libipsec/ipsec_strerror.h
U basesrc/crypto/dist/kame/libipsec/libpfkey.h
U basesrc/crypto/dist/kame/libipsec/pfkey.c
U basesrc/crypto/dist/kame/libipsec/pfkey_dump.c
U basesrc/crypto/dist/kame/libipsec/policy_parse.y
U basesrc/crypto/dist/kame/libipsec/policy_token.l
U basesrc/crypto/dist/kame/libipsec/test-policy.c

3 conflicts created by this import.
Use the following command to help the merge:

	cvs checkout -jKAME:yesterday -jKAME basesrc/crypto/dist/kame