From 45c8399d783876543e59b815d61d449eb9ee67ef Mon Sep 17 00:00:00 2001
From: Tobias Brunner <tobias@strongswan.org>
Date: Tue, 22 Oct 2019 11:04:30 +0200
Subject: [PATCH] Add missing strings to several enum string definitions

---
 .../plugins/kernel_netlink/kernel_netlink_net.c      |  5 +++--
 src/libcharon/plugins/smp/smp.c                      |  2 ++
 src/libstrongswan/plugins/pkcs11/pkcs11_library.c    |  3 ++-
 .../tnccs_20/messages/ita/pb_mutual_capability_msg.c | 12 +++++++-----
 .../tnccs_20/messages/ita/pb_mutual_capability_msg.h |  2 +-
 src/libtpmtss/tpm_tss_tss2_names_v2.c                |  1 +
 6 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/libcharon/plugins/kernel_netlink/kernel_netlink_net.c b/src/libcharon/plugins/kernel_netlink/kernel_netlink_net.c
index e6b3d10c3..f95ee3ce5 100644
--- a/src/libcharon/plugins/kernel_netlink/kernel_netlink_net.c
+++ b/src/libcharon/plugins/kernel_netlink/kernel_netlink_net.c
@@ -90,14 +90,15 @@ ENUM(rt_msg_names, RTM_NEWLINK, RTM_GETRULE,
 	"RTM_NEWADDR",
 	"RTM_DELADDR",
 	"RTM_GETADDR",
-	"31",
+	"23",
 	"RTM_NEWROUTE",
 	"RTM_DELROUTE",
 	"RTM_GETROUTE",
-	"35",
+	"27",
 	"RTM_NEWNEIGH",
 	"RTM_DELNEIGH",
 	"RTM_GETNEIGH",
+	"31",
 	"RTM_NEWRULE",
 	"RTM_DELRULE",
 	"RTM_GETRULE",
diff --git a/src/libcharon/plugins/smp/smp.c b/src/libcharon/plugins/smp/smp.c
index ad848182c..2953a603b 100644
--- a/src/libcharon/plugins/smp/smp.c
+++ b/src/libcharon/plugins/smp/smp.c
@@ -56,7 +56,9 @@ ENUM(ike_sa_state_lower_names, IKE_CREATED, IKE_DELETING,
 	"created",
 	"connecting",
 	"established",
+	"passive",
 	"rekeying",
+	"rekeyed",
 	"deleting",
 );
 
diff --git a/src/libstrongswan/plugins/pkcs11/pkcs11_library.c b/src/libstrongswan/plugins/pkcs11/pkcs11_library.c
index b42632fdb..6967ac253 100644
--- a/src/libstrongswan/plugins/pkcs11/pkcs11_library.c
+++ b/src/libstrongswan/plugins/pkcs11/pkcs11_library.c
@@ -49,7 +49,7 @@ ENUM_NEXT(ck_rv_names, CKR_ATTRIBUTE_READ_ONLY, CKR_ATTRIBUTE_VALUE_INVALID,
 	"ATTRIBUTE_VALUE_INVALID");
 ENUM_NEXT(ck_rv_names, CKR_DATA_INVALID, CKR_DATA_LEN_RANGE,
 		CKR_ATTRIBUTE_VALUE_INVALID,
-	"DATA_INVALID"
+	"DATA_INVALID",
 	"DATA_LEN_RANGE");
 ENUM_NEXT(ck_rv_names, CKR_DEVICE_ERROR, CKR_DEVICE_REMOVED,
 		CKR_DATA_LEN_RANGE,
@@ -540,6 +540,7 @@ ENUM_NEXT(ck_attr_names, CKA_HW_FEATURE_TYPE, CKA_HAS_RESET,
 	"HAS_RESET");
 ENUM_NEXT(ck_attr_names, CKA_PIXEL_X, CKA_BITS_PER_PIXEL, CKA_HAS_RESET,
 	"PIXEL_X",
+	"PIXEL_Y",
 	"RESOLUTION",
 	"CHAR_ROWS",
 	"CHAR_COLUMNS",
diff --git a/src/libtnccs/plugins/tnccs_20/messages/ita/pb_mutual_capability_msg.c b/src/libtnccs/plugins/tnccs_20/messages/ita/pb_mutual_capability_msg.c
index c31752019..f8b22c60b 100644
--- a/src/libtnccs/plugins/tnccs_20/messages/ita/pb_mutual_capability_msg.c
+++ b/src/libtnccs/plugins/tnccs_20/messages/ita/pb_mutual_capability_msg.c
@@ -19,11 +19,13 @@
 #include <bio/bio_reader.h>
 #include <utils/debug.h>
 
-ENUM(pb_tnc_mutual_protocol_type_names, PB_MUTUAL_HALF_DUPLEX,
-										PB_MUTUAL_FULL_DUPLEX,
-	"half duplex",
-	"full duplex"
-);
+ENUM_BEGIN(pb_tnc_mutual_protocol_type_names, PB_MUTUAL_FULL_DUPLEX,
+		   PB_MUTUAL_FULL_DUPLEX,
+	"full duplex");
+ENUM_NEXT(pb_tnc_mutual_protocol_type_names, PB_MUTUAL_HALF_DUPLEX,
+		  PB_MUTUAL_HALF_DUPLEX, PB_MUTUAL_FULL_DUPLEX,
+	"half duplex");
+ENUM_END(pb_tnc_mutual_protocol_type_names, PB_MUTUAL_HALF_DUPLEX);
 
 typedef struct private_pb_mutual_capability_msg_t private_pb_mutual_capability_msg_t;
 
diff --git a/src/libtnccs/plugins/tnccs_20/messages/ita/pb_mutual_capability_msg.h b/src/libtnccs/plugins/tnccs_20/messages/ita/pb_mutual_capability_msg.h
index db810a012..c0f628e3a 100644
--- a/src/libtnccs/plugins/tnccs_20/messages/ita/pb_mutual_capability_msg.h
+++ b/src/libtnccs/plugins/tnccs_20/messages/ita/pb_mutual_capability_msg.h
@@ -30,8 +30,8 @@ typedef struct pb_mutual_capability_msg_t pb_mutual_capability_msg_t;
  * PB-TNC mutual protocol types
  */
 enum pb_tnc_mutual_protocol_type_t {
+	PB_MUTUAL_FULL_DUPLEX =	(1 << 30),
 	PB_MUTUAL_HALF_DUPLEX =	(1 << 31),
-	PB_MUTUAL_FULL_DUPLEX =	(1 << 30)
 };
 
 /**
diff --git a/src/libtpmtss/tpm_tss_tss2_names_v2.c b/src/libtpmtss/tpm_tss_tss2_names_v2.c
index c8d29e4e6..2b48408c4 100644
--- a/src/libtpmtss/tpm_tss_tss2_names_v2.c
+++ b/src/libtpmtss/tpm_tss_tss2_names_v2.c
@@ -51,6 +51,7 @@ ENUM_NEXT(tpm_alg_id_names, TPM2_ALG_SM3_256, TPM2_ALG_ECMQV, TPM2_ALG_NULL,
 	"OAEP",
 	"ECDSA",
 	"ECDH",
+	"ECDAA",
 	"SM2",
 	"ECSCHNORR",
 	"ECMQV"