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

fixed tokenInfo parsing 

git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@10 c6295689-39f2-0310-b995-f0e70906c6a9
This commit is contained in:
jey 2001-10-21 15:42:56 +00:00
parent 86bbeffc40
commit 07671adadd
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/pkcs11/generic.c
View File

@ -159,17 +159,26 @@ CK_RV C_GetTokenInfo(CK_SLOT_ID slotID, CK_TOKEN_INFO_PTR pInfo)
return CKR_DEVICE_ERROR;
}
}
strcpy(pInfo->label, p15card[slotID]->label);
strcpy(pInfo->manufacturerID, "unknown");
strcpy(pInfo->model, "unknown");
strcpy(pInfo->serialNumber, "unknown");
strncpy(pInfo->label, p15card[slotID]->label, 32);
pInfo->label[31] = 0;
strncpy(pInfo->manufacturerID, p15card[slotID]->manufacturer_id, 32);
pInfo->manufacturerID[31] = 0;
strcpy(pInfo->model, "PKCS#15 SC");
strncpy(pInfo->serialNumber, p15card[slotID]->serial_number, 16);
pInfo->serialNumber[15] = 0;
pInfo->flags = CKF_LOGIN_REQUIRED | CKF_USER_PIN_INITIALIZED;
pInfo->ulMaxSessionCount = 1; /* opened in exclusive mode */
pInfo->ulSessionCount = 0;
pInfo->ulMaxRwSessionCount = 1;
pInfo->ulRwSessionCount = 0;
pInfo->ulMaxPinLen = 8; /* FIXME: get these from PIN objects */
pInfo->ulMinPinLen = 4;
if (p15card[slotID]->pins[0].magic == SC_PKCS15_PIN_MAGIC) {
pInfo->ulMaxPinLen = p15card[slotID]->pins[0].stored_length;
pInfo->ulMinPinLen = p15card[slotID]->pins[0].min_length;
} else {
/* choose reasonable defaults */
pInfo->ulMaxPinLen = 8;
pInfo->ulMinPinLen = 4;
}
pInfo->ulTotalPublicMemory = 0;
pInfo->ulFreePublicMemory = 0;
pInfo->ulTotalPrivateMemory = 0;

1
src/tests/hst-test.c
View File

@ -50,6 +50,7 @@ int main(int argc, char **argv) {
fprintf(stderr, "PKCS#15 card init failed: %s\n", sc_strerror(i));
return 1;
}
sc_pkcs15_print_card(p15_card);
return 0;
i = sc_pkcs15_read_certificate(p15_card, 0);
if (i) {