Module Name:	src
Committed By:	manu
Date:		Mon Nov 21 14:20:36 UTC 2005

Modified Files:
	src/crypto/dist/ipsec-tools: ChangeLog
	src/crypto/dist/ipsec-tools/src/include-glibc: glibc-bugs.h
	src/crypto/dist/ipsec-tools/src/include-glibc/net: pfkeyv2.h
	src/crypto/dist/ipsec-tools/src/include-glibc/netinet: ipsec.h
	src/crypto/dist/ipsec-tools/src/include-glibc/sys: queue.h
	src/crypto/dist/ipsec-tools/src/libipsec: ipsec_dump_policy.c
	    ipsec_get_policylen.c ipsec_set_policy.3 ipsec_strerror.3
	    ipsec_strerror.c ipsec_strerror.h key_debug.c libpfkey.h pfkey.c
	    pfkey_dump.c policy_parse.c policy_parse.h policy_parse.y
	    policy_token.c policy_token.l test-policy.c
	src/crypto/dist/ipsec-tools/src/racoon: admin.c admin.h admin_var.h
	    algorithm.c algorithm.h backupsa.c backupsa.h cfparse.c cfparse.y
	    cfparse_proto.h cftoken.c cftoken.l cftoken_proto.h
	    crypto_openssl.c crypto_openssl.h debug.h debugrm.h dhgroup.h
	    dnssec.c dnssec.h dump.h eaytest.c evt.c evt.h gcmalloc.h genlist.c
	    genlist.h getcertsbyname.c gnuc.h grabmyaddr.c grabmyaddr.h
	    gssapi.c gssapi.h handler.c handler.h ipsec_doi.c ipsec_doi.h
	    isakmp.c isakmp.h isakmp_agg.c isakmp_agg.h isakmp_base.c
	    isakmp_base.h isakmp_cfg.c isakmp_cfg.h isakmp_frag.c isakmp_frag.h
	    isakmp_ident.c isakmp_ident.h isakmp_inf.c isakmp_inf.h
	    isakmp_newg.c isakmp_newg.h isakmp_quick.c isakmp_quick.h
	    isakmp_unity.c isakmp_unity.h isakmp_var.h isakmp_xauth.c
	    isakmp_xauth.h kmpstat.c localconf.c localconf.h logger.c logger.h
	    main.c misc.c misc.h nattraversal.c nattraversal.h netdb_dnssec.h
	    oakley.c oakley.h pfkey.c pfkey.h plainrsa-gen.8 plainrsa-gen.c
	    plog.c plog.h policy.c policy.h privsep.c privsep.h proposal.c
	    proposal.h prsa_par.c prsa_par.y prsa_tok.c prsa_tok.l racoon.8
	    racoon.conf.5 racoonctl.8 racoonctl.c racoonctl.h remoteconf.c
	    remoteconf.h rsalist.c rsalist.h safefile.c safefile.h sainfo.c
	    sainfo.h schedule.c schedule.h session.c session.h sockmisc.c
	    sockmisc.h str2val.c str2val.h strnames.c strnames.h throttle.c
	    throttle.h var.h vendorid.c vendorid.h vmbuf.c vmbuf.h
	src/crypto/dist/ipsec-tools/src/racoon/missing/crypto/rijndael:
	    rijndael-alg-fst.c rijndael-alg-fst.h rijndael-api-fst.c
	    rijndael-api-fst.h rijndael.h rijndael_local.h
	src/crypto/dist/ipsec-tools/src/racoon/missing/crypto/sha2: sha2.c
	    sha2.h
	src/crypto/dist/ipsec-tools/src/setkey: extern.h parse.c parse.h
	    parse.y setkey.c test-pfkey.c token.c token.l vchar.h
	src/lib/libipsec: config.h package_version.h

Log Message:
Merge ipsec-tools 0.6.3 import


To generate a diff of this commit:
cvs rdiff -r1.30 -r1.31 src/crypto/dist/ipsec-tools/ChangeLog
cvs rdiff -r1.2 -r1.3 \
    src/crypto/dist/ipsec-tools/src/include-glibc/glibc-bugs.h
cvs rdiff -r1.2 -r1.3 \
    src/crypto/dist/ipsec-tools/src/include-glibc/net/pfkeyv2.h
cvs rdiff -r1.2 -r1.3 \
    src/crypto/dist/ipsec-tools/src/include-glibc/netinet/ipsec.h
cvs rdiff -r1.2 -r1.3 \
    src/crypto/dist/ipsec-tools/src/include-glibc/sys/queue.h
cvs rdiff -r1.5 -r1.6 \
    src/crypto/dist/ipsec-tools/src/libipsec/ipsec_dump_policy.c \
    src/crypto/dist/ipsec-tools/src/libipsec/key_debug.c
