# HG changeset patch
# User Sascha Wilde <wilde@intevation.de>
# Date 1396372205 -7200
# Node ID a7c6a21aba385c2b4a25cbf97e66e23ea2da0cc9
# Parent  daad3431b930195735572e367b33a60df24a7984
Simplification, import DER cert directly to store.

diff -r daad3431b930 -r a7c6a21aba38 cinst/mozilla.c
--- a/cinst/mozilla.c	Tue Apr 01 17:39:11 2014 +0200
+++ b/cinst/mozilla.c	Tue Apr 01 19:10:05 2014 +0200
@@ -445,7 +445,6 @@
   SECItem *secitemp;
   SECStatus rv;
   PK11SlotInfo *pk11slot = NULL;
-  CERTCertificate *cert = NULL;
   char *cert_name;
 
   pdirs =
@@ -477,14 +476,11 @@
                   == SECSuccess)
                 {
                   pk11slot = PK11_GetInternalKeySlot();
-                  cert = CERT_DecodeCertFromPackage((char *)secitemp->data, (int)secitemp->len);
-                  rv = PK11_ImportCert(pk11slot, cert, CK_INVALID_HANDLE, cert_name, PR_FALSE);
+                  rv = PK11_ImportDERCert(pk11slot, secitemp, CK_INVALID_HANDLE, cert_name, PR_FALSE);
                   if (rv != SECSuccess) {
                     DEBUGPRINTF("Failed to install certificate '%s' to '%s'!\n", cert_name, pdirs[i]);
                     DEBUGPRINTF("Error was %d\n", rv);
                   }
-                  CERT_DestroyCertificate(cert);
-                  cert = NULL;
                   PK11_FreeSlot(pk11slot);
                   NSS_Shutdown();
                 }