 @@ -1,14 +1,14 @@
-/*	$NetBSD: handler.h,v 1.25 2010/11/17 10:40:41 tteras Exp $	*/
+/*	$NetBSD: handler.h,v 1.26 2017/01/24 19:23:56 christos Exp $	*/
 /* Id: handler.h,v 1.19 2006/02/25 08:25:12 manubsd Exp */
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -131,26 +131,27 @@ struct ph1handle {
 	u_int8_t version;		/* ISAKMP version */
 	u_int8_t etype;			/* Exchange type actually for use */
 	u_int8_t flags;			/* Flags */
 	u_int32_t msgid;		/* message id */
 	u_int32_t vendorid_mask;	/* bitmask of received supported vendor ids*/
 #ifdef ENABLE_NATT
 	struct ph1natt_options *natt_options;	/* Selected NAT-T IKE version */
 	u_int32_t natt_flags;		/* NAT-T related flags */
 #endif
 #ifdef ENABLE_FRAG
 	int frag;			/* IKE phase 1 fragmentation */
 	int frag_last_index;
 	struct isakmp_frag_item *frag_chain;	/* Received fragments */
 #endif
 	struct sched sce;		/* schedule for expire */
 	struct sched scr;		/* schedule for resend */
 	int retry_counter;		/* for resend. */
 	vchar_t *sendbuf;		/* buffer for re-sending */
 	vchar_t *dhpriv;		/* DH; private value */
 	vchar_t *dhpub;			/* DH; public value */
 	vchar_t *dhpub_p;		/* DH; partner's public value */
 	vchar_t *dhgxy;			/* DH; shared secret */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: isakmp.c,v 1.75 2016/03/09 22:27:17 christos Exp $	*/
+/*	$NetBSD: isakmp.c,v 1.76 2017/01/24 19:23:56 christos Exp $	*/
 /* Id: isakmp.c,v 1.74 2006/05/07 21:32:59 manubsd Exp */
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -1067,26 +1067,27 @@ isakmp_ph1begin_i(rmconf, remote, local)
 #endif
 #ifdef ENABLE_HYBRID
 	if ((iph1->mode_cfg = isakmp_cfg_mkstate()) == NULL) {
 		delph1(iph1);
 		return NULL;
+	}
 #endif
 #ifdef ENABLE_FRAG
 	if(rmconf->ike_frag == ISAKMP_FRAG_FORCE)
 		iph1->frag = 1;
 	else
 		iph1->frag = 0;
 	iph1->frag_last_index = 0;
 	iph1->frag_chain = NULL;
 #endif
 	iph1->approval = NULL;
 	/* XXX copy remote address */
 	if (copy_ph1addresses(iph1, rmconf, remote, local) < 0) {
 		delph1(iph1);
 		return NULL;
+	}
 	(void)insph1(iph1);
 	/* start phase 1 exchange */
 @@ -1171,26 +1172,27 @@ isakmp_ph1begin_r(msg, remote, local, et
 	iph1->version = isakmp->v;
 	iph1->msgid = 0;
 #ifdef HAVE_GSSAPI
 	iph1->gssapi_state = NULL;
 #endif
 #ifdef ENABLE_HYBRID
 	if ((iph1->mode_cfg = isakmp_cfg_mkstate()) == NULL) {
 		delph1(iph1);
 		return -1;
+	}
 #endif
 #ifdef ENABLE_FRAG
 	iph1->frag = 0;
 	iph1->frag_last_index = 0;
 	iph1->frag_chain = NULL;
 #endif
 	iph1->approval = NULL;
 #ifdef ENABLE_NATT
 	/* RFC3947 says that we MUST accept new phases1 on NAT-T floated port.
 	 * We have to setup this flag now to correctly generate the first reply.
 	 * Don't know if a better check could be done for that ?
 	 */
 	if(extract_port(local) == lcconf->port_isakmp_natt)
 		iph1->natt_flags |= (NAT_PORTS_CHANGED);
 #endif

 @@ -1,14 +1,14 @@
-/*	$NetBSD: isakmp_inf.c,v 1.50 2013/04/12 09:53:10 tteras Exp $	*/
+/*	$NetBSD: isakmp_inf.c,v 1.51 2017/01/24 19:23:56 christos Exp $	*/
 /* Id: isakmp_inf.c,v 1.44 2006/05/06 20:45:52 manubsd Exp */
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -710,26 +710,27 @@ isakmp_info_send_nx(isakmp, remote, loca
 	memcpy(&iph1->index.i_ck, &isakmp->i_ck, sizeof(cookie_t));
 	isakmp_newcookie((char *)&iph1->index.r_ck, remote, local);
 	iph1->status = PHASE1ST_START;
 	iph1->side = INITIATOR;
 	iph1->version = isakmp->v;
 	iph1->flags = 0;
 	iph1->msgid = 0;	/* XXX */
 #ifdef ENABLE_HYBRID
 	if ((iph1->mode_cfg = isakmp_cfg_mkstate()) == NULL)
 		goto end;
 #endif
 #ifdef ENABLE_FRAG
 	iph1->frag = 0;
 	iph1->frag_last_index = 0;
 	iph1->frag_chain = NULL;
 #endif
 	/* copy remote address */
 	if (copy_ph1addresses(iph1, NULL, remote, local) < 0)
 		goto end;
 	tlen = sizeof(*n) + spisiz;
 	if (data)
 		tlen += data->l;
 	payload = vmalloc(tlen);
 	if (payload == NULL) {
 		plog(LLV_ERROR, LOCATION, NULL,