[src/trunk]: src/crypto/dist/ipsec-tools Correctly initialize NAT-T VID to av...

[manu <manu%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/1eca531ed39b
branches:  trunk
changeset: 584539:1eca531ed39b
user:      manu <manu%NetBSD.org@localhost>
date:      Fri Sep 23 14:22:27 2005 +0000

description:
Correctly initialize NAT-T VID to avoid freeing unallocated space

diffstat:

 crypto/dist/ipsec-tools/ChangeLog                 |   5 +++++
 crypto/dist/ipsec-tools/src/racoon/isakmp_agg.c   |  11 ++++++-----
 crypto/dist/ipsec-tools/src/racoon/isakmp_base.c  |   4 ++--
 crypto/dist/ipsec-tools/src/racoon/isakmp_ident.c |   6 ++----
 4 files changed, 15 insertions(+), 11 deletions(-)

diffs (91 lines):

diff -r 353e9e73449f -r 1eca531ed39b crypto/dist/ipsec-tools/ChangeLog
--- a/crypto/dist/ipsec-tools/ChangeLog Fri Sep 23 14:15:30 2005 +0000
+++ b/crypto/dist/ipsec-tools/ChangeLog Fri Sep 23 14:22:27 2005 +0000
@@ -1,3 +1,8 @@
+2005-08-23  Emmanuel Dreyfus  <manu%netbsd.org@localhost>
+
+       * src/racoon/{isakmp_agg.c|isakmp_ident.c|isakmp_base.c}: Correctly
+         initialize NAT-T VID to avoid freeing unallocated stuff.
+
 ---------------------------------------------
 
        0.6.1 released
diff -r 353e9e73449f -r 1eca531ed39b crypto/dist/ipsec-tools/src/racoon/isakmp_agg.c
--- a/crypto/dist/ipsec-tools/src/racoon/isakmp_agg.c   Fri Sep 23 14:15:30 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/isakmp_agg.c   Fri Sep 23 14:22:27 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: isakmp_agg.c,v 1.4 2005/08/20 00:57:06 manu Exp $      */
+/*     $NetBSD: isakmp_agg.c,v 1.5 2005/09/23 14:22:27 manu Exp $      */
 
 /* Id: isakmp_agg.c,v 1.20.2.1 2005/04/09 22:32:06 manubsd Exp */
 
@@ -113,7 +113,7 @@
        vchar_t *cr = NULL, *gsstoken = NULL;
        int error = -1;
 #ifdef ENABLE_NATT
-       vchar_t *vid_natt[MAX_NATT_VID_COUNT];
+       vchar_t *vid_natt[MAX_NATT_VID_COUNT] = { NULL };
        int i;
 #endif
 #ifdef ENABLE_HYBRID
@@ -252,11 +252,12 @@
                plist = isakmp_plist_append(plist, vid_frag, ISAKMP_NPTYPE_VID);
 #endif
 #ifdef ENABLE_NATT
-       /* set VID payload for NAT-T if NAT-T support allowed in the config file */
+       /* 
+        * set VID payload for NAT-T if NAT-T 
+        * support allowed in the config file 
+        */
        if (iph1->rmconf->nat_traversal) 
                plist = isakmp_plist_append_natt_vids(plist, vid_natt);
-       else
-               vid_natt[0]=NULL;
 #endif
 #ifdef ENABLE_HYBRID
        if (vid_xauth)
diff -r 353e9e73449f -r 1eca531ed39b crypto/dist/ipsec-tools/src/racoon/isakmp_base.c
--- a/crypto/dist/ipsec-tools/src/racoon/isakmp_base.c  Fri Sep 23 14:15:30 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/isakmp_base.c  Fri Sep 23 14:22:27 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: isakmp_base.c,v 1.2 2005/08/20 00:57:06 manu Exp $     */
+/*     $NetBSD: isakmp_base.c,v 1.3 2005/09/23 14:22:27 manu Exp $     */
 
 /*     $KAME: isakmp_base.c,v 1.49 2003/11/13 02:30:20 sakane Exp $    */
 
@@ -99,7 +99,7 @@
        struct payload_list *plist = NULL;
        int error = -1;
 #ifdef ENABLE_NATT
-       vchar_t *vid_natt[MAX_NATT_VID_COUNT];
+       vchar_t *vid_natt[MAX_NATT_VID_COUNT] = { NULL };
        int i, vid_natt_i = 0;
 #endif
 #ifdef ENABLE_FRAG
diff -r 353e9e73449f -r 1eca531ed39b crypto/dist/ipsec-tools/src/racoon/isakmp_ident.c
--- a/crypto/dist/ipsec-tools/src/racoon/isakmp_ident.c Fri Sep 23 14:15:30 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/isakmp_ident.c Fri Sep 23 14:22:27 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: isakmp_ident.c,v 1.2 2005/08/20 00:57:06 manu Exp $    */
+/*     $NetBSD: isakmp_ident.c,v 1.3 2005/09/23 14:22:27 manu Exp $    */
 
 /* Id: isakmp_ident.c,v 1.13 2005/01/29 16:34:25 vanhu Exp */
 
@@ -103,7 +103,7 @@
        struct payload_list *plist = NULL;
        int error = -1;
 #ifdef ENABLE_NATT
-       vchar_t *vid_natt[MAX_NATT_VID_COUNT];
+       vchar_t *vid_natt[MAX_NATT_VID_COUNT] = { NULL };
        int i;
 #endif
 #ifdef ENABLE_DPD
@@ -137,8 +137,6 @@
        /* set VID payload for NAT-T if NAT-T support allowed in the config file */
        if (iph1->rmconf->nat_traversal) 
                plist = isakmp_plist_append_natt_vids(plist, vid_natt);
-       else
-               vid_natt[0]=NULL;
 #endif
 #ifdef ENABLE_DPD
        if(iph1->rmconf->dpd){