Module Name:	src
Committed By:	manu
Date:		Wed Feb 23 14:55:12 UTC 2005

Update of /cvsroot/src/crypto/dist/ipsec-tools
In directory ivanova.netbsd.org:/tmp/cvs-serv8488

Log Message:
Import ipsec-tools 0.6 branch as of 2005/02/23. News from last imported version
according to ipsec-tools' ChangeLog:

2005-02-23  Emmanuel Dreyfus <manu@netbsd.org>

        * configure.ac, src/racoon/{Makefile.am|crypto_openssl.c}: optionnal
          support for patented algorithms: IDEA and RC5.
        * src/racoon/{isakmp_xauth.c|main.c}: don't initialize RADIUS if it
          is not required in the configuration
        * src/racoon/isakmp.c: do not reject addresses for which kernel
          refused UDP encapsulation, they can still be used for non NAT-T
          traffic (eg: NAT-T enabled racoon on non NAT-T enabled kernel)

2005-02-18  Emmanuel Dreyfus <manu@netbsd.org>

        * src/racoon/{main.c|eaytest.c|plairsa-gen.c}
          src/setkey/setkey.c: don't use fuzzy paths for package_version.h

2005-02-18  Yvan Vanhullebus  <vanhu@free.fr>

        * src/racoon/isakmp_inf.c: Purge generated SPDs when getting a
          related DELETE_SA
        * src/racoon/pfkey.c: do NOT unbindph12() when SA acquire

2005-02-17  Emmanuel Dreyfus <manu@netbsd.org>

        From Fred Senault <fred.letter@lacave.net>
        * src/racoon/remoteconf.c: Fix a bug in script init

2005-02-17  Yvan Vanhullebus  <vanhu@free.fr>

        * src/racoon/ipsec_doi.c: Workaround for phase1 lifetime checks

2005-02-15  Michal Ludvig  <michal@logix.cz>

        * configure.ac: Changed --enable-natt_NN to --enable-natt-versions=NN,NN


Vendor Tag:	IPSEC_TOOLS
Release Tags:	ipsec-tools-0_6-20050223
		