cvs rdiff -r1.4 -r1.5 \
    src/crypto/dist/ipsec-tools/src/libipsec/ipsec_get_policylen.c \
    src/crypto/dist/ipsec-tools/src/libipsec/policy_token.l
cvs rdiff -r1.11 -r1.12 \
    src/crypto/dist/ipsec-tools/src/libipsec/ipsec_set_policy.3
cvs rdiff -r1.8 -r1.9 \
    src/crypto/dist/ipsec-tools/src/libipsec/ipsec_strerror.3 \
    src/crypto/dist/ipsec-tools/src/libipsec/pfkey.c
cvs rdiff -r1.2 -r1.3 \
    src/crypto/dist/ipsec-tools/src/libipsec/ipsec_strerror.c \
    src/crypto/dist/ipsec-tools/src/libipsec/ipsec_strerror.h \
    src/crypto/dist/ipsec-tools/src/libipsec/test-policy.c
cvs rdiff -r1.7 -r1.8 src/crypto/dist/ipsec-tools/src/libipsec/libpfkey.h \
    src/crypto/dist/ipsec-tools/src/libipsec/policy_parse.y
cvs rdiff -r1.10 -r1.11 src/crypto/dist/ipsec-tools/src/libipsec/pfkey_dump.c
cvs rdiff -r1.1.1.1 -r1.2 \
    src/crypto/dist/ipsec-tools/src/libipsec/policy_parse.c \
    src/crypto/dist/ipsec-tools/src/libipsec/policy_parse.h \
    src/crypto/dist/ipsec-tools/src/libipsec/policy_token.c
cvs rdiff -r1.6 -r1.7 src/crypto/dist/ipsec-tools/src/racoon/admin.c \
    src/crypto/dist/ipsec-tools/src/racoon/handler.c \
    src/crypto/dist/ipsec-tools/src/racoon/isakmp_agg.c \
    src/crypto/dist/ipsec-tools/src/racoon/oakley.c
