Differences From 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] 
To Artifact [cf1bec3529]:
- File cackey.c — part of check-in [5534d640e4] at 2010-05-13 16:19:01 on branch trunk — Updated to determine subject from certificate (user: rkeene, size: 123408) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
| 1515 1516 1517 1518 1519 1520 1521 | 
				CACKEY_DEBUG_PRINTF(" ... returning %lu (%p/%lu)", (unsigned long) *((CK_BBOOL *) pValue), pValue, (unsigned long) ulValueLen);
				break;
			case CKA_LABEL:
				CACKEY_DEBUG_PRINTF("Requesting attribute CKA_LABEL (0x%08lx) ...", (unsigned long) curr_attr_type);
 | | > > > > > > | > > | | 1515 1516 1517 1518 1519 1520 1521 1522 1523 1524 1525 1526 1527 1528 1529 1530 1531 1532 1533 1534 1535 1536 1537 1538 1539 | 
				CACKEY_DEBUG_PRINTF(" ... returning %lu (%p/%lu)", (unsigned long) *((CK_BBOOL *) pValue), pValue, (unsigned long) ulValueLen);
				break;
			case CKA_LABEL:
				CACKEY_DEBUG_PRINTF("Requesting attribute CKA_LABEL (0x%08lx) ...", (unsigned long) curr_attr_type);
				/* Determine name */
				if (certificate_len >= 0) {
					x509_read_ret = x509_to_subject(certificate, certificate_len, &pValue);
					if (x509_read_ret < 0) {
						pValue = NULL;
					} else {
						ulValueLen = x509_read_ret;
					}
				}
				CACKEY_DEBUG_PRINTF(" ... returning (%p/%lu)", pValue, (unsigned long) ulValueLen);
				break;
			case CKA_VALUE:
				CACKEY_DEBUG_PRINTF("Requesting attribute CKA_VALUE (0x%08lx) ...", (unsigned long) curr_attr_type);
				switch (objectclass) {
					case CKO_PRIVATE_KEY:
 | 
| ︙ | ︙ |