enable --inder for certtool --dh-info

certtool --dh-info is unable to read DER-encoded DH parameters without
this patch.

diff --git a/src/certtool-args.def b/src/certtool-args.def
index 767bd14598cd95ec1a6d46c868bdea8c187498b5..30cfb7d1242e085bedc803ef2daa487eacafbd27 100644 (file)
--- a/src/certtool-args.def
+++ b/src/certtool-args.def
@@ -309,7 +309,7 @@ flag = {
 
 flag = {
     name      = inder;
-    descrip   = "Use DER format for input certificates and private keys";
+    descrip   = "Use DER format for input certificates, private keys, and DH parameters ";
     disabled;
     disable   = "no";
     doc       = "The input files will be assumed to be in DER or RAW format. 

diff --git a/src/certtool-common.c b/src/certtool-common.c
index 17992504d515621815d33551f3e6ab1e2191c066..e51a6c8a4de6bdf7c8714fef7c93be5fd03659ae 100644 (file)
--- a/src/certtool-common.c
+++ b/src/certtool-common.c
@@ -897,7 +897,7 @@ void dh_info (FILE* infile, FILE* outfile, common_info_st * ci)
   params.size = size;
 
   ret =
-    gnutls_dh_params_import_pkcs3 (dh_params, &params, GNUTLS_X509_FMT_PEM);
+    gnutls_dh_params_import_pkcs3 (dh_params, &params, ci->incert_format);
   if (ret < 0)
     {
       fprintf (stderr, "Error parsing dh params: %s\n", gnutls_strerror (ret));