]> git.ipfire.org Git - thirdparty/gnutls.git/commitdiff
gnutls-cli honours the --x509fmtder.
authorNikos Mavrogiannopoulos <nmav@gnutls.org>
Tue, 13 Mar 2012 17:59:52 +0000 (18:59 +0100)
committerNikos Mavrogiannopoulos <nmav@gnutls.org>
Tue, 13 Mar 2012 17:59:52 +0000 (18:59 +0100)
src/cli.c

index 711701619c4c525d80e94f7f1f63b0287b9a8908..3f13a46812d692fa5e1a6b8f361361ef43e4e3e4 100644 (file)
--- 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",