Changeset 201

Timestamp:

06/17/11 18:42:14 (11 months ago)

Author:

alonbl

Message:

Do not set private to C_Initialize unless actually have one

From: Jonathan Giannuzzi <jonathan@…>
Date: Fri, Jun 17, 2011 at 2:55 PM
Subject: [opensc-devel] Patch for libp11 to fix compatibility with AET SafeSign? PKCS#11 library
To: opensc-devel@…

Hello,
When using libp11 to wrap around the AET SafeSign? PKCS#11 library, C_GetInfo fails with CKR_MUTEX_BAD. This is because an empty CK_C_INITIALIZE_ARGS structure is passed to C_Initialize.
I made a change in PKCS11_CTX_load so that when no init_args have been set, no CK_C_INITIALIZE_ARGS is given to C_Initialize.
It should not break any other P11 library loading.
Cheers,
Jonathan

File:

• trunk/src/p11_load.c (modified) (2 diffs)

trunk/src/p11_load.c

@@ -56 +56 @@
 {
         PKCS11_CTX_private *priv = PRIVCTX(ctx);
-        CK_C_INITIALIZE_ARGS args;
+        CK_C_INITIALIZE_ARGS _args;
+        CK_C_INITIALIZE_ARGS *args = NULL;
         CK_INFO ck_info;
         int rv;
@@ -71 +72 @@
 
         /* Tell the PKCS11 to initialize itself */
-        memset(&args, 0, sizeof(args));
-        args.pReserved = priv->init_args;
-        rv = priv->method->C_Initialize(&args);
+        if (priv->init_args != NULL) {
+                memset(&_args, 0, sizeof(_args));
+                args = &_args;
+                args->pReserved = priv->init_args;
+        }
+        rv = priv->method->C_Initialize(args);
         if (rv && rv != CKR_CRYPTOKI_ALREADY_INITIALIZED) {
                 PKCS11err(PKCS11_F_PKCS11_CTX_LOAD, rv);