Differences From Artifact [9bef8e6303]:
- File
cackey.c
— part of check-in
[26acceb6f2]
at
2010-05-17 07:19:02
on branch trunk
— Updated PC/SC identity member of cackey identity name to be more descriptive
Added more sanity checks
Updated to populate pcsc_identity structure of cackey identity from certificate information (user: rkeene, size: 146527) [annotate] [blame] [check-ins using]
To Artifact [6b8855e22d]:
- File cackey.c — part of check-in [b4a6b9d685] at 2010-05-17 14:55:37 on branch trunk — Added removable device flag to slot info (user: rkeene, size: 146546) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
2938 2939 2940 2941 2942 2943 2944 |
bytes_to_copy = strlen(cackey_slots[slotID].pcsc_reader);
if (sizeof(pInfo->manufacturerID) < bytes_to_copy) {
bytes_to_copy = sizeof(pInfo->manufacturerID);
}
memcpy(pInfo->manufacturerID, cackey_slots[slotID].pcsc_reader, bytes_to_copy);
| | | 2938 2939 2940 2941 2942 2943 2944 2945 2946 2947 2948 2949 2950 2951 2952 |
bytes_to_copy = strlen(cackey_slots[slotID].pcsc_reader);
if (sizeof(pInfo->manufacturerID) < bytes_to_copy) {
bytes_to_copy = sizeof(pInfo->manufacturerID);
}
memcpy(pInfo->manufacturerID, cackey_slots[slotID].pcsc_reader, bytes_to_copy);
pInfo->flags = CKF_REMOVABLE_DEVICE;
if (cackey_token_present(&cackey_slots[slotID]) == CACKEY_PCSC_S_TOKENPRESENT) {
pInfo->flags |= CKF_TOKEN_PRESENT;
}
pInfo->hardwareVersion.major = (cackey_getversion() >> 16) & 0xff;
pInfo->hardwareVersion.minor = (cackey_getversion() >> 8) & 0xff;
|
| ︙ | ︙ |