From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Fri, 13 Jul 2012 15:36:19 +0000 (+0200)
Subject: Allow gnutls-cli to be used with tpmkey urls
X-Git-Tag: gnutls_3_1_0pre0~64
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8dcf133d55c6f97c1a5cb1267b1d6b463fb405f4;p=thirdparty%2Fgnutls.git

Allow gnutls-cli to be used with tpmkey urls
---

diff --git a/src/certtool-common.c b/src/certtool-common.c
index f8c05bc839..9dcca84cec 100644
--- a/src/certtool-common.c
+++ b/src/certtool-common.c
@@ -516,7 +516,7 @@ load_ca_private_key (common_info_st * info)
 #endif
 
 #ifdef HAVE_TROUSERS
-  if (strncmp(info->privkey, "tpmkey:", 7) == 0)
+  if (strncmp(info->ca_privkey, "tpmkey:", 7) == 0)
     return _load_tpm_privkey(info->privkey);
 #endif
 
diff --git a/src/cli.c b/src/cli.c
index 980c50527d..0e5f34960b 100644
--- a/src/cli.c
+++ b/src/cli.c
@@ -242,6 +242,20 @@ load_keys (void)
         }
       else
 #endif /* ENABLE_PKCS11 */
+#ifdef HAVE_TROUSERS
+      if (strncmp (x509_keyfile, "tpmkey:", 7) == 0)
+        {
+          ret =
+            gnutls_privkey_import_tpm_url (x509_key, x509_keyfile, NULL, NULL, 0);
+          if (ret < 0)
+            {
+              fprintf (stderr, "*** Error loading url: %s\n",
+                       gnutls_strerror (ret));
+              exit (1);
+            }
+        }
+      else
+#endif /* HAVE_TROUSERS */
         {
           ret = gnutls_load_file (x509_keyfile, &data);
           if (ret < 0)