sharpetronics/strongswan
1
0
Fork 0
mirror of https://github.com/strongswan/strongswan.git synced 2025-10-18 00:00:22 -04:00
Code Issues Projects Releases Wiki Activity

PKCS#11 library search using keyid uses a fallback to look for certificates

Browse Source
This commit is contained in:
Martin Willi 2012-10-24 11:13:07 +02:00
parent aa51d5dd25
commit 712e81306f
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/libstrongswan/plugins/pkcs11/pkcs11_private_key.c
View File

@ -415,7 +415,8 @@ static pkcs11_library_t* find_lib(char *module)
/** /**
* Find the PKCS#11 lib having a keyid, and optionally a slot * Find the PKCS#11 lib having a keyid, and optionally a slot
*/ */
static pkcs11_library_t* find_lib_by_keyid(chunk_t keyid, int *slot) static pkcs11_library_t* find_lib_by_keyid(chunk_t keyid, int *slot,
CK_OBJECT_CLASS class)
{ {
pkcs11_manager_t *manager; pkcs11_manager_t *manager;
enumerator_t *enumerator; enumerator_t *enumerator;
@ -432,8 +433,7 @@ static pkcs11_library_t* find_lib_by_keyid(chunk_t keyid, int *slot)
{ {
if (*slot == -1 || *slot == current) if (*slot == -1 || *slot == current)
{ {
/* we look for a public key, it is usually readable without login */ /* look for a pubkey/cert, it is usually readable without login */
CK_OBJECT_CLASS class = CKO_PUBLIC_KEY;
CK_ATTRIBUTE tmpl[] = { CK_ATTRIBUTE tmpl[] = {
{CKA_CLASS, &class, sizeof(class)}, {CKA_CLASS, &class, sizeof(class)},
{CKA_ID, keyid.ptr, keyid.len}, {CKA_ID, keyid.ptr, keyid.len},
@ -683,7 +683,11 @@ pkcs11_private_key_t *pkcs11_private_key_connect(key_type_t type, va_list args)
} }
else else
{ {
this->lib = find_lib_by_keyid(keyid, &slot); this->lib = find_lib_by_keyid(keyid, &slot, CKO_PUBLIC_KEY);
if (!this->lib)
{
this->lib = find_lib_by_keyid(keyid, &slot, CKO_CERTIFICATE);
}
if (!this->lib) if (!this->lib)
{ {
DBG1(DBG_CFG, "no PKCS#11 module found having a keyid %#B", &keyid); DBG1(DBG_CFG, "no PKCS#11 module found having a keyid %#B", &keyid);