From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Mon, 23 Jan 2012 19:58:28 +0000 (+0100)
Subject: updated inder and inraw commands.
X-Git-Tag: gnutls_3_0_13~215
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a0c6659d49ead8e65a28d8d421b96546025d0cd9;p=thirdparty%2Fgnutls.git

updated inder and inraw commands.
---

diff --git a/src/p11tool-args.def.in b/src/p11tool-args.def.in
index 338f317f62..ea4839f0e1 100644
--- a/src/p11tool-args.def.in
+++ b/src/p11tool-args.def.in
@@ -219,14 +219,15 @@ flag = {
 
 flag = {
     name      = inder;
-    descrip   = "Use DER format for input certificates and private keys";
+    descrip   = "Use DER/RAW format for input certificates and private keys";
+    disabled;
+    disable   = "no";
     doc      = "";
 };
 
 flag = {
     name      = inraw;
-    descrip   = "Use RAW/DER format for input certificates and private keys";
-    doc      = "";
+    aliases   = inder;
 };
 
 flag = {
diff --git a/src/p11tool.c b/src/p11tool.c
index beeaa5ab93..a4e4913760 100644
--- a/src/p11tool.c
+++ b/src/p11tool.c
@@ -142,8 +142,10 @@ cmd_parser (int argc, char **argv)
   if (HAVE_OPT(PKCS8))
     cinfo.pkcs8 = 1;
 
-  if (HAVE_OPT(INDER) || HAVE_OPT(INRAW))
+  if (ENABLED_OPT(INDER) || ENABLED_OPT(INRAW))
     cinfo.incert_format = GNUTLS_X509_FMT_DER;
+  else
+    cinfo.incert_format = GNUTLS_X509_FMT_PEM;
 
   if (HAVE_OPT(LOAD_CERTIFICATE))
     cinfo.cert = OPT_ARG(LOAD_CERTIFICATE);