cvs rdiff -r1.2 -r1.3 src/crypto/dist/ipsec-tools/src/racoon/admin.h \
    src/crypto/dist/ipsec-tools/src/racoon/admin_var.h \
    src/crypto/dist/ipsec-tools/src/racoon/algorithm.h \
    src/crypto/dist/ipsec-tools/src/racoon/backupsa.c \
    src/crypto/dist/ipsec-tools/src/racoon/backupsa.h \
    src/crypto/dist/ipsec-tools/src/racoon/cfparse_proto.h \
    src/crypto/dist/ipsec-tools/src/racoon/cftoken_proto.h \
    src/crypto/dist/ipsec-tools/src/racoon/crypto_openssl.h \
    src/crypto/dist/ipsec-tools/src/racoon/debug.h \
    src/crypto/dist/ipsec-tools/src/racoon/debugrm.h \
    src/crypto/dist/ipsec-tools/src/racoon/dhgroup.h \
    src/crypto/dist/ipsec-tools/src/racoon/dnssec.c \
    src/crypto/dist/ipsec-tools/src/racoon/dnssec.h \
    src/crypto/dist/ipsec-tools/src/racoon/dump.h \
    src/crypto/dist/ipsec-tools/src/racoon/evt.h \
    src/crypto/dist/ipsec-tools/src/racoon/gcmalloc.h \
    src/crypto/dist/ipsec-tools/src/racoon/genlist.c \
    src/crypto/dist/ipsec-tools/src/racoon/genlist.h \
    src/crypto/dist/ipsec-tools/src/racoon/getcertsbyname.c \
    src/crypto/dist/ipsec-tools/src/racoon/gnuc.h \
    src/crypto/dist/ipsec-tools/src/racoon/grabmyaddr.c \
    src/crypto/dist/ipsec-tools/src/racoon/grabmyaddr.h \
    src/crypto/dist/ipsec-tools/src/racoon/gssapi.c \
    src/crypto/dist/ipsec-tools/src/racoon/gssapi.h \
    src/crypto/dist/ipsec-tools/src/racoon/isakmp.h \
    src/crypto/dist/ipsec-tools/src/racoon/isakmp_agg.h \
    src/crypto/dist/ipsec-tools/src/racoon/isakmp_base.h \
    src/crypto/dist/ipsec-tools/src/racoon/isakmp_frag.c \
    src/crypto/dist/ipsec-tools/src/racoon/isakmp_frag.h \
    src/crypto/dist/ipsec-tools/src/racoon/isakmp_ident.h \
    src/crypto/dist/ipsec-tools/src/racoon/isakmp_inf.h \
    src/crypto/dist/ipsec-tools/src/racoon/isakmp_newg.c \
    src/crypto/dist/ipsec-tools/src/racoon/isakmp_newg.h \
    src/crypto/dist/ipsec-tools/src/racoon/isakmp_quick.h \
    src/crypto/dist/ipsec-tools/src/racoon/isakmp_unity.h \
    src/crypto/dist/ipsec-tools/src/racoon/isakmp_xauth.h \
    src/crypto/dist/ipsec-tools/src/racoon/kmpstat.c \
    src/crypto/dist/ipsec-tools/src/racoon/localconf.c \
    src/crypto/dist/ipsec-tools/src/racoon/localconf.h \
    src/crypto/dist/ipsec-tools/src/racoon/logger.c \
    src/crypto/dist/ipsec-tools/src/racoon/logger.h \
    src/crypto/dist/ipsec-tools/src/racoon/misc.c \
    src/crypto/dist/ipsec-tools/src/racoon/misc.h \
    src/crypto/dist/ipsec-tools/src/racoon/netdb_dnssec.h \
    src/crypto/dist/ipsec-tools/src/racoon/oakley.h \
    src/crypto/dist/ipsec-tools/src/racoon/pfkey.h \
    src/crypto/dist/ipsec-tools/src/racoon/plainrsa-gen.c \
    src/crypto/dist/ipsec-tools/src/racoon/plog.c \
    src/crypto/dist/ipsec-tools/src/racoon/plog.h \
    src/crypto/dist/ipsec-tools/src/racoon/policy.h \
    src/crypto/dist/ipsec-tools/src/racoon/privsep.h \
    src/crypto/dist/ipsec-tools/src/racoon/proposal.h \
    src/crypto/dist/ipsec-tools/src/racoon/prsa_par.y \
    src/crypto/dist/ipsec-tools/src/racoon/prsa_tok.l \
    src/crypto/dist/ipsec-tools/src/racoon/racoonctl.c \
    src/crypto/dist/ipsec-tools/src/racoon/racoonctl.h \
    src/crypto/dist/ipsec-tools/src/racoon/rsalist.c \
    src/crypto/dist/ipsec-tools/src/racoon/rsalist.h \
    src/crypto/dist/ipsec-tools/src/racoon/safefile.c \
    src/crypto/dist/ipsec-tools/src/racoon/safefile.h \
    src/crypto/dist/ipsec-tools/src/racoon/sainfo.c \
    src/crypto/dist/ipsec-tools/src/racoon/sainfo.h \
    src/crypto/dist/ipsec-tools/src/racoon/schedule.c \
    src/crypto/dist/ipsec-tools/src/racoon/schedule.h \
    src/crypto/dist/ipsec-tools/src/racoon/session.h \
    src/crypto/dist/ipsec-tools/src/racoon/str2val.c \
    src/crypto/dist/ipsec-tools/src/racoon/str2val.h \
    src/crypto/dist/ipsec-tools/src/racoon/strnames.h \
    src/crypto/dist/ipsec-tools/src/racoon/throttle.c \
    src/crypto/dist/ipsec-tools/src/racoon/throttle.h \
    src/crypto/dist/ipsec-tools/src/racoon/var.h \
    src/crypto/dist/ipsec-tools/src/racoon/vendorid.c \
    src/crypto/dist/ipsec-tools/src/racoon/vendorid.h \
    src/crypto/dist/ipsec-tools/src/racoon/vmbuf.c \
    src/crypto/dist/ipsec-tools/src/racoon/vmbuf.h
cvs rdiff -r1.4 -r1.5 src/crypto/dist/ipsec-tools/src/racoon/algorithm.c \
    src/crypto/dist/ipsec-tools/src/racoon/eaytest.c \
    src/crypto/dist/ipsec-tools/src/racoon/ipsec_doi.h \
    src/crypto/dist/ipsec-tools/src/racoon/isakmp_base.c \
    src/crypto/dist/ipsec-tools/src/racoon/isakmp_cfg.h \
    src/crypto/dist/ipsec-tools/src/racoon/isakmp_unity.c \
    src/crypto/dist/ipsec-tools/src/racoon/isakmp_var.h \
    src/crypto/dist/ipsec-tools/src/racoon/main.c \
    src/crypto/dist/ipsec-tools/src/racoon/nattraversal.c \
    src/crypto/dist/ipsec-tools/src/racoon/nattraversal.h \
    src/crypto/dist/ipsec-tools/src/racoon/privsep.c \
    src/crypto/dist/ipsec-tools/src/racoon/remoteconf.h \
    src/crypto/dist/ipsec-tools/src/racoon/session.c \
    src/crypto/dist/ipsec-tools/src/racoon/strnames.c
