Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Correctly initialize NAT-T VID to avoid freeing unallocated space

This commit is contained in:
manu 2005-09-23 14:22:27 +00:00
parent c74744e70f
commit 7e2e2c16ff
4 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
crypto/dist/ipsec-tools/ChangeLog vendored
View File

@ -1,3 +1,8 @@
2005-08-23 Emmanuel Dreyfus <manu@netbsd.org>
* 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

11
crypto/dist/ipsec-tools/src/racoon/isakmp_agg.c vendored
View File

@ -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 @@ agg_i1send(iph1, msg)
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 @@ agg_i1send(iph1, msg)
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)

4
crypto/dist/ipsec-tools/src/racoon/isakmp_base.c vendored
View File

@ -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 @@ base_i1send(iph1, msg)
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

6
crypto/dist/ipsec-tools/src/racoon/isakmp_ident.c vendored
View File

@ -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 @@ ident_i1send(iph1, msg)
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 @@ ident_i1send(iph1, msg)
/* 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){