Module Name:	src
Committed By:	manu
Date:		Wed Apr 27 05:19:50 UTC 2005

Modified Files:
	src/crypto/dist/ipsec-tools/src/libipsec: ipsec_dump_policy.c
	    libpfkey.h pfkey_dump.c
	src/crypto/dist/ipsec-tools/src/racoon: ipsec_doi.c isakmp.c
	    isakmp_cfg.c isakmp_inf.c isakmp_quick.c nattraversal.c
	    nattraversal.h pfkey.c
	src/crypto/dist/ipsec-tools/src/setkey: setkey.8 setkey.c
	src/lib/libipsec: package_version.h

Log Message:
Bug fixes from the ipsec-tools 0.6 branch:
- Fix NAT-T problems that prevented multiple peers behind the same NAT
  to talk to the same machine outside the NAT. This also require kernel
  fixes (already committed eralier)
- Fix a LP64 bug
- Fix NAT-T RFC conformance bugs (missing non ESP marker in packets)
- Add a -p option to setkey to display ports that could be used for ESP
  over UDP when printing policies


To generate a diff of this commit:
cvs rdiff -r1.1.1.2 -r1.2 \
    src/crypto/dist/ipsec-tools/src/libipsec/ipsec_dump_policy.c
cvs rdiff -r1.3 -r1.4 src/crypto/dist/ipsec-tools/src/libipsec/libpfkey.h
cvs rdiff -r1.2 -r1.3 src/crypto/dist/ipsec-tools/src/libipsec/pfkey_dump.c
cvs rdiff -r1.2 -r1.3 src/crypto/dist/ipsec-tools/src/racoon/ipsec_doi.c \
    src/crypto/dist/ipsec-tools/src/racoon/isakmp.c \
    src/crypto/dist/ipsec-tools/src/racoon/isakmp_cfg.c \
    src/crypto/dist/ipsec-tools/src/racoon/isakmp_inf.c \
    src/crypto/dist/ipsec-tools/src/racoon/isakmp_quick.c \
    src/crypto/dist/ipsec-tools/src/racoon/pfkey.c
cvs rdiff -r1.1.1.2 -r1.2 \
    src/crypto/dist/ipsec-tools/src/racoon/nattraversal.c \
    src/crypto/dist/ipsec-tools/src/racoon/nattraversal.h
cvs rdiff -r1.9 -r1.10 src/crypto/dist/ipsec-tools/src/setkey/setkey.8
cvs rdiff -r1.3 -r1.4 src/crypto/dist/ipsec-tools/src/setkey/setkey.c
cvs rdiff -r1.6 -r1.7 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.