denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Implemented callback PIN invocation for PKCS#11 login

Browse Source
This commit is contained in:
Martin Willi
2010-08-04 09:26:20 +02:00
parent 7afc00d03c
commit a0bdd5d63e
1 changed files with 47 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libstrongswan/plugins/pkcs11/pkcs11_private_key.c
+47 -8
View File
@@ -330,15 +330,34 @@ static bool find_key(private_pkcs11_private_key_t *this, chunk_t keyid)
return this->pubkey != NULL; return this->pubkey != NULL;
} }
/**
* Try a login to the session
*/
static bool login(private_pkcs11_private_key_t *this, chunk_t pin, int slot)
{
CK_RV rv;
rv = this->lib->f->C_Login(this->session, CKU_USER, pin.ptr, pin.len);
if (rv != CKR_OK)
{
DBG1(DBG_CFG, "login to '%s':%d failed: %N",
this->lib->get_name(this->lib), slot, ck_rv_names, rv);
return FALSE;
}
return TRUE;
}
/** /**
* See header. * See header.
*/ */
pkcs11_private_key_t *pkcs11_private_key_connect(key_type_t type, va_list args) pkcs11_private_key_t *pkcs11_private_key_connect(key_type_t type, va_list args)
{ {
private_pkcs11_private_key_t *this; private_pkcs11_private_key_t *this;
chunk_t (*cb)(void *data, int try) = NULL;
void *cb_data = NULL;
char *module = NULL; char *module = NULL;
chunk_t keyid, pin; chunk_t keyid, pin;
int slot = -1; int slot = -1, try = 0;
CK_RV rv; CK_RV rv;
keyid = pin = chunk_empty; keyid = pin = chunk_empty;
@@ -352,6 +371,10 @@ pkcs11_private_key_t *pkcs11_private_key_connect(key_type_t type, va_list args)
case BUILD_PASSPHRASE: case BUILD_PASSPHRASE:
pin = va_arg(args, chunk_t); pin = va_arg(args, chunk_t);
continue; continue;
case BUILD_PASSPHRASE_CALLBACK:
cb = va_arg(args, void*);
cb_data = va_arg(args, void*);
continue;
case BUILD_PKCS11_SLOT: case BUILD_PKCS11_SLOT:
slot = va_arg(args, int); slot = va_arg(args, int);
continue; continue;
@@ -365,7 +388,7 @@ pkcs11_private_key_t *pkcs11_private_key_connect(key_type_t type, va_list args)
} }
break; break;
} }
if (!keyid.len || !pin.len) if (!keyid.len || (!pin.len && !cb))
{ {
return NULL; return NULL;
} }
@@ -421,13 +444,29 @@ pkcs11_private_key_t *pkcs11_private_key_connect(key_type_t type, va_list args)
this->mutex = mutex_create(MUTEX_TYPE_DEFAULT); this->mutex = mutex_create(MUTEX_TYPE_DEFAULT);
rv = this->lib->f->C_Login(this->session, CKU_USER, pin.ptr, pin.len); if (pin.ptr)
if (rv != CKR_OK)
{ {
DBG1(DBG_CFG, "login to '%s':%d failed: %N", if (!login(this, pin, slot))
module, slot, ck_rv_names, rv); {
destroy(this); destroy(this);
return NULL; return NULL;
}
}
else
{
while (TRUE)
{
pin = cb(cb_data, ++try);
if (!pin.len)
{
destroy(this);
return NULL;
}
if (login(this, pin, slot))
{
break;
}
}
} }
if (!find_key(this, keyid)) if (!find_key(this, keyid))