GNUTLS_TPMKEY_FMT_DER -> GNUTLS_TPMKEY_FMT_RAW

diff --git a/lib/includes/gnutls/tpm.h b/lib/includes/gnutls/tpm.h
index 838969b7db5b14eb3f72a779094b220dda4e1d73..4d59d2e50487ffc7cc19bafd4f0f4266789fa127 100644 (file)
--- a/lib/includes/gnutls/tpm.h
+++ b/lib/includes/gnutls/tpm.h
@@ -40,14 +40,16 @@ typedef struct tpm_key_list_st *gnutls_tpm_key_list_t;
 
 /**
  * gnutls_tpmkey_fmt_t:
- * @GNUTLS_TPMKEY_FMT_DER: The portable data format.
+ * @GNUTLS_TPMKEY_FMT_RAW: The portable data format.
+ * @GNUTLS_TPMKEY_FMT_DER: An alias for the raw format.
  * @GNUTLS_TPMKEY_FMT_CTK_PEM: A custom data format used by some TPM tools.
  *
  * Enumeration of different certificate encoding formats.
  */
   typedef enum
   {
-    GNUTLS_TPMKEY_FMT_DER = 0,
+    GNUTLS_TPMKEY_FMT_RAW = 0,
+    GNUTLS_TPMKEY_FMT_DER = GNUTLS_TPMKEY_FMT_RAW,
     GNUTLS_TPMKEY_FMT_CTK_PEM = 1
   } gnutls_tpmkey_fmt_t;
 

diff --git a/lib/tpm.c b/lib/tpm.c
index 815457a43355d0d92eaec43172e12f464b6faa40..3bcc13fea7f453f76b39864158e22256559e1415 100644 (file)
--- a/lib/tpm.c
+++ b/lib/tpm.c
@@ -881,7 +881,7 @@ int ret;
       ret = gnutls_privkey_import_tpm_raw (pkey, &fdata, GNUTLS_TPMKEY_FMT_CTK_PEM,
                                                   srk_password, key_password, flags);
       if (ret == GNUTLS_E_BASE64_UNEXPECTED_HEADER_ERROR)
-        ret = gnutls_privkey_import_tpm_raw (pkey, &fdata, GNUTLS_TPMKEY_FMT_DER,
+        ret = gnutls_privkey_import_tpm_raw (pkey, &fdata, GNUTLS_TPMKEY_FMT_RAW,
                                              srk_password, key_password, flags);
 
       if (ret < 0)
@@ -1138,7 +1138,7 @@ int ret;
       ret = gnutls_pubkey_import_tpm_raw (pkey, &fdata, GNUTLS_TPMKEY_FMT_CTK_PEM,
                                                        srk_password, flags);
       if (ret == GNUTLS_E_BASE64_UNEXPECTED_HEADER_ERROR)
-        ret = gnutls_pubkey_import_tpm_raw (pkey, &fdata, GNUTLS_TPMKEY_FMT_DER,
+        ret = gnutls_pubkey_import_tpm_raw (pkey, &fdata, GNUTLS_TPMKEY_FMT_RAW,
                                                        srk_password, flags);
       if (ret < 0)
         {