Commit 0a5a4e05 authored by Anthony Liguori's avatar Anthony Liguori
Browse files

Merge remote-tracking branch 'alon/libcacard' into staging 

* alon/libcacard:
  libcacard/vcard_emul_nss: add warning for old coolkey
  libcacard/vcard_emul_nss: handle no readers at startup
  libcacard/vcard_emul_nss: don't stop thread when there are no slots
parents 1658dd32 6f06f178

libcacard/vcard_emul_nss.c

+26 −10
Original line number Diff line number Diff line
@@ -682,8 +682,19 @@ vcard_emul_event_thread(void *arg) 
    SECMODModule *module = (SECMODModule *)arg;



    do {

        /*

         * XXX - the latency value doesn't matter one bit. you only get no

         * blocking (flags |= CKF_DONT_BLOCK) or PKCS11_WAIT_LATENCY (==500),

         * hard coded in coolkey.  And it isn't coolkey's fault - the timeout

         * value we pass get's dropped on the floor before C_WaitForSlotEvent

         * is called.

         */

        slot = SECMOD_WaitForAnyTokenEvent(module, 0, 500);

        if (slot == NULL) {

            /* this could be just a no event indication */

            if (PORT_GetError() == SEC_ERROR_NO_EVENT) {

                continue;

            }

            break;

        }

        vreader = vcard_emul_find_vreader_from_slot(slot);
@@ -994,9 +1005,9 @@ vcard_emul_init(const VCardEmulOptions *options) 
    SECMOD_GetReadLock(module_lock);

    for (mlp = module_list; mlp; mlp = mlp->next) {

        SECMODModule *module = mlp->module;

        PRBool has_emul_slots = PR_FALSE;



        if (module == NULL) {

        /* Ignore the internal module */

        if (module == NULL || module == SECMOD_GetInternalModule()) {

            continue;

        }
@@ -1007,15 +1018,22 @@ vcard_emul_init(const VCardEmulOptions *options) 
            if (slot == NULL || !PK11_IsRemovable(slot) || !PK11_IsHW(slot)) {

                continue;

            }

            if (strcmp("E-Gate 0 0", PK11_GetSlotName(slot)) == 0) {

                /*

                 * coolkey <= 1.1.0-20 emulates this reader if it can't find

                 * any hardware readers. This causes problems, warn user of

                 * problems.

                 */

                fprintf(stderr, "known bad coolkey version - see "

                        "https://bugzilla.redhat.com/show_bug.cgi?id=802435\n");

                continue;

            }

            vreader_emul = vreader_emul_new(slot, options->hw_card_type,

                                            options->hw_type_params);

            vreader = vreader_new(PK11_GetSlotName(slot), vreader_emul,

                                  vreader_emul_delete);

            vreader_add_reader(vreader);



            has_readers = PR_TRUE;

            has_emul_slots = PR_TRUE;



            if (PK11_IsPresent(slot)) {

                VCard *vcard;

                vcard = vcard_emul_mirror_card(vreader);
@@ -1024,12 +1042,10 @@ vcard_emul_init(const VCardEmulOptions *options) 
                vcard_free(vcard);

            }

        }

        if (has_emul_slots) {

        vcard_emul_new_event_thread(module);

    }

    }

    SECMOD_ReleaseReadLock(module_lock);

    nss_emul_init = has_readers;

    nss_emul_init = PR_TRUE;



    return VCARD_EMUL_OK;

}