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

Merge pull request #545 from frankmorgner/duplicate 

avoid registering pkcs11 mechanisms multiple times
This commit is contained in:
Frank Morgner 2015-09-14 12:41:37 +02:00
parent 89be9d6e18 d551f9a8e0
commit bf654540c5
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/pkcs11/framework-pkcs15.c
View File

@ -282,10 +282,15 @@ pkcs15_bind(struct sc_pkcs11_card *p11card, struct sc_app_info *app_info)
return sc_to_cryptoki_error(rc, NULL);
}
ck_rv = register_mechanisms(p11card);
if (ck_rv != CKR_OK) {
sc_log(context, "cannot register mechanisms; CKR 0x%X", ck_rv);
return ck_rv;
/* Mechanisms are registered globally per card. Checking
* p11card->nmechanisms avoids registering the same mechanisms twice for a
* card with multiple slots. */
if (!p11card->nmechanisms) {
ck_rv = register_mechanisms(p11card);
if (ck_rv != CKR_OK) {
sc_log(context, "cannot register mechanisms; CKR 0x%X", ck_rv);
return ck_rv;
}
}
return CKR_OK;