updated inder and inraw commands.

diff --git a/src/p11tool-args.def.in b/src/p11tool-args.def.in
index 338f317f62c01c73266b0583853ba3b6cfd27d39..ea4839f0e124bc67cb9ab1a2cf76320d6bc078de 100644 (file)
--- 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 beeaa5ab93b9c1b2239d2268f3a92cf28c8d17bc..a4e491376046976ca9d5c4de8a4e3b49fb06e48f 100644 (file)
--- 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);