From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Thu, 7 Nov 2013 23:20:39 +0000 (-0500)
Subject: enable --inder for certtool --dh-info
X-Git-Tag: gnutls_3_2_7~94
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7be2f20916914b36e7d884c138fa9c0cda3e2bc2;p=thirdparty%2Fgnutls.git

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 767bd14598..30cfb7d124 100644
--- 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 17992504d5..e51a6c8a4d 100644
--- 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));