From 5a85c00571fe8b87f35a7391c60b12435cc54f2c Mon Sep 17 00:00:00 2001 From: manu Date: Sat, 16 Sep 2006 04:31:38 +0000 Subject: [PATCH] Trivial bugfix in RFC2407 4.6.2 conformance, from Matthew Grooms --- crypto/dist/ipsec-tools/ChangeLog | 5 +++++ crypto/dist/ipsec-tools/src/racoon/ipsec_doi.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/crypto/dist/ipsec-tools/ChangeLog b/crypto/dist/ipsec-tools/ChangeLog index 1f5b43cbbc01..10ddf0bea9b3 100644 --- a/crypto/dist/ipsec-tools/ChangeLog +++ b/crypto/dist/ipsec-tools/ChangeLog @@ -1,3 +1,8 @@ +2006-08-16 Emmanuel Dreyfus + + From Matthew Grooms: + * src/racoon/ipsec_doi.c: Trivial bugfix in RFC2407 4.6.2 conformance + 2006-08-15 Emmanuel Dreyfus * src/racoon/ipsec_doi.c: fix build on Linux diff --git a/crypto/dist/ipsec-tools/src/racoon/ipsec_doi.c b/crypto/dist/ipsec-tools/src/racoon/ipsec_doi.c index 445881ad8f4b..df95e21e143c 100644 --- a/crypto/dist/ipsec-tools/src/racoon/ipsec_doi.c +++ b/crypto/dist/ipsec-tools/src/racoon/ipsec_doi.c @@ -1,4 +1,4 @@ -/* $NetBSD: ipsec_doi.c,v 1.14 2006/09/15 09:40:45 manu Exp $ */ +/* $NetBSD: ipsec_doi.c,v 1.15 2006/09/16 04:31:38 manu Exp $ */ /* Id: ipsec_doi.c,v 1.55 2006/08/17 09:20:41 vanhu Exp */ @@ -3335,7 +3335,7 @@ ipsecdoi_checkid1(iph1) } /* if phase 1 ID payload conformed RFC2407 4.6.2. */ - if (id_b->type == IPSECDOI_ID_IPV4_ADDR && + if (id_b->type == IPSECDOI_ID_IPV4_ADDR || id_b->type == IPSECDOI_ID_IPV6_ADDR) { if (id_b->proto_id == 0 && ntohs(id_b->port) != 0) {