Add missing strings to several enum string definitions

diff --git a/src/libcharon/plugins/kernel_netlink/kernel_netlink_net.c b/src/libcharon/plugins/kernel_netlink/kernel_netlink_net.c
index e6b3d10c3ccfe4694207acb11f12494e46a90ab0..f95ee3ce5951815b446b8b6ca9c61e43b3fd8162 100644 (file)
--- 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 ad848182c7ccc9164547ef392f717c76a7b10d7d..2953a603b84713e5d7f1757bca7ae6dbf9373446 100644 (file)
--- 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 b42632fdb83e8b0cdd1da66aaa99d7804be42bb9..6967ac25362b93115ce481b5dea03a9c0ec9f883 100644 (file)
--- 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 c31752019f9be825f02f8c279573bfa056d3f87d..f8b22c60b8e6c2af08ca7ed9ca89f2bd83d0da46 100644 (file)
--- 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 db810a01223fc5f1187b48a020e6fa3190c8d287..c0f628e3a174bf5ba8ddeeb72b4ce05d88bce825 100644 (file)
--- 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 c8d29e4e6cebfbece399d59c8d605cce783416e3..2b48408c48a98bbbf98277bdb9e91100718f62a2 100644 (file)
--- 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"