From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Sat, 9 Jun 2012 09:56:24 +0000 (+0200)
Subject: When generating a pkcs12 structure with multiple certificates set a friendly name... 
X-Git-Tag: gnutls_3_0_21~48
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8ac3afecd4a2a3a1db66417a8dc6fdd541ff8232;p=thirdparty%2Fgnutls.git

When generating a pkcs12 structure with multiple certificates set a friendly name only on the first one.
---

diff --git a/src/certtool.c b/src/certtool.c
index d68700b61a..8876d0918b 100644
--- a/src/certtool.c
+++ b/src/certtool.c
@@ -2456,10 +2456,13 @@ generate_pkcs12 (common_info_st * cinfo)
 
       indx = result;
 
-      result = gnutls_pkcs12_bag_set_friendly_name (bag, indx, name);
-      if (result < 0)
-        error (EXIT_FAILURE, 0, "bag_set_friendly_name: %s",
-               gnutls_strerror (result));
+      if (i==0) /* only the first certificate gets the friendly name */
+        {
+          result = gnutls_pkcs12_bag_set_friendly_name (bag, indx, name);
+          if (result < 0)
+            error (EXIT_FAILURE, 0, "bag_set_friendly_name: %s",
+                   gnutls_strerror (result));
+        }
 
       size = sizeof (_key_id);
       result = gnutls_x509_crt_get_key_id (crts[i], 0, _key_id, &size);