Use static args for C_Initialize(), OpenSC does not get a copy of the pointers

diff --git a/src/libstrongswan/plugins/pkcs11/pkcs11_library.c b/src/libstrongswan/plugins/pkcs11/pkcs11_library.c
index 4373647811e279c9b7b90f3e8c44189f277f5c57..e5af0c29222b2bf30b524718a4762e60b4401a5b 100644 (file)
--- a/src/libstrongswan/plugins/pkcs11/pkcs11_library.c
+++ b/src/libstrongswan/plugins/pkcs11/pkcs11_library.c
@@ -806,12 +806,15 @@ static bool initialize(private_pkcs11_library_t *this, char *name, char *file,
        CK_C_GetFunctionList pC_GetFunctionList;
        CK_INFO info;
        CK_RV rv;
-       CK_C_INITIALIZE_ARGS args = {
+       static CK_C_INITIALIZE_ARGS args = {
                .CreateMutex = CreateMutex,
                .DestroyMutex = DestroyMutex,
                .LockMutex = LockMutex,
                .UnlockMutex = UnlockMutex,
        };
+       static CK_C_INITIALIZE_ARGS args_os = {
+               .flags = CKF_OS_LOCKING_OK,
+       };
 
        pC_GetFunctionList = dlsym(this->handle, "C_GetFunctionList");
        if (!pC_GetFunctionList)
@@ -836,9 +839,8 @@ static bool initialize(private_pkcs11_library_t *this, char *name, char *file,
        }
        if (rv == CKR_CANT_LOCK)
        {       /* fallback to OS locking */
-               memset(&args, 0, sizeof(args));
-               args.flags = CKF_OS_LOCKING_OK;
-               rv = this->public.f->C_Initialize(&args);
+               os_locking = TRUE;
+               rv = this->public.f->C_Initialize(&args_os);
        }
        if (rv != CKR_OK)
        {
@@ -865,7 +867,7 @@ static bool initialize(private_pkcs11_library_t *this, char *name, char *file,
        DBG1(DBG_CFG, "  %s: %s v%d.%d",
                 info.manufacturerID, info.libraryDescription,
                 info.libraryVersion.major, info.libraryVersion.minor);
-       if (args.flags & CKF_OS_LOCKING_OK)
+       if (os_locking)
        {
                DBG1(DBG_CFG, "  uses OS locking functions");
        }