From: Nikos Mavrogiannopoulos <nmav@redhat.com>
Date: Wed, 18 May 2016 11:39:06 +0000 (+0200)
Subject: systemkey: corrected help output
X-Git-Tag: gnutls_3_5_1~138
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6e55c5de14ca8dc1a80338b396f00dfbb183bcfb;p=thirdparty%2Fgnutls.git

systemkey: corrected help output
---

diff --git a/src/systemkey-args.def b/src/systemkey-args.def
index 7753b1fd3b..aca76ee323 100644
--- a/src/systemkey-args.def
+++ b/src/systemkey-args.def
@@ -12,7 +12,7 @@ explain       = "";
 
 flag = {
     name      = list;
-    descrip   = "Lists all stored keys in the TPM";
+    descrip   = "Lists all stored keys.";
     doc = "";
 };
 
@@ -20,7 +20,7 @@ flag = {
     name      = delete;
     arg-type  = string;
     arg-name  = "url";
-    descrip   = "Delete the key identified by the given URL (UUID).";
+    descrip   = "Delete the key identified by the given URL.";
     doc      = "";
 };
 
@@ -29,9 +29,7 @@ flag = {
     descrip   = "Use the DER format for keys.";
     disabled;
     disable   = "no";
-    doc       = "The input files will be assumed to be in the portable
-DER format of TPM. The default format is a custom format used by various
-TPM tools";
+    doc       = "The input files will be assumed to be in DER format.";
 };
 
 flag = {
@@ -39,7 +37,7 @@ flag = {
     descrip   = "Use DER format for output keys";
     disabled;
     disable   = "no";
-    doc       = "The output will be in the TPM portable DER format.";
+    doc       = "The output will be in DER format.";
 };
 
 doc-section = {
diff --git a/src/systemkey.c b/src/systemkey.c
index fe89a82484..7affc2ccbb 100644
--- a/src/systemkey.c
+++ b/src/systemkey.c
@@ -90,18 +90,18 @@ static void cmd_parser(int argc, char **argv)
 
 	if (HAVE_OPT(INDER)) {
 		incert_format = GNUTLS_X509_FMT_DER;
-		inkey_format = GNUTLS_TPMKEY_FMT_DER;
+		inkey_format = GNUTLS_X509_FMT_DER;
 	} else {
 		incert_format = GNUTLS_X509_FMT_PEM;
-		inkey_format = GNUTLS_TPMKEY_FMT_CTK_PEM;
+		inkey_format = GNUTLS_X509_FMT_PEM;
 	}
 
 	if (HAVE_OPT(OUTDER)) {
 		outcert_format = GNUTLS_X509_FMT_DER;
-		outkey_format = GNUTLS_TPMKEY_FMT_DER;
+		outkey_format = GNUTLS_X509_FMT_DER;
 	} else {
 		outcert_format = GNUTLS_X509_FMT_PEM;
-		outkey_format = GNUTLS_TPMKEY_FMT_CTK_PEM;
+		outkey_format = GNUTLS_X509_FMT_PEM;
 	}
 
 	if (HAVE_OPT(OUTFILE)) {