From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Mon, 12 Nov 2012 17:24:33 +0000 (+0100)
Subject: optimizations in list import
X-Git-Tag: gnutls_3_1_5~58
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ec025698630fbadbfd545b67d143a06cdbdbf41c;p=thirdparty%2Fgnutls.git

optimizations in list import
---

diff --git a/src/pkcs11.c b/src/pkcs11.c
index 7aa82d9586..a8fc41f652 100644
--- a/src/pkcs11.c
+++ b/src/pkcs11.c
@@ -113,17 +113,9 @@ pkcs11_list (FILE * outfile, const char *url, int type, unsigned int login,
 
   /* give some initial value to avoid asking for the pkcs11 pin twice.
    */
-  crt_list_size = 128;
-  crt_list = malloc (sizeof (*crt_list) * crt_list_size);
-  if (crt_list == NULL)
-    {
-      fprintf (stderr, "Memory error\n");
-      exit (1);
-    }
-
-  ret = gnutls_pkcs11_obj_list_import_url (crt_list, &crt_list_size, url,
+  ret = gnutls_pkcs11_obj_list_import_url2 (&crt_list, &crt_list_size, url,
                                            attrs, obj_flags);
-  if (ret < 0 && ret != GNUTLS_E_SHORT_MEMORY_BUFFER)
+  if (ret < 0)
     {
       fprintf (stderr, "Error in crt_list_import (1): %s\n",
                gnutls_strerror (ret));
@@ -136,26 +128,6 @@ pkcs11_list (FILE * outfile, const char *url, int type, unsigned int login,
       exit (0);
     }
 
-  if (ret == GNUTLS_E_SHORT_MEMORY_BUFFER)
-    {
-      crt_list = realloc (crt_list, sizeof (*crt_list) * crt_list_size);
-      if (crt_list == NULL)
-        {
-          fprintf (stderr, "Memory error\n");
-          exit (1);
-        }
-
-      ret =
-        gnutls_pkcs11_obj_list_import_url (crt_list, &crt_list_size, url,
-                                           attrs, obj_flags);
-      if (ret < 0)
-        {
-          fprintf (stderr, "Error in crt_list_import: %s\n",
-                   gnutls_strerror (ret));
-          exit (1);
-        }
-    }
-
   for (i = 0; i < crt_list_size; i++)
     {
       char buf[128];