From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Fri, 8 Mar 2013 17:44:57 +0000 (+0100)
Subject: GNUTLS_TPMKEY_FMT_DER -> GNUTLS_TPMKEY_FMT_RAW
X-Git-Tag: gnutls_3_1_10~38
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0ec72ce0a57c563a0edc810ad882c9befe4597c3;p=thirdparty%2Fgnutls.git

GNUTLS_TPMKEY_FMT_DER -> GNUTLS_TPMKEY_FMT_RAW
---

diff --git a/lib/includes/gnutls/tpm.h b/lib/includes/gnutls/tpm.h
index 838969b7db..4d59d2e504 100644
--- 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 815457a433..3bcc13fea7 100644
--- 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)
         {