Module Name:	src
Committed By:	manu
Date:		Sun Aug  7 09:38:46 UTC 2005

Modified Files:
	src/crypto/dist/ipsec-tools: ChangeLog
	src/crypto/dist/ipsec-tools/src/libipsec: ipsec_dump_policy.c
	    ipsec_get_policylen.c ipsec_set_policy.3 ipsec_strerror.3
	    key_debug.c libpfkey.h pfkey.c pfkey_dump.c policy_parse.y
	    policy_token.l
	src/crypto/dist/ipsec-tools/src/racoon: admin.c algorithm.c cfparse.y
	    cftoken.l crypto_openssl.c eaytest.c handler.c handler.h
	    ipsec_doi.c ipsec_doi.h isakmp.c isakmp_agg.c isakmp_cfg.c
	    isakmp_cfg.h isakmp_inf.c isakmp_quick.c isakmp_unity.c
	    isakmp_var.h isakmp_xauth.c nattraversal.c nattraversal.h oakley.c
	    pfkey.c plainrsa-gen.8 privsep.c proposal.c racoon.8 racoon.conf.5
	    racoonctl.8 remoteconf.c remoteconf.h session.c sockmisc.h
	    strnames.c
	src/crypto/dist/ipsec-tools/src/racoon/samples:
	    racoon.conf.sample-inherit racoon.conf.sample-natt
	    racoon.conf.sample-plainrsa
	src/crypto/dist/ipsec-tools/src/setkey: parse.y setkey.8 setkey.c
	    test-pfkey.c token.l

Log Message:
Resolve conflicts caused by recent ipsec-tools-0.6.1rc1 import by prefering
the newer software. Some useful local change might have been overwritten,
we'll take care of this soon.


To generate a diff of this commit:
cvs rdiff -r1.25 -r1.26 src/crypto/dist/ipsec-tools/ChangeLog
cvs rdiff -r1.3 -r1.4 \
    src/crypto/dist/ipsec-tools/src/libipsec/ipsec_dump_policy.c \
    src/crypto/dist/ipsec-tools/src/libipsec/key_debug.c
cvs rdiff -r1.2 -r1.3 \
    src/crypto/dist/ipsec-tools/src/libipsec/ipsec_get_policylen.c \
    src/crypto/dist/ipsec-tools/src/libipsec/policy_token.l
cvs rdiff -r1.9 -r1.10 \
    src/crypto/dist/ipsec-tools/src/libipsec/ipsec_set_policy.3
cvs rdiff -r1.6 -r1.7 \
    src/crypto/dist/ipsec-tools/src/libipsec/ipsec_strerror.3
cvs rdiff -r1.5 -r1.6 src/crypto/dist/ipsec-tools/src/libipsec/libpfkey.h
cvs rdiff -r1.4 -r1.5 src/crypto/dist/ipsec-tools/src/libipsec/pfkey.c \
    src/crypto/dist/ipsec-tools/src/libipsec/policy_parse.y
cvs rdiff -r1.7 -r1.8 src/crypto/dist/ipsec-tools/src/libipsec/pfkey_dump.c
cvs rdiff -r1.4 -r1.5 src/crypto/dist/ipsec-tools/src/racoon/admin.c \
    src/crypto/dist/ipsec-tools/src/racoon/handler.c
cvs rdiff -r1.2 -r1.3 src/crypto/dist/ipsec-tools/src/racoon/algorithm.c \
    src/crypto/dist/ipsec-tools/src/racoon/cfparse.y \
    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_agg.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/isakmp_xauth.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/sockmisc.h \
    src/crypto/dist/ipsec-tools/src/racoon/strnames.c
cvs rdiff -r1.3 -r1.4 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/oakley.c \
    src/crypto/dist/ipsec-tools/src/racoon/proposal.c \
    src/crypto/dist/ipsec-tools/src/racoon/remoteconf.c
cvs rdiff -r1.5 -r1.6 src/crypto/dist/ipsec-tools/src/racoon/handler.h \
    src/crypto/dist/ipsec-tools/src/racoon/isakmp_cfg.c \
    src/crypto/dist/ipsec-tools/src/racoon/isakmp_quick.c
cvs rdiff -r1.8 -r1.9 src/crypto/dist/ipsec-tools/src/racoon/ipsec_doi.c
cvs rdiff -r1.7 -r1.8 src/crypto/dist/ipsec-tools/src/racoon/isakmp.c \
    src/crypto/dist/ipsec-tools/src/racoon/isakmp_inf.c \
    src/crypto/dist/ipsec-tools/src/racoon/pfkey.c \
    src/crypto/dist/ipsec-tools/src/racoon/plainrsa-gen.8
cvs rdiff -r1.6 -r1.7 src/crypto/dist/ipsec-tools/src/racoon/racoon.8
cvs rdiff -r1.18 -r1.19 src/crypto/dist/ipsec-tools/src/racoon/racoon.conf.5
cvs rdiff -r1.9 -r1.10 src/crypto/dist/ipsec-tools/src/racoon/racoonctl.8
cvs rdiff -r1.2 -r1.3 \
    src/crypto/dist/ipsec-tools/src/racoon/samples/racoon.conf.sample-inherit \
    src/crypto/dist/ipsec-tools/src/racoon/samples/racoon.conf.sample-plainrsa
cvs rdiff -r1.3 -r1.4 \
    src/crypto/dist/ipsec-tools/src/racoon/samples/racoon.conf.sample-natt
cvs rdiff -r1.4 -r1.5 src/crypto/dist/ipsec-tools/src/setkey/parse.y
cvs rdiff -r1.13 -r1.14 src/crypto/dist/ipsec-tools/src/setkey/setkey.8
cvs rdiff -r1.6 -r1.7 src/crypto/dist/ipsec-tools/src/setkey/setkey.c
cvs rdiff -r1.2 -r1.3 src/crypto/dist/ipsec-tools/src/setkey/test-pfkey.c
cvs rdiff -r1.5 -r1.6 src/crypto/dist/ipsec-tools/src/setkey/token.l

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