From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Mon, 12 Nov 2012 16:58:09 +0000 (+0100)
Subject: pkcs11_find_object made static.
X-Git-Tag: gnutls_3_1_5~61
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b1b8baac9929fec7f3c196865fa25d3ec0362cf7;p=thirdparty%2Fgnutls.git

pkcs11_find_object made static.
---

diff --git a/lib/pkcs11.c b/lib/pkcs11.c
index bef88cd113..73744cff1b 100644
--- a/lib/pkcs11.c
+++ b/lib/pkcs11.c
@@ -864,51 +864,6 @@ gnutls_pkcs11_obj_export2 (gnutls_pkcs11_obj_t obj,
   return _gnutls_set_datum(out, obj->raw.data, obj->raw.size);
 }
 
-int
-pkcs11_find_object (struct pkcs11_session_info* sinfo,
-                    struct pin_info_st * pin_info,
-                    ck_object_handle_t * _obj,
-                    struct p11_kit_uri *info, unsigned int flags)
-{
-  int ret;
-  ck_object_handle_t obj;
-  struct ck_attribute *attrs;
-  unsigned long attr_count;
-  unsigned long count;
-  ck_rv_t rv;
-
-  ret = pkcs11_open_session (sinfo, pin_info, info, flags & SESSION_LOGIN);
-  if (ret < 0)
-    {
-      gnutls_assert ();
-      return ret;
-    }
-
-  attrs = p11_kit_uri_get_attributes (info, &attr_count);
-  rv = pkcs11_find_objects_init (sinfo->module, sinfo->pks, attrs, attr_count);
-  if (rv != CKR_OK)
-    {
-      gnutls_assert ();
-      _gnutls_debug_log ("pk11: FindObjectsInit failed.\n");
-      ret = pkcs11_rv_to_err (rv);
-      goto fail;
-    }
-
-  if (pkcs11_find_objects (sinfo->module, sinfo->pks, &obj, 1, &count) == CKR_OK && count == 1)
-    {
-      *_obj = obj;
-      pkcs11_find_objects_final (sinfo);
-      return 0;
-    }
-
-  ret = GNUTLS_E_REQUESTED_DATA_NOT_AVAILABLE;
-  pkcs11_find_objects_final (sinfo);
-fail:
-  pkcs11_close_session (sinfo);
-
-  return ret;
-}
-
 int
 pkcs11_find_slot (struct ck_function_list ** module, ck_slot_id_t * slot,
                   struct p11_kit_uri *info, struct token_info *_tinfo)
diff --git a/lib/pkcs11_int.h b/lib/pkcs11_int.h
index d37dfa4ee5..e7f266ffe1 100644
--- a/lib/pkcs11_int.h
+++ b/lib/pkcs11_int.h
@@ -113,12 +113,6 @@ int pkcs11_token_matches_info (struct p11_kit_uri *info,
                                struct ck_token_info *tinfo,
                                struct ck_info *lib_info);
 
-/* flags are SESSION_* */
-int pkcs11_find_object (struct pkcs11_session_info* sinfo,
-                        struct pin_info_st* pin_info,
-                        ck_object_handle_t * _obj,
-                        struct p11_kit_uri *info, unsigned int flags);
-
 unsigned int pkcs11_obj_flags_to_int (unsigned int flags);
 
 int
diff --git a/lib/pkcs11_privkey.c b/lib/pkcs11_privkey.c
index 315873df8d..a4ace845ca 100644
--- a/lib/pkcs11_privkey.c
+++ b/lib/pkcs11_privkey.c
@@ -128,12 +128,56 @@ gnutls_pkcs11_privkey_get_info (gnutls_pkcs11_privkey_t pkey,
   return pkcs11_get_info (pkey->info, itype, output, output_size);
 }
 
+static int
+find_object (struct pkcs11_session_info* sinfo,
+                    struct pin_info_st * pin_info,
+                    ck_object_handle_t * _obj,
+                    struct p11_kit_uri *info, unsigned int flags)
+{
+  int ret;
+  ck_object_handle_t obj;
+  struct ck_attribute *attrs;
+  unsigned long attr_count;
+  unsigned long count;
+  ck_rv_t rv;
+
+  ret = pkcs11_open_session (sinfo, pin_info, info, flags & SESSION_LOGIN);
+  if (ret < 0)
+    {
+      gnutls_assert ();
+      return ret;
+    }
+
+  attrs = p11_kit_uri_get_attributes (info, &attr_count);
+  rv = pkcs11_find_objects_init (sinfo->module, sinfo->pks, attrs, attr_count);
+  if (rv != CKR_OK)
+    {
+      gnutls_assert ();
+      _gnutls_debug_log ("pk11: FindObjectsInit failed.\n");
+      ret = pkcs11_rv_to_err (rv);
+      goto fail;
+    }
+
+  if (pkcs11_find_objects (sinfo->module, sinfo->pks, &obj, 1, &count) == CKR_OK && count == 1)
+    {
+      *_obj = obj;
+      pkcs11_find_objects_final (sinfo);
+      return 0;
+    }
+
+  ret = GNUTLS_E_REQUESTED_DATA_NOT_AVAILABLE;
+  pkcs11_find_objects_final (sinfo);
+fail:
+  pkcs11_close_session (sinfo);
+
+  return ret;
+}
 
 #define FIND_OBJECT(sinfo, pin_info, obj, key) \
 	do { \
 		int retries = 0; \
 		int rret; \
-		ret = pkcs11_find_object (sinfo, pin_info, &obj, key->info, \
+		ret = find_object (sinfo, pin_info, &obj, key->info, \
 		                          SESSION_LOGIN); \
 		if (ret == GNUTLS_E_REQUESTED_DATA_NOT_AVAILABLE) { \
 			if (_gnutls_token_func) \
@@ -701,7 +745,6 @@ gnutls_pkcs11_privkey_generate2 (const char* url, gnutls_pk_algorithm_t pk,
   /* extract the public key */
   if (pubkey)
     {
-      
       ret = gnutls_pubkey_init(&pkey);
       if (ret < 0)
         {