From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Sat, 2 Nov 2013 07:32:56 +0000 (+0100)
Subject: Do not print private key parameters when exporting an encrypted private key.
X-Git-Tag: gnutls_3_2_7~121
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7b59c9268dea315302b85dc257859bd9ac4732dd;p=thirdparty%2Fgnutls.git

Do not print private key parameters when exporting an encrypted private key.
---

diff --git a/src/certtool.c b/src/certtool.c
index 0ea52e8afd..4dc6dea26d 100644
--- a/src/certtool.c
+++ b/src/certtool.c
@@ -189,11 +189,14 @@ print_private_key (common_info_st* cinfo, gnutls_x509_privkey_t key)
   if (!key)
     return;
 
-  if (outcert_format == GNUTLS_X509_FMT_PEM)
-    privkey_info_int(cinfo, key);
 
   if (!cinfo->pkcs8)
     {
+      /* Only print private key parameters when an unencrypted
+       * format is used */
+      if (outcert_format == GNUTLS_X509_FMT_PEM)
+        privkey_info_int(cinfo, key);
+
       size = buffer_size;
       ret = gnutls_x509_privkey_export (key, outcert_format,
                                         buffer, &size);