Changeset 3404

Timestamp:

03/06/08 15:04:29 (10 months ago)

Author:

alonbl

Message:

Convert constant SC_PKCS11_MAX_VIRTUAL_SLOTS to configuration option.

Location:

trunk

Files:

• etc/opensc.conf.in (modified) (1 diff)
• src/pkcs11/misc.c (modified) (2 diffs)
• src/pkcs11/pkcs11-global.c (modified) (7 diffs)
• src/pkcs11/sc-pkcs11.h (modified) (3 diffs)
• src/pkcs11/slot.c (modified) (5 diffs)

trunk/etc/opensc.conf.in

@@ -295 +295 @@
 app opensc-pkcs11 {
         pkcs11 {
+                # Maximum Number of virtual slots.
+                # If there are more slots than defined here,
+                # the remaining slots will be hidden from PKCS#11.
+                max_virtual_slots = 8;
+
                 # Maximum number of slots per smart card.
                 # If the card has fewer keys than defined here,
                 # the remaining number of slots will be empty.
-                #
-                # Note that there is currently a compile time
-                # maximum on the overall number of slots
-                # the pkcs11 module is able to handle.
                 num_slots = 4;
 

trunk/src/pkcs11/misc.c

@@ -318 +318 @@
         
         /* Set defaults */
+        conf->pkcs11_max_virtual_slots = SC_PKCS11_DEF_MAX_VIRTUAL_SLOTS;
         conf->num_slots = SC_PKCS11_DEF_SLOTS_PER_CARD;
         conf->hide_empty_tokens = 0;
@@ -336 +337 @@
                 return;
 
+        conf->pkcs11_max_virtual_slots = scconf_get_int(conf_block, "max_virtual_slots", conf->pkcs11_max_virtual_slots);
         conf->num_slots = scconf_get_int(conf_block, "num_slots", conf->num_slots);
         conf->hide_empty_tokens = scconf_get_bool(conf_block, "hide_empty_tokens", 0);

trunk/src/pkcs11/pkcs11-global.c

@@ -32 +32 @@
 sc_context_t *context = NULL;
 struct sc_pkcs11_pool session_pool;
-struct sc_pkcs11_slot virtual_slots[SC_PKCS11_MAX_VIRTUAL_SLOTS];
+struct sc_pkcs11_slot *virtual_slots = NULL;
 struct sc_pkcs11_card card_table[SC_PKCS11_MAX_READERS];
 struct sc_pkcs11_config sc_pkcs11_conf;
@@ -193 +193 @@
 
         rv = sc_pkcs11_init_lock((CK_C_INITIALIZE_ARGS_PTR) pInitArgs);
-        if (rv != CKR_OK)   {
-                sc_release_context(context);
-                context = NULL;
-        }
+        if (rv != CKR_OK)
+                goto out;
 
         /* set context options */
@@ -214 +212 @@
 
         first_free_slot = 0;
+        virtual_slots = malloc(sizeof (*virtual_slots) * sc_pkcs11_conf.pkcs11_max_virtual_slots);
+        if (virtual_slots == NULL) {
+                rv = CKR_HOST_MEMORY;
+                goto out;
+        }
         pool_initialize(&session_pool, POOL_TYPE_SESSION);
-        for (i=0; i<SC_PKCS11_MAX_VIRTUAL_SLOTS; i++)
+        for (i=0; i<sc_pkcs11_conf.pkcs11_max_virtual_slots; i++)
                 slot_initialize(i, &virtual_slots[i]);
         for (i=0; i<SC_PKCS11_MAX_READERS; i++)
@@ -226 +229 @@
         if (context != NULL)
                 sc_debug(context, "C_Initialize: result = %d\n", rv);
+
+        if (rv != CKR_OK) {
+                if (context != NULL) {
+                        sc_release_context(context);
+                        context = NULL;
+                }
+                /* Release and destroy the mutex */
+                sc_pkcs11_free_lock();
+        }
+
         return rv;
 }
@@ -249 +262 @@
         for (i=0; i < (int)sc_ctx_get_reader_count(context); i++)
                 card_removed(i);
+
+        if (virtual_slots) {
+                free(virtual_slots);
+                virtual_slots = NULL;
+        }
 
         sc_release_context(context);
@@ -303 +321 @@
                     CK_ULONG_PTR   pulCount)      /* receives the number of slots */
 {
-        CK_SLOT_ID found[SC_PKCS11_MAX_VIRTUAL_SLOTS];
+        CK_SLOT_ID found[sc_pkcs11_conf.pkcs11_max_virtual_slots];
         int i;
         CK_ULONG numMatches;
@@ -322 +340 @@
 
         numMatches = 0;
-        for (i=0; i<SC_PKCS11_MAX_VIRTUAL_SLOTS; i++) {
+        for (i=0; i<sc_pkcs11_conf.pkcs11_max_virtual_slots; i++) {
                 slot = &virtual_slots[i];
 

trunk/src/pkcs11/sc-pkcs11.h

@@ -61 +61 @@
 #endif
 
-#define SC_PKCS11_MAX_VIRTUAL_SLOTS     8
+#define SC_PKCS11_DEF_MAX_VIRTUAL_SLOTS 8
 #define SC_PKCS11_DEF_SLOTS_PER_CARD    4
 #define SC_PKCS11_MAX_READERS           SC_MAX_READERS
@@ -91 +91 @@
 
 struct sc_pkcs11_config {
+        unsigned int pkcs11_max_virtual_slots;
         unsigned int num_slots;
         unsigned char hide_empty_tokens;
@@ -336 +337 @@
 extern struct sc_context *context;
 extern struct sc_pkcs11_pool session_pool;
-extern struct sc_pkcs11_slot virtual_slots[SC_PKCS11_MAX_VIRTUAL_SLOTS];
+extern struct sc_pkcs11_slot *virtual_slots;
 extern struct sc_pkcs11_card card_table[SC_PKCS11_MAX_READERS];
 extern struct sc_pkcs11_config sc_pkcs11_conf;

trunk/src/pkcs11/slot.c

@@ -64 +64 @@
                 avail = sc_pkcs11_conf.num_slots;
 
-        if (first_free_slot + avail > SC_PKCS11_MAX_VIRTUAL_SLOTS)
-                avail = SC_PKCS11_MAX_VIRTUAL_SLOTS - first_free_slot;
+        if (first_free_slot + avail > sc_pkcs11_conf.pkcs11_max_virtual_slots)
+                avail = sc_pkcs11_conf.pkcs11_max_virtual_slots - first_free_slot;
         card->first_slot = first_free_slot;
         card->max_slots = avail;
@@ -166 +166 @@
                 CK_SLOT_ID id;
 
-                for (id = 0; id < SC_PKCS11_MAX_VIRTUAL_SLOTS; id++)
+                for (id = 0; id < sc_pkcs11_conf.pkcs11_max_virtual_slots; id++)
                         virtual_slots[id].events = 0;
         }
@@ -185 +185 @@
         sc_debug(context, "%d: smart card removed\n", reader);
 
-        for (i=0; i<SC_PKCS11_MAX_VIRTUAL_SLOTS; i++) {
+        for (i=0; i<sc_pkcs11_conf.pkcs11_max_virtual_slots; i++) {
                 if (virtual_slots[i].card &&
                     virtual_slots[i].card->reader == reader)
@@ -246 +246 @@
                 return CKR_CRYPTOKI_NOT_INITIALIZED;
 
-        if (id < 0 || id >= SC_PKCS11_MAX_VIRTUAL_SLOTS)
+        if (id < 0 || id >= sc_pkcs11_conf.pkcs11_max_virtual_slots)
                 return CKR_SLOT_ID_INVALID;
                 
@@ -325 +325 @@
 
         card_detect_all();
-        for (id = 0; id < SC_PKCS11_MAX_VIRTUAL_SLOTS; id++) {
+        for (id = 0; id < sc_pkcs11_conf.pkcs11_max_virtual_slots; id++) {
                 slot = &virtual_slots[id];
                 if ((slot->events & SC_EVENT_CARD_INSERTED)