From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Tue, 13 Mar 2012 17:59:52 +0000 (+0100)
Subject: gnutls-cli honours the --x509fmtder.
X-Git-Tag: gnutls_3_0_16~27
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=70cdfb18838d8fea5b5d2deb027f1ddd02486726;p=thirdparty%2Fgnutls.git

gnutls-cli honours the --x509fmtder.
---

diff --git a/src/cli.c b/src/cli.c
index 711701619c..3f13a46812 100644
--- a/src/cli.c
+++ b/src/cli.c
@@ -210,7 +210,7 @@ load_keys (void)
           crt_num = MAX_CRT;
           ret =
             gnutls_x509_crt_list_import (crt_list, &crt_num, &data,
-                                         GNUTLS_X509_FMT_PEM,
+                                         x509ctype,
                                          GNUTLS_X509_CRT_LIST_IMPORT_FAIL_IF_EXCEED);
           if (ret < 0)
             {
@@ -289,7 +289,7 @@ load_keys (void)
           gnutls_x509_privkey_init (&tmp_key);
 
           ret =
-            gnutls_x509_privkey_import (tmp_key, &data, GNUTLS_X509_FMT_PEM);
+            gnutls_x509_privkey_import (tmp_key, &data, x509ctype);
           if (ret < 0)
             {
               fprintf (stderr, "*** Error loading key file: %s\n",