Module Name:	src
Committed By:	tron
Date:		Sun May  1 11:00:32 UTC 2005

Modified Files:
	src/crypto/dist/ipsec-tools/src/libipsec [netbsd-3]:
	    ipsec_dump_policy.c
	src/crypto/dist/ipsec-tools/src/racoon [netbsd-3]: nattraversal.c
	    nattraversal.h

Log Message:
Pull up revision 1.2 (requested by manu in ticket #215):
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.1.1.2.2.1 \
    src/crypto/dist/ipsec-tools/src/libipsec/ipsec_dump_policy.c
cvs rdiff -r1.1.1.2 -r1.1.1.2.2.1 \
    src/crypto/dist/ipsec-tools/src/racoon/nattraversal.c \
    src/crypto/dist/ipsec-tools/src/racoon/nattraversal.h

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