Differences From Artifact [cd6ed6e22a]:
- File
cackey.c
— part of check-in
[0c536f15c1]
at
2010-05-12 23:58:50
on branch trunk
— Moved certificate examination to occur during search initialization
Added support for logging in via PC/SC in C_Login() (user: rkeene, size: 122757) [annotate] [blame] [check-ins using]
To Artifact [2223838f44]:
- File
cackey.c
— part of check-in
[9b6cdd281c]
at
2010-05-13 15:58:32
on branch trunk
— Updated to use certificate from identity in attribute finding
Updated to correctly pass certificate number (user: rkeene, size: 123230) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
1435 1436 1437 1438 1439 1440 1441 | CK_ATTRIBUTE curr_attr, *retval; CK_VOID_PTR pValue; CK_ULONG ulValueLen; CK_OBJECT_CLASS ck_object_class; CK_CERTIFICATE_TYPE ck_certificate_type; CK_KEY_TYPE ck_key_type; CK_UTF8CHAR ucTmpBuf[1024]; | | | > > | > | | > | | > > > > > > > > > > | 1435 1436 1437 1438 1439 1440 1441 1442 1443 1444 1445 1446 1447 1448 1449 1450 1451 1452 1453 1454 1455 1456 1457 1458 1459 1460 1461 1462 1463 1464 1465 1466 1467 1468 1469 1470 1471 1472 1473 1474 1475 1476 1477 1478 1479 1480 1481 1482 1483 1484 1485 |
CK_ATTRIBUTE curr_attr, *retval;
CK_VOID_PTR pValue;
CK_ULONG ulValueLen;
CK_OBJECT_CLASS ck_object_class;
CK_CERTIFICATE_TYPE ck_certificate_type;
CK_KEY_TYPE ck_key_type;
CK_UTF8CHAR ucTmpBuf[1024];
unsigned char *certificate;
ssize_t certificate_len = -1, x509_read_ret;
int pValue_free;
CACKEY_DEBUG_PRINTF("Called (objectClass = %lu, identity_num = %lu).", (unsigned long) objectclass, identity_num);
if (objectclass != CKO_CERTIFICATE && objectclass != CKO_PUBLIC_KEY && objectclass != CKO_PRIVATE_KEY) {
CACKEY_DEBUG_PRINTF("Returning 0 objects (NULL), invalid object class");
return(NULL);
}
/* Get Cert */
if (identity == NULL) {
CACKEY_DEBUG_PRINTF("Returning 0 objects (NULL), invalid identiy provided");
return(NULL);
}
certificate = identity->certificate;
certificate_len = identity->certificate_len;
if (certificate_len == -1 || certificate == NULL) {
CACKEY_DEBUG_PRINTF("Returning 0 objects (NULL), this identity does not have an X.509 certificate associated with it and will not work");
return(NULL);
}
/* Verify that certificate is ASN.1 encoded X.509 certificate */
if (x509_to_serial(certificate, certificate_len, NULL) < 0) {
CACKEY_DEBUG_PRINTF("Returning 0 objects (NULL), the X.509 certificate associated with this identity is not valid");
return(NULL);
}
retval_count = 16;
retval = malloc(retval_count * sizeof(*retval));
for (curr_attr_type = 0; curr_attr_type < 0xce53635f; curr_attr_type++) {
if (curr_attr_type == 0x800) {
curr_attr_type = 0xce536300;
}
pValue_free = 0;
|
| ︙ | ︙ | |||
2974 2975 2976 2977 2978 2979 2980 |
num_ids = (CKO_PRIVATE_KEY - CKO_CERTIFICATE + 1) * num_certs;
identities = malloc(num_ids * sizeof(*identities));
id_idx = 0;
for (cert_idx = 0; cert_idx < num_certs; cert_idx++) {
for (curr_id_type = CKO_CERTIFICATE; curr_id_type <= CKO_PRIVATE_KEY; curr_id_type++) {
| | | 2988 2989 2990 2991 2992 2993 2994 2995 2996 2997 2998 2999 3000 3001 3002 |
num_ids = (CKO_PRIVATE_KEY - CKO_CERTIFICATE + 1) * num_certs;
identities = malloc(num_ids * sizeof(*identities));
id_idx = 0;
for (cert_idx = 0; cert_idx < num_certs; cert_idx++) {
for (curr_id_type = CKO_CERTIFICATE; curr_id_type <= CKO_PRIVATE_KEY; curr_id_type++) {
identities[id_idx].attributes = cackey_get_attributes(curr_id_type, &pcsc_identities[cert_idx], cert_idx, &identities[id_idx].attributes_count);
if (identities[id_idx].attributes == NULL) {
identities[id_idx].attributes_count = 0;
}
id_idx++;
}
|
| ︙ | ︙ |