Changeset 269

Timestamp:

05/15/07 07:18:24 (5 years ago)

Author:

ludovic.rousseau

Message:

C_Initalize should be called after each fork

The pkcs11_eventmgr first C_Initialize then becomes a daemon... The
PKCS#11 standard states that after fork the user must call C_Initialize
again, in order to allow proper library initialization at new process.

Also, don't quit on major errors... try to reinitialize.

Closes ticket #14. Thanks to Alon Bar-Lev for the patch

Location:

trunk/src

Files:

• common/pkcs11_lib.c (modified) (3 diffs)
• tools/pkcs11_eventmgr.c (modified) (4 diffs)

trunk/src/common/pkcs11_lib.c

@@ -618 +618 @@
   void *module_handle;
   CK_FUNCTION_LIST_PTR fl;
+  int should_finalize;
   slot_t *slots;
   CK_ULONG slot_count;
@@ -715 +716 @@
   if (flag) rv = h->fl->C_Initialize((CK_VOID_PTR) &initArgs);
   else      rv = h->fl->C_Initialize(NULL);
-  if (rv != CKR_OK) {
+  if (rv == CKR_OK)
+    h->should_finalize = 1;
+  else if (rv != CKR_CRYPTOKI_ALREADY_INITIALIZED) {
     set_error("C_Initialize() failed: %x", rv);
     return -1;
@@ -804 +807 @@
   /* finalise pkcs #11 module */
   if (h->fl != NULL)
-    h->fl->C_Finalize(NULL);
+    if (h->should_finalize)
+      h->fl->C_Finalize(NULL);
   /* unload the module */
   if (h->module_handle != NULL)

trunk/src/tools/pkcs11_eventmgr.c

@@ -74 +74 @@
   void *module_handle;
   CK_FUNCTION_LIST_PTR fl;
+  int should_finalize;
   slot_t *slots;
   CK_ULONG slot_count;
@@ -510 +511 @@
     }
 
-    /* open pkcs11 sesion */
-    DBG("initialising pkcs #11 module...");
-    rv = ph->fl->C_Initialize(NULL);
-    if (rv != 0) {
-        release_pkcs11_module(ph);
-        DBG1("C_Initialize() failed: %d", rv);
-        return 1;
-    }
-
     /* put my self into background if flag is set */
     if (daemonize) {
@@ -529 +521 @@
         }
     }
+
+    /* open pkcs11 sesion */
+    DBG("initialising pkcs #11 module...");
+    rv = ph->fl->C_Initialize(NULL);
+    if (rv != 0) {
+        release_pkcs11_module(ph);
+        if (ctx)
+          scconf_free(ctx);
+        DBG1("C_Initialize() failed: %d", rv);
+        return 1;
+    }
+    ph->should_finalize = 1;
 
     /* 
@@ -551 +555 @@
            if (new_state == CARD_ERROR) {
                 DBG("Error trying to get a token");
+                rv = ph->fl->C_Finalize(NULL);
+                rv = ph->fl->C_Initialize(NULL);
                 break;
            }