N src/crypto/dist/ipsec-tools/aclocal.m4
U src/crypto/dist/ipsec-tools/ChangeLog
U src/crypto/dist/ipsec-tools/Makefile.am
U src/crypto/dist/ipsec-tools/NEWS
U src/crypto/dist/ipsec-tools/README
U src/crypto/dist/ipsec-tools/acracoon.m4
U src/crypto/dist/ipsec-tools/bootstrap
U src/crypto/dist/ipsec-tools/configure.ac
U src/crypto/dist/ipsec-tools/package_version.h.in
N src/crypto/dist/ipsec-tools/config.h.in
N src/crypto/dist/ipsec-tools/config.guess
N src/crypto/dist/ipsec-tools/config.sub
N src/crypto/dist/ipsec-tools/ltmain.sh
N src/crypto/dist/ipsec-tools/install-sh
N src/crypto/dist/ipsec-tools/missing
N src/crypto/dist/ipsec-tools/depcomp
N src/crypto/dist/ipsec-tools/ylwrap
N src/crypto/dist/ipsec-tools/Makefile.in
N src/crypto/dist/ipsec-tools/configure
N src/crypto/dist/ipsec-tools/rpm/Makefile.in
U src/crypto/dist/ipsec-tools/rpm/Makefile.am
U src/crypto/dist/ipsec-tools/rpm/ipsec-tools.FC1
U src/crypto/dist/ipsec-tools/rpm/ipsec-tools.spec.in
N src/crypto/dist/ipsec-tools/rpm/suse/Makefile.in
U src/crypto/dist/ipsec-tools/rpm/suse/Makefile.am
U src/crypto/dist/ipsec-tools/rpm/suse/ipsec-tools.spec.in
U src/crypto/dist/ipsec-tools/rpm/suse/racoon.init
U src/crypto/dist/ipsec-tools/rpm/suse/sysconfig.racoon
N src/crypto/dist/ipsec-tools/src/Makefile.in
U src/crypto/dist/ipsec-tools/src/Makefile.am
N src/crypto/dist/ipsec-tools/src/include-glibc/Makefile.in
U src/crypto/dist/ipsec-tools/src/include-glibc/Makefile.am
U src/crypto/dist/ipsec-tools/src/include-glibc/glibc-bugs.h
U src/crypto/dist/ipsec-tools/src/include-glibc/net/pfkeyv2.h
U src/crypto/dist/ipsec-tools/src/include-glibc/sys/queue.h
U src/crypto/dist/ipsec-tools/src/include-glibc/netinet/ipsec.h
N src/crypto/dist/ipsec-tools/src/libipsec/Makefile.in
U src/crypto/dist/ipsec-tools/src/libipsec/Makefile.am
U src/crypto/dist/ipsec-tools/src/libipsec/ipsec_dump_policy.c
U src/crypto/dist/ipsec-tools/src/libipsec/ipsec_get_policylen.c
U src/crypto/dist/ipsec-tools/src/libipsec/ipsec_set_policy.3
U src/crypto/dist/ipsec-tools/src/libipsec/ipsec_strerror.3
U src/crypto/dist/ipsec-tools/src/libipsec/ipsec_strerror.c
U src/crypto/dist/ipsec-tools/src/libipsec/ipsec_strerror.h
U src/crypto/dist/ipsec-tools/src/libipsec/key_debug.c
C src/crypto/dist/ipsec-tools/src/libipsec/libpfkey.h
U src/crypto/dist/ipsec-tools/src/libipsec/pfkey.c
U src/crypto/dist/ipsec-tools/src/libipsec/pfkey_dump.c
U src/crypto/dist/ipsec-tools/src/libipsec/policy_parse.y
U src/crypto/dist/ipsec-tools/src/libipsec/policy_token.l
U src/crypto/dist/ipsec-tools/src/libipsec/test-policy-priority.c
U src/crypto/dist/ipsec-tools/src/libipsec/test-policy.c
N src/crypto/dist/ipsec-tools/src/racoon/Makefile.in
U src/crypto/dist/ipsec-tools/src/racoon/Makefile.am
U src/crypto/dist/ipsec-tools/src/racoon/TODO
U src/crypto/dist/ipsec-tools/src/racoon/admin.c
U src/crypto/dist/ipsec-tools/src/racoon/admin.h
U src/crypto/dist/ipsec-tools/src/racoon/admin_var.h
U src/crypto/dist/ipsec-tools/src/racoon/algorithm.c
U src/crypto/dist/ipsec-tools/src/racoon/algorithm.h
U src/crypto/dist/ipsec-tools/src/racoon/backupsa.c
U src/crypto/dist/ipsec-tools/src/racoon/backupsa.h
U src/crypto/dist/ipsec-tools/src/racoon/cfparse.y
U src/crypto/dist/ipsec-tools/src/racoon/cfparse_proto.h
U src/crypto/dist/ipsec-tools/src/racoon/cftoken.l
U src/crypto/dist/ipsec-tools/src/racoon/cftoken_proto.h
U src/crypto/dist/ipsec-tools/src/racoon/crypto_openssl.c
U src/crypto/dist/ipsec-tools/src/racoon/crypto_openssl.h
U src/crypto/dist/ipsec-tools/src/racoon/debug.h
U src/crypto/dist/ipsec-tools/src/racoon/debugrm.c
U src/crypto/dist/ipsec-tools/src/racoon/debugrm.h
U src/crypto/dist/ipsec-tools/src/racoon/dhgroup.h
U src/crypto/dist/ipsec-tools/src/racoon/dnssec.c
U src/crypto/dist/ipsec-tools/src/racoon/dnssec.h
U src/crypto/dist/ipsec-tools/src/racoon/dump.c
U src/crypto/dist/ipsec-tools/src/racoon/dump.h
U src/crypto/dist/ipsec-tools/src/racoon/eaytest.c
U src/crypto/dist/ipsec-tools/src/racoon/evt.c
U src/crypto/dist/ipsec-tools/src/racoon/evt.h
U src/crypto/dist/ipsec-tools/src/racoon/gcmalloc.h
U src/crypto/dist/ipsec-tools/src/racoon/genlist.c
U src/crypto/dist/ipsec-tools/src/racoon/genlist.h
U src/crypto/dist/ipsec-tools/src/racoon/getcertsbyname.c
U src/crypto/dist/ipsec-tools/src/racoon/gnuc.h
U src/crypto/dist/ipsec-tools/src/racoon/grabmyaddr.c
U src/crypto/dist/ipsec-tools/src/racoon/grabmyaddr.h
U src/crypto/dist/ipsec-tools/src/racoon/gssapi.c
U src/crypto/dist/ipsec-tools/src/racoon/gssapi.h
U src/crypto/dist/ipsec-tools/src/racoon/handler.c
U src/crypto/dist/ipsec-tools/src/racoon/handler.h
U src/crypto/dist/ipsec-tools/src/racoon/ipsec_doi.c
U src/crypto/dist/ipsec-tools/src/racoon/ipsec_doi.h
U src/crypto/dist/ipsec-tools/src/racoon/isakmp.c
U src/crypto/dist/ipsec-tools/src/racoon/isakmp.h
U src/crypto/dist/ipsec-tools/src/racoon/isakmp_agg.c
U src/crypto/dist/ipsec-tools/src/racoon/isakmp_agg.h
U src/crypto/dist/ipsec-tools/src/racoon/isakmp_base.c
U src/crypto/dist/ipsec-tools/src/racoon/isakmp_base.h
U src/crypto/dist/ipsec-tools/src/racoon/isakmp_cfg.c
U src/crypto/dist/ipsec-tools/src/racoon/isakmp_cfg.h
U src/crypto/dist/ipsec-tools/src/racoon/isakmp_frag.c
U src/crypto/dist/ipsec-tools/src/racoon/isakmp_frag.h
U src/crypto/dist/ipsec-tools/src/racoon/isakmp_ident.c
U src/crypto/dist/ipsec-tools/src/racoon/isakmp_ident.h
U src/crypto/dist/ipsec-tools/src/racoon/isakmp_inf.c
U src/crypto/dist/ipsec-tools/src/racoon/isakmp_inf.h
U src/crypto/dist/ipsec-tools/src/racoon/isakmp_newg.c
U src/crypto/dist/ipsec-tools/src/racoon/isakmp_newg.h
U src/crypto/dist/ipsec-tools/src/racoon/isakmp_quick.c
U src/crypto/dist/ipsec-tools/src/racoon/isakmp_quick.h
U src/crypto/dist/ipsec-tools/src/racoon/isakmp_unity.c
U src/crypto/dist/ipsec-tools/src/racoon/isakmp_unity.h
U src/crypto/dist/ipsec-tools/src/racoon/isakmp_var.h
U src/crypto/dist/ipsec-tools/src/racoon/isakmp_xauth.c
U src/crypto/dist/ipsec-tools/src/racoon/isakmp_xauth.h
U src/crypto/dist/ipsec-tools/src/racoon/kmpstat.c
U src/crypto/dist/ipsec-tools/src/racoon/localconf.c
U src/crypto/dist/ipsec-tools/src/racoon/localconf.h
U src/crypto/dist/ipsec-tools/src/racoon/logger.c
U src/crypto/dist/ipsec-tools/src/racoon/logger.h
C src/crypto/dist/ipsec-tools/src/racoon/main.c
U src/crypto/dist/ipsec-tools/src/racoon/misc.c
U src/crypto/dist/ipsec-tools/src/racoon/misc.h
U src/crypto/dist/ipsec-tools/src/racoon/nattraversal.c
U src/crypto/dist/ipsec-tools/src/racoon/nattraversal.h
U src/crypto/dist/ipsec-tools/src/racoon/netdb_dnssec.h
U src/crypto/dist/ipsec-tools/src/racoon/oakley.c
U src/crypto/dist/ipsec-tools/src/racoon/oakley.h
U src/crypto/dist/ipsec-tools/src/racoon/pfkey.c
U src/crypto/dist/ipsec-tools/src/racoon/pfkey.h
U src/crypto/dist/ipsec-tools/src/racoon/plainrsa-gen.8
U src/crypto/dist/ipsec-tools/src/racoon/plainrsa-gen.c
U src/crypto/dist/ipsec-tools/src/racoon/plog.c
U src/crypto/dist/ipsec-tools/src/racoon/plog.h
U src/crypto/dist/ipsec-tools/src/racoon/policy.c
U src/crypto/dist/ipsec-tools/src/racoon/policy.h
U src/crypto/dist/ipsec-tools/src/racoon/privsep.c
U src/crypto/dist/ipsec-tools/src/racoon/privsep.h
U src/crypto/dist/ipsec-tools/src/racoon/proposal.c
U src/crypto/dist/ipsec-tools/src/racoon/proposal.h
U src/crypto/dist/ipsec-tools/src/racoon/prsa_par.y
U src/crypto/dist/ipsec-tools/src/racoon/prsa_tok.l
U src/crypto/dist/ipsec-tools/src/racoon/racoon.8
U src/crypto/dist/ipsec-tools/src/racoon/racoon.conf.5
U src/crypto/dist/ipsec-tools/src/racoon/racoonctl.8
U src/crypto/dist/ipsec-tools/src/racoon/racoonctl.c
U src/crypto/dist/ipsec-tools/src/racoon/racoonctl.h
U src/crypto/dist/ipsec-tools/src/racoon/remoteconf.c
U src/crypto/dist/ipsec-tools/src/racoon/remoteconf.h
U src/crypto/dist/ipsec-tools/src/racoon/rsalist.c
U src/crypto/dist/ipsec-tools/src/racoon/rsalist.h
U src/crypto/dist/ipsec-tools/src/racoon/safefile.c
U src/crypto/dist/ipsec-tools/src/racoon/safefile.h
U src/crypto/dist/ipsec-tools/src/racoon/sainfo.c
U src/crypto/dist/ipsec-tools/src/racoon/sainfo.h
U src/crypto/dist/ipsec-tools/src/racoon/schedule.c
U src/crypto/dist/ipsec-tools/src/racoon/schedule.h
U src/crypto/dist/ipsec-tools/src/racoon/session.c
U src/crypto/dist/ipsec-tools/src/racoon/session.h
U src/crypto/dist/ipsec-tools/src/racoon/sockmisc.c
U src/crypto/dist/ipsec-tools/src/racoon/sockmisc.h
U src/crypto/dist/ipsec-tools/src/racoon/stats.pl
U src/crypto/dist/ipsec-tools/src/racoon/str2val.c
U src/crypto/dist/ipsec-tools/src/racoon/str2val.h
U src/crypto/dist/ipsec-tools/src/racoon/strnames.c
U src/crypto/dist/ipsec-tools/src/racoon/strnames.h
U src/crypto/dist/ipsec-tools/src/racoon/throttle.c
U src/crypto/dist/ipsec-tools/src/racoon/throttle.h
U src/crypto/dist/ipsec-tools/src/racoon/var.h
U src/crypto/dist/ipsec-tools/src/racoon/vendorid.c
U src/crypto/dist/ipsec-tools/src/racoon/vendorid.h
U src/crypto/dist/ipsec-tools/src/racoon/vmbuf.c
U src/crypto/dist/ipsec-tools/src/racoon/vmbuf.h
U src/crypto/dist/ipsec-tools/src/racoon/doc/FAQ
U src/crypto/dist/ipsec-tools/src/racoon/doc/README.certificate
U src/crypto/dist/ipsec-tools/src/racoon/doc/README.gssapi
U src/crypto/dist/ipsec-tools/src/racoon/rfc/draft-beaulieu-ike-xauth-02.txt
U src/crypto/dist/ipsec-tools/src/racoon/rfc/draft-dukes-ike-mode-cfg-02.txt
U src/crypto/dist/ipsec-tools/src/racoon/rfc/draft-ietf-ipsec-isakmp-hybrid-auth-05.txt
U src/crypto/dist/ipsec-tools/src/racoon/rfc/draft-ietf-ipsec-nat-t-ike-00.txt
U src/crypto/dist/ipsec-tools/src/racoon/rfc/draft-ietf-ipsec-nat-t-ike-01.txt
U src/crypto/dist/ipsec-tools/src/racoon/rfc/draft-ietf-ipsec-nat-t-ike-02.txt
U src/crypto/dist/ipsec-tools/src/racoon/rfc/draft-ietf-ipsec-nat-t-ike-03.txt
U src/crypto/dist/ipsec-tools/src/racoon/rfc/draft-ietf-ipsec-nat-t-ike-04.txt
U src/crypto/dist/ipsec-tools/src/racoon/rfc/draft-ietf-ipsec-nat-t-ike-05.txt
U src/crypto/dist/ipsec-tools/src/racoon/rfc/draft-ietf-ipsec-nat-t-ike-06.txt
U src/crypto/dist/ipsec-tools/src/racoon/rfc/rfc2409.txt
U src/crypto/dist/ipsec-tools/src/racoon/rfc/draft-ietf-ipsec-nat-t-ike-07.txt
U src/crypto/dist/ipsec-tools/src/racoon/rfc/draft-ietf-ipsec-nat-t-ike-08.txt
U src/crypto/dist/ipsec-tools/src/racoon/rfc/draft-ietf-ipsec-udp-encaps-03.txt
U src/crypto/dist/ipsec-tools/src/racoon/rfc/rfc3947.txt
U src/crypto/dist/ipsec-tools/src/racoon/rfc/rfc3948.txt
U src/crypto/dist/ipsec-tools/src/racoon/contrib/sp.pl
U src/crypto/dist/ipsec-tools/src/racoon/missing/strdup.c
U src/crypto/dist/ipsec-tools/src/racoon/missing/crypto/rijndael/boxes-fst.dat
U src/crypto/dist/ipsec-tools/src/racoon/missing/crypto/rijndael/rijndael-alg-fst.c
U src/crypto/dist/ipsec-tools/src/racoon/missing/crypto/rijndael/rijndael-alg-fst.h
U src/crypto/dist/ipsec-tools/src/racoon/missing/crypto/rijndael/rijndael-api-fst.c
U src/crypto/dist/ipsec-tools/src/racoon/missing/crypto/rijndael/rijndael-api-fst.h
U src/crypto/dist/ipsec-tools/src/racoon/missing/crypto/rijndael/rijndael.h
U src/crypto/dist/ipsec-tools/src/racoon/missing/crypto/rijndael/rijndael_local.h
U src/crypto/dist/ipsec-tools/src/racoon/missing/crypto/sha2/sha2.c
U src/crypto/dist/ipsec-tools/src/racoon/missing/crypto/sha2/sha2.h
U src/crypto/dist/ipsec-tools/src/racoon/samples/psk.txt.in
U src/crypto/dist/ipsec-tools/src/racoon/samples/psk.txt.sample
U src/crypto/dist/ipsec-tools/src/racoon/samples/racoon.conf.in
U src/crypto/dist/ipsec-tools/src/racoon/samples/racoon.conf.sample
U src/crypto/dist/ipsec-tools/src/racoon/samples/racoon.conf.sample-gssapi
U src/crypto/dist/ipsec-tools/src/racoon/samples/racoon.conf.sample-inherit
U src/crypto/dist/ipsec-tools/src/racoon/samples/racoon.conf.sample-natt
U src/crypto/dist/ipsec-tools/src/racoon/samples/racoon.conf.sample-plainrsa
U src/crypto/dist/ipsec-tools/src/racoon/samples/roadwarrior/README
U src/crypto/dist/ipsec-tools/src/racoon/samples/roadwarrior/client/phase1-down.sh
U src/crypto/dist/ipsec-tools/src/racoon/samples/roadwarrior/client/phase1-up.sh
U src/crypto/dist/ipsec-tools/src/racoon/samples/roadwarrior/client/racoon.conf
U src/crypto/dist/ipsec-tools/src/racoon/samples/roadwarrior/server/phase1-down.sh
U src/crypto/dist/ipsec-tools/src/racoon/samples/roadwarrior/server/racoon.conf
U src/crypto/dist/ipsec-tools/src/racoon/samples/roadwarrior/server/racoon.conf-radius
N src/crypto/dist/ipsec-tools/src/setkey/Makefile.in
U src/crypto/dist/ipsec-tools/src/setkey/Makefile.am
U src/crypto/dist/ipsec-tools/src/setkey/parse.y
U src/crypto/dist/ipsec-tools/src/setkey/sample-policy01.cf
U src/crypto/dist/ipsec-tools/src/setkey/sample-policy02.cf
U src/crypto/dist/ipsec-tools/src/setkey/sample.cf
U src/crypto/dist/ipsec-tools/src/setkey/scriptdump.pl
U src/crypto/dist/ipsec-tools/src/setkey/setkey.8
C src/crypto/dist/ipsec-tools/src/setkey/setkey.c
U src/crypto/dist/ipsec-tools/src/setkey/setkey.conf
U src/crypto/dist/ipsec-tools/src/setkey/test-pfkey.c
U src/crypto/dist/ipsec-tools/src/setkey/token.l
U src/crypto/dist/ipsec-tools/src/setkey/vchar.h
N src/crypto/dist/ipsec-tools/autom4te.cache/requests
N src/crypto/dist/ipsec-tools/autom4te.cache/output.0
N src/crypto/dist/ipsec-tools/autom4te.cache/traces.0
N src/crypto/dist/ipsec-tools/autom4te.cache/output.1
N src/crypto/dist/ipsec-tools/autom4te.cache/traces.1

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

	cvs checkout -jIPSEC_TOOLS:yesterday -jIPSEC_TOOLS src/crypto/dist/ipsec-tools