Changeset 3481 for branches/alonbl/pnp/src/libopensc/reader-pcsc.c

Timestamp:

04/20/08 09:59:23 (9 months ago)

Author:

alonbl

Message:

Initial Plug&Play support

Add detect_readers() to reader opts.
Add sc_ctx_detect_readers() that calls readers' detect_readers().
Allow context to be created without readers.
Call sc_ctx_detect_readers() from PKCS#11 C_GetSlotList with NULL_PTR.

Since I broke ABI, I updated the external module version requirement
to match OpenSC version. In the future a separate version should be
maintaind for each interface, this should be unrelated to the package
version.

Files:

• branches/alonbl/pnp/src/libopensc/reader-pcsc.c (modified) (6 diffs)

branches/alonbl/pnp/src/libopensc/reader-pcsc.c

@@ -732 +732 @@
 {
         LONG rv;
-        DWORD reader_buf_size;
-        char *reader_buf = NULL, *p;
-        const char *mszGroups = NULL;
-        int r;
         struct pcsc_global_private_data *gpriv;
         scconf_block *conf_block = NULL;
@@ -825 +821 @@
                 goto out;
         }
+
+        *reader_data = gpriv;
+        gpriv = NULL;
+        ret = SC_SUCCESS;
+
+out:
+        if (ret != SC_SUCCESS) {
+                if (gpriv->pcsc_ctx != 0)
+                        gpriv->SCardReleaseContext(gpriv->pcsc_ctx);
+                if (gpriv->dlhandle != NULL)
+                        lt_dlclose(gpriv->dlhandle);
+                if (gpriv != NULL)
+                        free(gpriv);
+        }
+
+        return 0;
+}
+
+static int pcsc_finish(sc_context_t *ctx, void *prv_data)
+{
+        struct pcsc_global_private_data *priv = (struct pcsc_global_private_data *) prv_data;
+
+        if (priv) {
+                priv->SCardReleaseContext(priv->pcsc_ctx);
+                lt_dlclose(priv->dlhandle);
+                free(priv);
+        }
+
+        return 0;
+}
+
+static int pcsc_detect_readers(sc_context_t *ctx, void *prv_data)
+{
+        struct pcsc_global_private_data *gpriv = (struct pcsc_global_private_data *) prv_data;
+        LONG rv;
+        DWORD reader_buf_size;
+        char *reader_buf = NULL, *p;
+        const char *mszGroups = NULL;
+        int ret = SC_ERROR_INTERNAL;
+
         rv = gpriv->SCardListReaders(gpriv->pcsc_ctx, NULL, NULL,
                               (LPDWORD) &reader_buf_size);
-        if (rv != SCARD_S_SUCCESS || reader_buf_size < 2) {
-                ret = pcsc_ret_to_error(rv);    /* No readers configured */
+        if (rv != SCARD_S_SUCCESS) {
+                ret = pcsc_ret_to_error(rv);
                 goto out;
         }
@@ -843 +879 @@
                 goto out;
         }
-        p = reader_buf;
-        do {
-                sc_reader_t *reader = (sc_reader_t *) calloc(1, sizeof(sc_reader_t));
-                struct pcsc_private_data *priv = (struct pcsc_private_data *) malloc(sizeof(struct pcsc_private_data));
-                struct pcsc_slot_data *pslot = (struct pcsc_slot_data *) malloc(sizeof(struct pcsc_slot_data));
-                sc_slot_info_t *slot;
-
-                if (reader == NULL || priv == NULL || pslot == NULL) {
-                        if (reader)
-                                free(reader);
-                        if (priv)
-                                free(priv);
-                        if (pslot)
-                                free(pslot);
-                        break;
+        for (p = reader_buf; *p != '\x0'; p += strlen (p) + 1) {
+                sc_reader_t *reader = NULL;
+                struct pcsc_private_data *priv = NULL;
+                struct pcsc_slot_data *pslot = NULL;
+                sc_slot_info_t *slot = NULL;
+                int i;
+                int found = 0;
+
+                for (i=0;i < sc_ctx_get_reader_count (ctx) && !found;i++) {
+                        sc_reader_t *reader = sc_ctx_get_reader (ctx, i);
+                        if (reader == NULL) {
+                                ret = SC_ERROR_INTERNAL;
+                                goto err1;
+                        }
+                        if (reader->ops == &pcsc_ops && !strcmp (reader->name, p)) {
+                                found = 1;
+                        }
+                }
+
+                /* Reader already available, skip */
+                if (found) {
+                        continue;
+                }
+
+                if ((reader = (sc_reader_t *) calloc(1, sizeof(sc_reader_t))) == NULL) {
+                        ret = SC_ERROR_OUT_OF_MEMORY;
+                        goto err1;
+                }
+                if ((priv = (struct pcsc_private_data *) malloc(sizeof(struct pcsc_private_data))) == NULL) {
+                        ret = SC_ERROR_OUT_OF_MEMORY;
+                        goto err1;
+                }
+                if ((pslot = (struct pcsc_slot_data *) malloc(sizeof(struct pcsc_slot_data))) == NULL) {
+                        ret = SC_ERROR_OUT_OF_MEMORY;
+                        goto err1;
                 }
 
@@ -864 +920 @@
                 reader->driver = &pcsc_drv;
                 reader->slot_count = 1;
-                reader->name = strdup(p);
+                if ((reader->name = strdup(p)) == NULL) {
+                        ret = SC_ERROR_OUT_OF_MEMORY;
+                        goto err1;
+                }
                 priv->gpriv = gpriv;
-                priv->reader_name = strdup(p);
-                r = _sc_add_reader(ctx, reader);
-                if (r) {
-                        free(priv->reader_name);
-                        free(priv);
-                        free(reader->name);
-                        free(reader);
-                        free(pslot);
-                        break;
+                if ((priv->reader_name = strdup(p)) == NULL) {
+                        ret = SC_ERROR_OUT_OF_MEMORY;
+                        goto err1;
                 }
                 slot = &reader->slot[0];
@@ -880 +933 @@
                 slot->drv_data = pslot;
                 memset(pslot, 0, sizeof(*pslot));
+                if (_sc_add_reader(ctx, reader)) {
+                        ret = SC_SUCCESS;       /* silent ignore */
+                        goto err1;
+                }
                 refresh_slot_attributes(reader, slot);
 
-                while (*p++ != 0);
-        } while (p < (reader_buf + reader_buf_size - 1));
-
-        *reader_data = gpriv;
-        gpriv = NULL;
+                continue;
+        
+        err1:
+                if (priv != NULL) {
+                        if (priv->reader_name)
+                                free(priv->reader_name);
+                        free(priv);
+                }
+                if (reader != NULL) {
+                        if (reader->name)
+                                free(reader->name);
+                        free(reader);
+                }
+                if (slot != NULL)
+                        free(pslot);
+
+                goto out;
+        }
+
         ret = SC_SUCCESS;
 
 out:
-        if (ret != SC_SUCCESS) {
-                if (gpriv->pcsc_ctx != 0)
-                        gpriv->SCardReleaseContext(gpriv->pcsc_ctx);
-                if (reader_buf != NULL)
-                        free(reader_buf);
-                if (gpriv->dlhandle != NULL)
-                        lt_dlclose(gpriv->dlhandle);
-                if (gpriv != NULL)
-                        free(gpriv);
-        }
-
-        return 0;
-}
-
-static int pcsc_finish(sc_context_t *ctx, void *prv_data)
-{
-        struct pcsc_global_private_data *priv = (struct pcsc_global_private_data *) prv_data;
-
-        if (priv) {
-                priv->SCardReleaseContext(priv->pcsc_ctx);
-                lt_dlclose(priv->dlhandle);
-                free(priv);
-        }
-
-        return 0;
+
+        if (reader_buf != NULL)
+                free (reader_buf);
+
+        return ret;
 }
 
@@ -932 +983 @@
         pcsc_ops.init = pcsc_init;
         pcsc_ops.finish = pcsc_finish;
+        pcsc_ops.detect_readers = pcsc_detect_readers;
         pcsc_ops.transmit = pcsc_transmit;
         pcsc_ops.detect_card_presence = pcsc_detect_card_presence;