cvs rdiff -r1.1.1.1 -r1.2 src/crypto/dist/ipsec-tools/src/racoon/cfparse.c \
    src/crypto/dist/ipsec-tools/src/racoon/cftoken.c \
    src/crypto/dist/ipsec-tools/src/racoon/prsa_par.c \
    src/crypto/dist/ipsec-tools/src/racoon/prsa_tok.c
cvs rdiff -r1.9 -r1.10 src/crypto/dist/ipsec-tools/src/racoon/cfparse.y \
    src/crypto/dist/ipsec-tools/src/racoon/isakmp_inf.c \
    src/crypto/dist/ipsec-tools/src/racoon/plainrsa-gen.8
cvs rdiff -r1.5 -r1.6 src/crypto/dist/ipsec-tools/src/racoon/cftoken.l \
    src/crypto/dist/ipsec-tools/src/racoon/crypto_openssl.c \
    src/crypto/dist/ipsec-tools/src/racoon/proposal.c \
    src/crypto/dist/ipsec-tools/src/racoon/remoteconf.c \
    src/crypto/dist/ipsec-tools/src/racoon/sockmisc.h
cvs rdiff -r1.3 -r1.4 src/crypto/dist/ipsec-tools/src/racoon/evt.c \
    src/crypto/dist/ipsec-tools/src/racoon/isakmp_ident.c \
    src/crypto/dist/ipsec-tools/src/racoon/policy.c \
    src/crypto/dist/ipsec-tools/src/racoon/sockmisc.c
cvs rdiff -r1.7 -r1.8 src/crypto/dist/ipsec-tools/src/racoon/handler.h \
    src/crypto/dist/ipsec-tools/src/racoon/isakmp_quick.c \
    src/crypto/dist/ipsec-tools/src/racoon/isakmp_xauth.c
cvs rdiff -r1.11 -r1.12 src/crypto/dist/ipsec-tools/src/racoon/ipsec_doi.c \
    src/crypto/dist/ipsec-tools/src/racoon/racoonctl.8
cvs rdiff -r1.10 -r1.11 src/crypto/dist/ipsec-tools/src/racoon/isakmp.c \
    src/crypto/dist/ipsec-tools/src/racoon/pfkey.c
cvs rdiff -r1.8 -r1.9 src/crypto/dist/ipsec-tools/src/racoon/isakmp_cfg.c \
    src/crypto/dist/ipsec-tools/src/racoon/racoon.8
cvs rdiff -r1.23 -r1.24 src/crypto/dist/ipsec-tools/src/racoon/racoon.conf.5
cvs rdiff -r1.2 -r1.3 \
    src/crypto/dist/ipsec-tools/src/racoon/missing/crypto/rijndael/rijndael-alg-fst.c \
    src/crypto/dist/ipsec-tools/src/racoon/missing/crypto/rijndael/rijndael-alg-fst.h \
    src/crypto/dist/ipsec-tools/src/racoon/missing/crypto/rijndael/rijndael-api-fst.c \
    src/crypto/dist/ipsec-tools/src/racoon/missing/crypto/rijndael/rijndael-api-fst.h \
    src/crypto/dist/ipsec-tools/src/racoon/missing/crypto/rijndael/rijndael.h \
    src/crypto/dist/ipsec-tools/src/racoon/missing/crypto/rijndael/rijndael_local.h
cvs rdiff -r1.2 -r1.3 \
    src/crypto/dist/ipsec-tools/src/racoon/missing/crypto/sha2/sha2.c \
    src/crypto/dist/ipsec-tools/src/racoon/missing/crypto/sha2/sha2.h
cvs rdiff -r1.2 -r1.3 src/crypto/dist/ipsec-tools/src/setkey/extern.h \
    src/crypto/dist/ipsec-tools/src/setkey/vchar.h
cvs rdiff -r1.1.1.1 -r1.2 src/crypto/dist/ipsec-tools/src/setkey/parse.c \
    src/crypto/dist/ipsec-tools/src/setkey/parse.h \
    src/crypto/dist/ipsec-tools/src/setkey/token.c
cvs rdiff -r1.6 -r1.7 src/crypto/dist/ipsec-tools/src/setkey/parse.y
cvs rdiff -r1.8 -r1.9 src/crypto/dist/ipsec-tools/src/setkey/setkey.c
cvs rdiff -r1.4 -r1.5 src/crypto/dist/ipsec-tools/src/setkey/test-pfkey.c
cvs rdiff -r1.7 -r1.8 src/crypto/dist/ipsec-tools/src/setkey/token.l
cvs rdiff -r1.2 -r1.3 src/lib/libipsec/config.h
cvs rdiff -r1.15 -r1.16 src/lib/libipsec/package_version.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.