Add missing strings to several enum string definitions
authorTobias Brunner <tobias@strongswan.org>
Tue, 22 Oct 2019 09:04:30 +0000 (11:04 +0200)
committerTobias Brunner <tobias@strongswan.org>
Mon, 28 Oct 2019 13:26:32 +0000 (14:26 +0100)
src/libcharon/plugins/kernel_netlink/kernel_netlink_net.c
src/libcharon/plugins/smp/smp.c
src/libstrongswan/plugins/pkcs11/pkcs11_library.c
src/libtnccs/plugins/tnccs_20/messages/ita/pb_mutual_capability_msg.c
src/libtnccs/plugins/tnccs_20/messages/ita/pb_mutual_capability_msg.h
src/libtpmtss/tpm_tss_tss2_names_v2.c

index e6b3d10..f95ee3c 100644 (file)
@@ -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",
index ad84818..2953a60 100644 (file)
@@ -56,7 +56,9 @@ ENUM(ike_sa_state_lower_names, IKE_CREATED, IKE_DELETING,
        "created",
        "connecting",
        "established",
+       "passive",
        "rekeying",
+       "rekeyed",
        "deleting",
 );
 
index b42632f..6967ac2 100644 (file)
@@ -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",
index c317520..f8b22c6 100644 (file)
 #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;
 
index db810a0..c0f628e 100644 (file)
@@ -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)
 };
 
 /**
index c8d29e4..2b48408 100644 (file)
@@ -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"