Sync up several defines with RFC 5996. IANA has changed the existing

IKEv2 Payload Type "Encrypted" (E) to "Encrypted and Authenticated" (SK).

4 files changed, 11 insertions, 9 deletions

diff --git a/sbin/iked/ikev2.c b/sbin/iked/ikev2.c
index 2c130466445..213126eeceb 100644
--- a/sbin/iked/ikev2.c
+++ b/sbin/iked/ikev2.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ikev2.c,v 1.57 2011/07/05 01:28:06 mikeb Exp $	*/
+/*	$OpenBSD: ikev2.c,v 1.58 2012/05/07 10:58:38 mikeb Exp $	*/
 /*	$vantronix: ikev2.c,v 1.101 2010/06/03 07:57:33 reyk Exp $	*/
 
 /*
@@ -2504,7 +2504,7 @@ ikev2_send_informational(struct iked *env, struct iked_message *msg)
 		/* IKE header */
 		if ((hdr = ikev2_add_header(buf, sa,
 		    ikev2_msg_id(env, sa, 0),
-		    IKEV2_PAYLOAD_E, IKEV2_EXCHANGE_INFORMATIONAL,
+		    IKEV2_PAYLOAD_SK, IKEV2_EXCHANGE_INFORMATIONAL,
 		    0)) == NULL)
 			goto done;
 
diff --git a/sbin/iked/ikev2.h b/sbin/iked/ikev2.h
index f4176fdc665..29e5067ad5e 100644
--- a/sbin/iked/ikev2.h
+++ b/sbin/iked/ikev2.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ikev2.h,v 1.6 2010/07/03 16:59:35 reyk Exp $	*/
+/*	$OpenBSD: ikev2.h,v 1.7 2012/05/07 10:58:38 mikeb Exp $	*/
 /*	$vantronix: ikev2.h,v 1.27 2010/05/19 12:20:30 reyk Exp $	*/
 
 /*
@@ -120,7 +120,7 @@ struct ikev2_payload {
 #define IKEV2_PAYLOAD_VENDOR	43	/* Vendor ID */
 #define IKEV2_PAYLOAD_TSi	44	/* Traffic Selector - Initiator */
 #define IKEV2_PAYLOAD_TSr	45	/* Traffic Selector - Responder */
-#define IKEV2_PAYLOAD_E		46	/* Encrypted */
+#define IKEV2_PAYLOAD_SK	46	/* Encrypted */
 #define IKEV2_PAYLOAD_CP	47	/* Configuration Payload */
 #define IKEV2_PAYLOAD_EAP	48	/* Extensible Authentication */
 
@@ -313,6 +313,8 @@ struct ikev2_notify {
 #define IKEV2_N_UNACCEPTABLE_ADDRESSES		40	/* RFC4555 */
 #define IKEV2_N_UNEXPECTED_NAT_DETECTED		41	/* RFC4555 */
 #define IKEV2_N_USE_ASSIGNED_HoA		42	/* RFC5026 */
+#define IKEV2_N_TEMPORARY_FAILURE		43	/* RFC5996 */
+#define IKEV2_N_CHILD_SA_NOT_FOUND		44	/* RFC5996 */
 #define IKEV2_N_INITIAL_CONTACT			16384	/* RFC4306 */
 #define IKEV2_N_SET_WINDOW_SIZE			16385	/* RFC4306 */
 #define IKEV2_N_ADDITIONAL_TS_POSSIBLE		16386	/* RFC4306 */
diff --git a/sbin/iked/ikev2_msg.c b/sbin/iked/ikev2_msg.c
index bf5903ab08d..b06c6a414f7 100644
--- a/sbin/iked/ikev2_msg.c
+++ b/sbin/iked/ikev2_msg.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ikev2_msg.c,v 1.12 2011/05/09 11:15:18 reyk Exp $	*/
+/*	$OpenBSD: ikev2_msg.c,v 1.13 2012/05/07 10:58:38 mikeb Exp $	*/
 /*	$vantronix: ikev2.c,v 1.101 2010/06/03 07:57:33 reyk Exp $	*/
 
 /*
@@ -538,7 +538,7 @@ ikev2_msg_send_encrypt(struct iked *env, struct iked_sa *sa,
 	/* IKE header */
 	if ((hdr = ikev2_add_header(buf, sa,
 	    ikev2_msg_id(env, sa, response),
-	    IKEV2_PAYLOAD_E, exchange,
+	    IKEV2_PAYLOAD_SK, exchange,
 	    response ? IKEV2_FLAG_RESPONSE : 0)) == NULL)
 		goto done;
 
diff --git a/sbin/iked/ikev2_pld.c b/sbin/iked/ikev2_pld.c
index 3aa09338304..7ef3429b09c 100644
--- a/sbin/iked/ikev2_pld.c
+++ b/sbin/iked/ikev2_pld.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ikev2_pld.c,v 1.22 2012/03/24 00:40:25 jsg Exp $	*/
+/*	$OpenBSD: ikev2_pld.c,v 1.23 2012/05/07 10:58:38 mikeb Exp $	*/
 /*	$vantronix: ikev2.c,v 1.101 2010/06/03 07:57:33 reyk Exp $	*/
 
 /*
@@ -185,7 +185,7 @@ ikev2_pld_payloads(struct iked *env, struct iked_message *msg,
 		case IKEV2_PAYLOAD_TSr | IKED_E:
 			ret = ikev2_pld_ts(env, &pld, msg, offset, payload);
 			break;
-		case IKEV2_PAYLOAD_E:
+		case IKEV2_PAYLOAD_SK:
 			ret = ikev2_pld_e(env, &pld, msg, offset);
 			break;
 		case IKEV2_PAYLOAD_CP | IKED_E:
@@ -206,7 +206,7 @@ ikev2_pld_payloads(struct iked *env, struct iked_message *msg,
 		}
 
 		/* Encrypted payload must appear last */
-		if (payload == IKEV2_PAYLOAD_E)
+		if (payload == IKEV2_PAYLOAD_SK)
 			return (0);
 
  next: