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

Added a PKCS#11 module option to enforce OS Locking functions

Browse Source
This commit is contained in:
Martin Willi
2010-11-12 16:14:03 +01:00
parent 213884f947
commit 9cda39923e
3 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libstrongswan/plugins/pkcs11/pkcs11_library.c
+13 -6
View File
@@ -800,7 +800,8 @@ static void check_features(private_pkcs11_library_t *this, CK_INFO *info)
/**
* Initialize a PKCS#11 library
*/
static bool initialize(private_pkcs11_library_t *this, char *name, char *file)
static bool initialize(private_pkcs11_library_t *this, char *name, char *file,
bool os_locking)
{
CK_C_GetFunctionList pC_GetFunctionList;
CK_INFO info;
@@ -825,10 +826,16 @@ static bool initialize(private_pkcs11_library_t *this, char *name, char *file)
name, ck_rv_names, rv);
return FALSE;
}
rv = this->public.f->C_Initialize(&args);
if (os_locking)
{
rv = CKR_CANT_LOCK;
}
else
{
rv = this->public.f->C_Initialize(&args);
}
if (rv == CKR_CANT_LOCK)
{ /* try OS locking */
{ /* fallback to OS locking */
memset(&args, 0, sizeof(args));
args.flags = CKF_OS_LOCKING_OK;
rv = this->public.f->C_Initialize(&args);
@@ -870,7 +877,7 @@ static bool initialize(private_pkcs11_library_t *this, char *name, char *file)
/**
* See header
*/
pkcs11_library_t *pkcs11_library_create(char *name, char *file)
pkcs11_library_t *pkcs11_library_create(char *name, char *file, bool os_locking)
{
private_pkcs11_library_t *this;
@@ -893,7 +900,7 @@ pkcs11_library_t *pkcs11_library_create(char *name, char *file)
return NULL;
}
if (!initialize(this, name, file))
if (!initialize(this, name, file, os_locking))
{
dlclose(this->handle);
free(this);