giomba
/
opensc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

pkcs11: allow bind of non-recognized cards 

To prepare C_InitToken of the non-initialized cards
allow bind of the non-recognized card
This commit is contained in:
Viktor Tarasov 2013-12-25 22:43:13 +01:00
parent 98333e56df
commit 161c83ff8b
1 changed files with 51 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
src/pkcs11/slot.c
View File

@ -43,9 +43,8 @@ static struct sc_pkcs11_slot * reader_get_slot(sc_reader_t *reader)
/* Locate a slot related to the reader */
for (i = 0; i<list_size(&virtual_slots); i++) {
sc_pkcs11_slot_t *slot = (sc_pkcs11_slot_t *) list_get_at(&virtual_slots, i);
if (slot->reader == reader) {
if (slot->reader == reader)
return slot;
}
}
return NULL;
}
@ -97,6 +96,7 @@ CK_RV create_slot(sc_reader_t *reader)
slot->reader = reader;
strcpy_bp(slot->slot_info.slotDescription, reader->name, 64);
}
return CKR_OK;
}
@ -128,10 +128,13 @@ CK_RV initialize_reader(sc_reader_t *reader)
return rv;
}
if (sc_detect_card_presence(reader)) {
sc_log(context, "Initialize reader '%s': detect SC card presence", reader->name);
if (sc_detect_card_presence(reader)) {
sc_log(context, "Initialize reader '%s': detect PKCS11 card presence", reader->name);
card_detect(reader);
}
sc_log(context, "Reader '%s' initialized", reader->name);
return CKR_OK;
}
@ -180,7 +183,8 @@ CK_RV card_removed(sc_reader_t * reader)
CK_RV card_detect(sc_reader_t *reader)
{
struct sc_pkcs11_card *p11card = NULL;
int rc, rv;
int rc;
CK_RV rv;
unsigned int i, j;
rv = CKR_OK;
@ -232,8 +236,12 @@ again:
if (p11card->card == NULL) {
sc_log(context, "%s: Connecting ... ", reader->name);
rc = sc_connect_card(reader, &p11card->card);
if (rc != SC_SUCCESS)
if (rc != SC_SUCCESS) {
sc_log(context, "%s: SC connect card error %i", reader->name, rc);
return sc_to_cryptoki_error(rc, NULL);
}
sc_log(context, "%s: Connected SC card %p", reader->name, p11card->card);
}
/* Detect the framework */
@ -251,21 +259,34 @@ again:
if (frameworks[i] == NULL)
return CKR_GENERAL_ERROR;
p11card->framework = frameworks[i];
/* Initialize framework */
sc_log(context, "%s: Detected framework %d. Creating tokens.", reader->name, i);
/* Bind firstly 'generic' application or (emulated?) card without applications */
/* Bind 'generic' application or (emulated?) card without applications */
if (app_generic || !p11card->card->app_count) {
scconf_block *atrblock = NULL;
int enable_InitToken = 0;
atrblock = sc_match_atr_block(p11card->card->ctx, NULL, &p11card->reader->atr);
if (atrblock)
enable_InitToken = scconf_get_bool(atrblock, "pkcs11_enable_InitToken", 0);
sc_log(context, "%s: Try to bind 'generic' token.", reader->name);
rv = frameworks[i]->bind(p11card, app_generic);
if (rv == CKR_TOKEN_NOT_RECOGNIZED && enable_InitToken) {
sc_log(context, "%s: 'InitToken' enabled -- accept non-binded card", reader->name);
rv = CKR_OK;
}
if (rv != CKR_OK) {
sc_log(context, "%s: cannot bind 'generic' token.", reader->name);
sc_log(context, "%s: cannot bind 'generic' token: rv 0x%X", reader->name, rv);
return rv;
}
sc_log(context, "%s: Creating 'generic' token.", reader->name);
rv = frameworks[i]->create_tokens(p11card, app_generic, &first_slot);
if (rv != CKR_OK) {
sc_log(context, "%s: cannot create 'generic' token.", reader->name);
sc_log(context, "%s: create 'generic' token error 0x%X", reader->name, rv);
return rv;
}
}
@ -281,35 +302,39 @@ again:
sc_log(context, "%s: Binding %s token.", reader->name, app_name);
rv = frameworks[i]->bind(p11card, app_info);
if (rv != CKR_OK) {
sc_log(context, "%s: cannot bind %s token.", reader->name, app_name);
sc_log(context, "%s: bind %s token error Ox%X", reader->name, app_name, rv);
continue;
}
sc_log(context, "%s: Creating %s token.", reader->name, app_name);
rv = frameworks[i]->create_tokens(p11card, app_info, &first_slot);
if (rv != CKR_OK) {
sc_log(context, "%s: cannot create %s token.", reader->name, app_name);
sc_log(context, "%s: create %s token error 0x%X", reader->name, app_name, rv);
return rv;
}
}
p11card->framework = frameworks[i];
}
sc_log(context, "%s: Detection ended", reader->name);
return CKR_OK;
}
CK_RV card_detect_all(void) {
unsigned int i;
/* Detect cards in all initialized readers */
for (i=0; i< sc_ctx_get_reader_count(context); i++) {
sc_reader_t *reader = sc_ctx_get_reader(context, i);
if (!reader_get_slot(reader))
initialize_reader(reader);
card_detect(sc_ctx_get_reader(context, i));
}
return CKR_OK;
CK_RV
card_detect_all(void)
{
unsigned int i;
sc_log(context, "Detect all cards");
/* Detect cards in all initialized readers */
for (i=0; i< sc_ctx_get_reader_count(context); i++) {
sc_reader_t *reader = sc_ctx_get_reader(context, i);
if (!reader_get_slot(reader))
initialize_reader(reader);
card_detect(sc_ctx_get_reader(context, i));
}
sc_log(context, "All cards detected");
return CKR_OK;
}
/* Allocates an existing slot to a card */
@ -326,8 +351,7 @@ CK_RV slot_allocate(struct sc_pkcs11_slot ** slot, struct sc_pkcs11_card * card)
}
if (!tmp_slot || (i == list_size(&virtual_slots)))
return CKR_FUNCTION_FAILED;
sc_log(context, "Allocated slot 0x%lx for card in reader %s", tmp_slot->id,
card->reader->name);
sc_log(context, "Allocated slot 0x%lx for card in reader %s", tmp_slot->id, card->reader->name);
tmp_slot->card = card;
tmp_slot->events = SC_EVENT_CARD_INSERTED;
*slot = tmp_slot;
@ -349,6 +373,7 @@ CK_RV slot_get_token(CK_SLOT_ID id, struct sc_pkcs11_slot ** slot)
{
int rv;
sc_log(context, "Slot(id=0x%lX): get token", id);
rv = slot_get_slot(id, slot);
if (rv != CKR_OK)
return rv;
@ -356,6 +381,7 @@ CK_RV slot_get_token(CK_SLOT_ID id, struct sc_pkcs11_slot ** slot)
if (!((*slot)->slot_info.flags & CKF_TOKEN_PRESENT)) {
if ((*slot)->reader == NULL)
return CKR_TOKEN_NOT_PRESENT;
sc_log(context, "Slot(id=0x%lX): get token: now detect card", id);
rv = card_detect((*slot)->reader);
if (rv != CKR_OK)
return rv;
@ -365,6 +391,7 @@ CK_RV slot_get_token(CK_SLOT_ID id, struct sc_pkcs11_slot ** slot)
sc_log(context, "card detected, but slot not presenting token");
return CKR_TOKEN_NOT_PRESENT;
}
sc_log(context, "Slot-get-token returns OK");
return CKR_OK;
}