Move pkcs11 public key lookup function declaration to header file

diff --git a/src/libstrongswan/plugins/pkcs11/pkcs11_private_key.c b/src/libstrongswan/plugins/pkcs11/pkcs11_private_key.c
index f7f7d3f7964ba297732866e0f25501598445fccb..4f74f183632827c78ab9784e2d33d4173b161322 100644 (file)
--- a/src/libstrongswan/plugins/pkcs11/pkcs11_private_key.c
+++ b/src/libstrongswan/plugins/pkcs11/pkcs11_private_key.c
@@ -20,6 +20,7 @@
 
 #include "pkcs11_library.h"
 #include "pkcs11_manager.h"
+#include "pkcs11_public_key.h"
 
 #include <debug.h>
 
@@ -81,12 +82,6 @@ struct private_pkcs11_private_key_t {
        key_type_t type;
 };
 
-/**
- * Implemented in pkcs11_public_key.c
- */
-public_key_t *pkcs11_public_key_connect(pkcs11_library_t *p11,
-                                                                       int slot, key_type_t type, chunk_t keyid);
-
 
 METHOD(private_key_t, get_type, key_type_t,
        private_pkcs11_private_key_t *this)

diff --git a/src/libstrongswan/plugins/pkcs11/pkcs11_public_key.c b/src/libstrongswan/plugins/pkcs11/pkcs11_public_key.c
index f0d7093dbd8459c3598ec42955c5102324388b91..a8bfb56e040c78549cdbd72376f74f639731918b 100644 (file)
--- a/src/libstrongswan/plugins/pkcs11/pkcs11_public_key.c
+++ b/src/libstrongswan/plugins/pkcs11/pkcs11_public_key.c
@@ -882,20 +882,10 @@ static private_pkcs11_public_key_t *find_key_by_keyid(pkcs11_library_t *p11,
 }
 
 /**
- * Find a public key on the given token with a specific keyid.
- *
- * Used by pkcs11_private_key_t.
- *
- * TODO: if no public key is found, we should perhaps search for a certificate
- * with the given keyid and extract the key from there
- *
- * @param p11          PKCS#11 module
- * @param slot         slot id
- * @param type         type of the key
- * @param keyid                key id
+ * See header.
  */
-pkcs11_public_key_t *pkcs11_public_key_connect(pkcs11_library_t *p11,
-                                                                       int slot, key_type_t type, chunk_t keyid)
+public_key_t *pkcs11_public_key_connect(pkcs11_library_t *p11, int slot,
+                                                                               key_type_t type, chunk_t keyid)
 {
        private_pkcs11_public_key_t *this;
 
@@ -904,5 +894,5 @@ pkcs11_public_key_t *pkcs11_public_key_connect(pkcs11_library_t *p11,
        {
                return NULL;
        }
-       return &this->public;
+       return &this->public.key;
 }

diff --git a/src/libstrongswan/plugins/pkcs11/pkcs11_public_key.h b/src/libstrongswan/plugins/pkcs11/pkcs11_public_key.h
index b3ea725a2e577b2ce8225d7300920e1769cd2292..4585e736e589c8af208899adcda619fac9b747a1 100644 (file)
--- a/src/libstrongswan/plugins/pkcs11/pkcs11_public_key.h
+++ b/src/libstrongswan/plugins/pkcs11/pkcs11_public_key.h
@@ -26,6 +26,8 @@ typedef struct pkcs11_public_key_t pkcs11_public_key_t;
 #include <credentials/builder.h>
 #include <credentials/keys/private_key.h>
 
+#include "pkcs11_library.h"
+
 /**
  * PKCS#11 based public key implementation.
  */
@@ -46,4 +48,15 @@ struct pkcs11_public_key_t {
  */
 pkcs11_public_key_t *pkcs11_public_key_load(key_type_t type, va_list args);
 
+/**
+ * Find a public key on the given token with a specific keyid.
+ *
+ * @param p11          PKCS#11 module
+ * @param slot         slot id
+ * @param type         type of the key
+ * @param keyid                key id
+ */
+public_key_t *pkcs11_public_key_connect(pkcs11_library_t *p11, int slot,
+                                                                               key_type_t type, chunk_t keyid);
+
 #endif /** PKCS11_PUBLIC_KEY_H_ @}*/