From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Mon, 22 Dec 2014 09:59:41 +0000 (+0200)
Subject: ex-pkcs11-list.c: updated for new API
X-Git-Tag: gnutls_3_4_0~447
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7cb8a09f28cb9db82df516810fd2e1ee261cda3f;p=thirdparty%2Fgnutls.git

ex-pkcs11-list.c: updated for new API
---

diff --git a/doc/examples/ex-pkcs11-list.c b/doc/examples/ex-pkcs11-list.c
index 5091161890..b2636312f7 100644
--- a/doc/examples/ex-pkcs11-list.c
+++ b/doc/examples/ex-pkcs11-list.c
@@ -17,21 +17,13 @@ int main(int argc, char **argv)
         int ret;
         unsigned int i;
 
-        obj_list_size = 0;
-        ret = gnutls_pkcs11_obj_list_import_url(NULL, &obj_list_size, URL,
-                                                GNUTLS_PKCS11_OBJ_ATTR_CRT_WITH_PRIVKEY,
-                                                0);
-        if (ret < 0 && ret != GNUTLS_E_SHORT_MEMORY_BUFFER)
+        ret = gnutls_pkcs11_obj_list_import_url4(&obj_list, &obj_list_size, URL,
+                                                GNUTLS_PKCS11_OBJ_FLAG_CRT|
+                                                GNUTLS_PKCS11_OBJ_FLAG_WITH_PRIVKEY);
+        if (ret < 0)
                 return -1;
 
-/* no error checking from now on */
-        obj_list = malloc(sizeof(*obj_list) * obj_list_size);
-
-        gnutls_pkcs11_obj_list_import_url(obj_list, &obj_list_size, URL,
-                                          GNUTLS_PKCS11_OBJ_ATTR_CRT_WITH_PRIVKEY,
-                                          0);
-
-/* now all certificates are in obj_list */
+        /* now all certificates are in obj_list */
         for (i = 0; i < obj_list_size; i++) {
 
                 gnutls_x509_crt_init(&xcrt);
@@ -46,5 +38,9 @@ int main(int argc, char **argv)
                 gnutls_x509_crt_deinit(xcrt);
         }
 
+        for (i = 0; i < obj_list_size; i++)
+        	gnutls_pkcs11_obj_deinit(obj_list[i]);
+	gnutls_free(obj_list);
+
         return 0;
 }