From: Tobias Brunner <tobias@strongswan.org>
Date: Thu, 19 Jul 2018 10:08:19 +0000 (+0200)
Subject: notify-payload: Add INVALID_QSKE_PAYLOAD notify type
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=d3f0b6b077d4377543c0474969ae27f5b6829447;p=thirdparty%2Fstrongswan.git

notify-payload: Add INVALID_QSKE_PAYLOAD notify type
---

diff --git a/src/libcharon/encoding/payloads/notify_payload.c b/src/libcharon/encoding/payloads/notify_payload.c
index a69db93577..df54350f81 100644
--- a/src/libcharon/encoding/payloads/notify_payload.c
+++ b/src/libcharon/encoding/payloads/notify_payload.c
@@ -61,9 +61,10 @@ ENUM_NEXT(notify_type_names, SINGLE_PAIR_REQUIRED, CHILD_SA_NOT_FOUND, AUTHENTIC
 	"USE_ASSIGNED_HoA",
 	"TEMPORARY_FAILURE",
 	"CHILD_SA_NOT_FOUND");
-ENUM_NEXT(notify_type_names, ME_CONNECT_FAILED, ME_CONNECT_FAILED, CHILD_SA_NOT_FOUND,
-	"ME_CONNECT_FAILED");
-ENUM_NEXT(notify_type_names, MS_NOTIFY_STATUS, MS_NOTIFY_STATUS, ME_CONNECT_FAILED,
+ENUM_NEXT(notify_type_names, ME_CONNECT_FAILED, INVALID_QSKE_PAYLOAD, CHILD_SA_NOT_FOUND,
+	"ME_CONNECT_FAILED",
+	"INVALID_QSKE_PAYLOAD");
+ENUM_NEXT(notify_type_names, MS_NOTIFY_STATUS, MS_NOTIFY_STATUS, INVALID_QSKE_PAYLOAD,
 	"MS_NOTIFY_STATUS");
 ENUM_NEXT(notify_type_names, INITIAL_CONTACT, SIGNATURE_HASH_ALGORITHMS, MS_NOTIFY_STATUS,
 	"INITIAL_CONTACT",
@@ -175,9 +176,10 @@ ENUM_NEXT(notify_type_short_names, SINGLE_PAIR_REQUIRED, CHILD_SA_NOT_FOUND, AUT
 	"ASSIGNED_HoA",
 	"TEMP_FAIL",
 	"NO_CHILD_SA");
-ENUM_NEXT(notify_type_short_names, ME_CONNECT_FAILED, ME_CONNECT_FAILED, CHILD_SA_NOT_FOUND,
-	"ME_CONN_FAIL");
-ENUM_NEXT(notify_type_short_names, MS_NOTIFY_STATUS, MS_NOTIFY_STATUS, ME_CONNECT_FAILED,
+ENUM_NEXT(notify_type_short_names, ME_CONNECT_FAILED, INVALID_QSKE_PAYLOAD, CHILD_SA_NOT_FOUND,
+	"ME_CONN_FAIL",
+	"INVAL_QSKE");
+ENUM_NEXT(notify_type_short_names, MS_NOTIFY_STATUS, MS_NOTIFY_STATUS, INVALID_QSKE_PAYLOAD,
 	"MS_STATUS");
 ENUM_NEXT(notify_type_short_names, INITIAL_CONTACT, SIGNATURE_HASH_ALGORITHMS, MS_NOTIFY_STATUS,
 	"INIT_CONTACT",
diff --git a/src/libcharon/encoding/payloads/notify_payload.h b/src/libcharon/encoding/payloads/notify_payload.h
index b0cf69d02e..8c31ed16f8 100644
--- a/src/libcharon/encoding/payloads/notify_payload.h
+++ b/src/libcharon/encoding/payloads/notify_payload.h
@@ -81,6 +81,8 @@ enum notify_type_t {
 
 	/* IKE-ME, private use */
 	ME_CONNECT_FAILED = 8192,
+	/* Ask peer to use a different QSKE mechanism */
+	INVALID_QSKE_PAYLOAD = 8193,
 
 	/* Windows error code */
 	MS_NOTIFY_STATUS = 12345,