tools: Fix wrong type usage of enums.

enums used as bitmask are now declared as <enum_type>_enum
the bitmaks is now declared with typedef unsigned int <enum_type>

Signed-off-by: Juergen Repp <juergen_repp@web.de>

Author: JuergenReppSIT

lib/tpm2_alg_util.h

@@ -9,24 +9,26 @@
 
 #include "tool_rc.h"
 
-typedef enum tpm2_alg_util_flags tpm2_alg_util_flags;
-enum tpm2_alg_util_flags {
-    tpm2_alg_util_flags_none       = 0,
-    tpm2_alg_util_flags_hash       = 1 << 0,
-    tpm2_alg_util_flags_keyedhash  = 1 << 1,
-    tpm2_alg_util_flags_symmetric  = 1 << 2,
-    tpm2_alg_util_flags_asymmetric = 1 << 3,
-    tpm2_alg_util_flags_kdf        = 1 << 4,
-    tpm2_alg_util_flags_mgf        = 1 << 5,
-    tpm2_alg_util_flags_sig        = 1 << 6,
-    tpm2_alg_util_flags_mode       = 1 << 7,
-    tpm2_alg_util_flags_base       = 1 << 8,
-    tpm2_alg_util_flags_misc       = 1 << 9,
-    tpm2_alg_util_flags_enc_scheme = 1 << 10,
-    tpm2_alg_util_flags_rsa_scheme = 1 << 11,
-    tpm2_alg_util_flags_any        = ~0
+typedef enum tpm2_alg_util_flags_enum tpm2_alg_util_flags_enum;
+enum tpm2_alg_util_flags_enum {
+  tpm2_alg_util_flags_none = 0,
+  tpm2_alg_util_flags_hash = 1 << 0,
+  tpm2_alg_util_flags_keyedhash = 1 << 1,
+  tpm2_alg_util_flags_symmetric = 1 << 2,
+  tpm2_alg_util_flags_asymmetric = 1 << 3,
+  tpm2_alg_util_flags_kdf = 1 << 4,
+  tpm2_alg_util_flags_mgf = 1 << 5,
+  tpm2_alg_util_flags_sig = 1 << 6,
+  tpm2_alg_util_flags_mode = 1 << 7,
+  tpm2_alg_util_flags_base = 1 << 8,
+  tpm2_alg_util_flags_misc = 1 << 9,
+  tpm2_alg_util_flags_enc_scheme = 1 << 10,
+  tpm2_alg_util_flags_rsa_scheme = 1 << 11,
+  tpm2_alg_util_flags_any = ~0
 };
 
+typedef unsigned int tpm2_alg_util_flags;
+
 /**
  * Convert a "nice-name" string to an algorithm id.
  * @param name

lib/tpm2_openssl.h

@@ -113,13 +113,15 @@ bool tpm2_openssl_hash_pcr_banks(TPMI_ALG_HASH hashAlg,
 bool tpm2_openssl_pcr_extend(TPMI_ALG_HASH halg, BYTE *pcr,
         const BYTE *data, UINT16 length);
 
-typedef enum tpm2_openssl_load_rc tpm2_openssl_load_rc;
-enum tpm2_openssl_load_rc {
-    lprc_error = 0, /* an error has occurred */
-    lprc_private = 1 << 0, /* successfully loaded a private portion of object */
-    lprc_public = 1 << 1, /* successfully loaded a public portion of object */
+typedef enum tpm2_openssl_load_rc_enum tpm2_openssl_load_rc_enum;
+enum tpm2_openssl_load_rc_eum {
+  lprc_error = 0,        /* an error has occurred */
+  lprc_private = 1 << 0, /* successfully loaded a private portion of object */
+  lprc_public = 1 << 1,  /* successfully loaded a public portion of object */
 };
 
+typedef unsigned int tpm2_openssl_load_rc;
+
 /**
  * Helper routine for gathering if the loading status included a public
  * portion of an object.

lib/tpm2_util.h

@@ -435,8 +435,8 @@ char *tpm2_util_getenv(const char *name);
 
 bool tpm2_util_env_yes(const char *name);
 
-typedef enum tpm2_handle_flags tpm2_handle_flags;
-enum tpm2_handle_flags {
+typedef enum tpm2_handle_flags_enum tpm2_handle_flags_enum;
+enum tpm2_handle_flags_enum {
     TPM2_HANDLE_FLAGS_NONE = 0,
     TPM2_HANDLE_FLAGS_O = 1 << 0,
     TPM2_HANDLE_FLAGS_P = 1 << 1,
@@ -453,6 +453,8 @@ enum tpm2_handle_flags {
     TPM2_HANDLE_ALL_W_PCR = 0x17F,
 };
 
+typedef unsigned int tpm2_handle_flags;
+
 /**
  * Converts an option from the command line into a valid TPM handle, checking
  * for errors and if the tool supports it based on flags settings.

tools/misc/tpm2_certifyX509certutil.c

@@ -192,7 +192,7 @@ static tool_rc generate_partial_X509() {
     BIO *cert_out = BIO_new_file(ctx.out_path, "wb");
     if (!cert_out) {
         LOG_ERR("Can not create file %s", ctx.out_path);
-        return -1;
+        return tool_rc_general_error;
     }
 
     X509_EXTENSION *extv3 = NULL;

tools/tpm2_getekcertificate.c

@@ -72,19 +72,21 @@ enum pubkey_enc_mode {
  *
  */
 
-typedef enum ek_nv_index ek_nv_index;
-enum ek_nv_index {
-    RSA_EK_CERT_NV_INDEX = 0x01C00002,
-    ECC_EK_CERT_NV_INDEX = 0x01C0000A,
-    RSA_2048_EK_CERT_NV_INDEX = 0x01C00012,
-    RSA_3072_EK_CERT_NV_INDEX = 0x01C0001C,
-    RSA_4096_EK_CERT_NV_INDEX = 0x01C0001E,
-    ECC_NIST_P256_EK_CERT_NV_INDEX = 0x01C00014,
-    ECC_NIST_P384_EK_CERT_NV_INDEX = 0x01C00016,
-    ECC_NIST_P521_EK_CERT_NV_INDEX = 0x01C00018,
-    ECC_SM2_P256_EK_CERT_NV_INDEX = 0x01C0001A,
+typedef enum ek_nv_index_enum ek_nv_index_enum;
+enum ek_nv_index_enum {
+  RSA_EK_CERT_NV_INDEX = 0x01C00002,
+  ECC_EK_CERT_NV_INDEX = 0x01C0000A,
+  RSA_2048_EK_CERT_NV_INDEX = 0x01C00012,
+  RSA_3072_EK_CERT_NV_INDEX = 0x01C0001C,
+  RSA_4096_EK_CERT_NV_INDEX = 0x01C0001E,
+  ECC_NIST_P256_EK_CERT_NV_INDEX = 0x01C00014,
+  ECC_NIST_P384_EK_CERT_NV_INDEX = 0x01C00016,
+  ECC_NIST_P521_EK_CERT_NV_INDEX = 0x01C00018,
+  ECC_SM2_P256_EK_CERT_NV_INDEX = 0x01C0001A,
 };
 
+typedef unsigned int ek_nv_index;
+
 #define EK_SERVER_INTEL "https://ekop.intel.com/ekcertservice/"
 #define EK_SERVER_AMD "https://ftpm.amd.com/pki/aia/"