Differences From Artifact [984e852cb7]:
- File cackey.c — part of check-in [8a57ac5688] at 2012-07-27 18:39:51 on branch trunk — Moved computation of number of objects per DoD cert into the cackey_read_dod_identities() function (user: rkeene, size: 183579) [annotate] [blame] [check-ins using]
To Artifact [3db9c71bd5]:
- File
cackey.c
— part of check-in
[a5af46b2b5]
at
2012-07-30 05:06:18
on branch trunk
— Updated to cache certificate information
Added a C_FindObject() speed test macro
Updated to reset slot less frequently (user: rkeene, size: 186158) [annotate] [blame] [check-ins using]
| ︙ | |||
40 41 42 43 44 45 46 47 48 49 50 51 52 53 | 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 | + + + | # include <zlib.h> # endif #else # ifdef HAVE_LIBZ # undef HAVE_LIBZ # endif #endif #ifdef CACKEY_DEBUG_SEARCH_SPEEDTEST # include <sys/time.h> #endif #define CK_PTR * #define CK_DEFINE_FUNCTION(returnType, name) returnType name #define CK_DECLARE_FUNCTION(returnType, name) returnType name #define CK_DECLARE_FUNCTION_POINTER(returnType, name) returnType (* name) #define CK_CALLBACK_FUNCTION(returnType, name) returnType (* name) #ifndef NULL_PTR |
| ︙ | |||
726 727 728 729 730 731 732 733 734 735 736 737 738 739 | 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 | + + + |
int slot_reset;
CK_FLAGS token_flags;
unsigned char *label;
DWORD protocol;
unsigned int cached_certs_count;
struct cackey_pcsc_identity *cached_certs;
};
typedef enum {
CACKEY_TLV_APP_GENERIC = 0x01,
CACKEY_TLV_APP_SKI = 0x02,
CACKEY_TLV_APP_PKI = 0x04
} cackey_tlv_apptype;
|
| ︙ | |||
2082 2083 2084 2085 2086 2087 2088 2089 2090 2091 2092 2093 2094 2095 | 2088 2089 2090 2091 2092 2093 2094 2095 2096 2097 2098 2099 2100 2101 2102 2103 2104 2105 2106 2107 2108 2109 2110 2111 2112 2113 2114 2115 2116 2117 2118 2119 2120 2121 2122 2123 2124 2125 | + + + + + + + + + + + + + + + + + + + + + + + + |
if (free_start) {
free(start);
}
return;
}
static struct cackey_pcsc_identity *cackey_copy_certs(struct cackey_pcsc_identity *dest, struct cackey_pcsc_identity *start, size_t count) {
size_t idx;
if (start == NULL) {
return(NULL);
}
if (dest == NULL) {
dest = malloc(sizeof(*dest) * count);
}
for (idx = 0; idx < count; idx++) {
memcpy(dest[idx].applet, start[idx].applet, sizeof(dest[idx].applet));
dest[idx].file = start[idx].file;
dest[idx].certificate_len = start[idx].certificate_len;
dest[idx].keysize = start[idx].keysize;
dest[idx].certificate = malloc(dest[idx].certificate_len);
memcpy(dest[idx].certificate, start[idx].certificate, dest[idx].certificate_len);
}
return(dest);
}
/*
* SYNPOSIS
* ...
*
* ARGUMENTS
* ...
|
| ︙ | |||
2122 2123 2124 2125 2126 2127 2128 2129 2130 2131 2132 2133 2134 2135 | 2152 2153 2154 2155 2156 2157 2158 2159 2160 2161 2162 2163 2164 2165 2166 2167 2168 2169 2170 2171 2172 2173 2174 2175 2176 2177 2178 2179 2180 2181 2182 2183 2184 2185 2186 2187 2188 2189 | + + + + + + + + + + + + + + + + + + + + + + + + |
if (certs != NULL) {
if (*count == 0) {
CACKEY_DEBUG_PRINTF("Requested we return 0 objects, short-circuit");
return(certs);
}
}
if (!slot->slot_reset) {
if (slot->cached_certs) {
if (certs == NULL) {
certs = malloc(sizeof(*certs) * slot->cached_certs_count);
*count = slot->cached_certs_count;
} else {
if (*count > slot->cached_certs_count) {
*count = slot->cached_certs_count;
}
}
cackey_copy_certs(certs, slot->cached_certs, *count);
return(certs);
}
}
if (slot->cached_certs) {
cackey_free_certs(slot->cached_certs, slot->cached_certs_count, 1);
slot->cached_certs = NULL;
}
/* Begin a SmartCard transaction */
transaction_ret = cackey_begin_transaction(slot);
if (transaction_ret != CACKEY_PCSC_S_OK) {
CACKEY_DEBUG_PRINTF("Unable begin transaction, returning in failure");
return(NULL);
|
| ︙ | |||
2243 2244 2245 2246 2247 2248 2249 2250 2251 2252 2253 2254 2255 2256 | 2297 2298 2299 2300 2301 2302 2303 2304 2305 2306 2307 2308 2309 2310 2311 2312 2313 | + + + |
cackey_free_tlv(ccc_tlv);
*count = outidx;
if (certs_resizable) {
certs = realloc(certs, sizeof(*certs) * (*count));
}
slot->cached_certs = cackey_copy_certs(NULL, certs, *count);
slot->cached_certs_count = *count;
/* Terminate SmartCard Transaction */
cackey_end_transaction(slot);
return(certs);
}
|
| ︙ | |||
2409 2410 2411 2412 2413 2414 2415 | 2466 2467 2468 2469 2470 2471 2472 2473 2474 2475 2476 2477 2478 2479 | - |
return(CACKEY_PCSC_E_NEEDLOGIN);
}
if (send_ret == CACKEY_PCSC_E_TOKENABSENT) {
CACKEY_DEBUG_PRINTF("Token absent. Returning TOKENABSENT");
cackey_mark_slot_reset(slot);
|
| ︙ | |||
3640 3641 3642 3643 3644 3645 3646 3647 3648 3649 3650 3651 3652 3653 | 3696 3697 3698 3699 3700 3701 3702 3703 3704 3705 3706 3707 3708 3709 3710 3711 3712 3713 3714 3715 | + + + + + + |
if (cackey_slots[idx].internal) {
continue;
}
if (cackey_slots[idx].pcsc_reader) {
free(cackey_slots[idx].pcsc_reader);
}
if (cackey_slots[idx].cached_certs) {
cackey_free_certs(cackey_slots[idx].cached_certs, cackey_slots[idx].cached_certs_count, 1);
cackey_slots[idx].cached_certs = NULL;
}
}
cackey_pcsc_disconnect();
cackey_initialized = 0;
CACKEY_DEBUG_PRINTF("Returning CKR_OK (%i)", CKR_OK);
|
| ︙ | |||
3692 3693 3694 3695 3696 3697 3698 3699 3700 3701 3702 3703 3704 3705 3706 3707 3708 3709 3710 3711 3712 | 3754 3755 3756 3757 3758 3759 3760 3761 3762 3763 3764 3765 3766 3767 3768 3769 3770 3771 3772 3773 3774 3775 3776 | + + |
return(CKR_OK);
}
/*
* Process list of readers, and create mapping between reader name and slot ID
*/
CK_DEFINE_FUNCTION(CK_RV, C_GetSlotList)(CK_BBOOL tokenPresent, CK_SLOT_ID_PTR pSlotList, CK_ULONG_PTR pulCount) {
static int first_call = 1;
int mutex_retval;
int pcsc_connect_ret;
CK_ULONG count, slot_count = 0, currslot, slot_idx;
char *pcsc_readers, *pcsc_readers_s, *pcsc_readers_e;
DWORD pcsc_readers_len;
LONG scard_listreaders_ret;
size_t curr_reader_len;
int slot_reset;
CACKEY_DEBUG_PRINTF("Called.");
if (pulCount == NULL) {
CACKEY_DEBUG_PRINTF("Error. pulCount is NULL.");
return(CKR_ARGUMENTS_BAD);
|
| ︙ | |||
3722 3723 3724 3725 3726 3727 3728 3729 | 3786 3787 3788 3789 3790 3791 3792 3793 3794 3795 3796 3797 3798 3799 3800 3801 3802 3803 3804 3805 3806 3807 3808 3809 3810 3811 3812 3813 3814 3815 3816 3817 3818 3819 3820 3821 3822 3823 3824 3825 3826 3827 3828 3829 3830 3831 3832 3833 3834 3835 3836 3837 3838 3839 3840 3841 3842 3843 3844 3845 3846 3847 3848 3849 3850 3851 | + + + - - + + + - - + + + + + + + + + + + + + + + + + + + + + + + - - + + - - + + - - + + - - + + - + + + + |
if (mutex_retval != 0) {
CACKEY_DEBUG_PRINTF("Error. Locking failed.");
return(CKR_GENERAL_ERROR);
}
/* Clear list of slots */
slot_reset = 0;
if (pSlotList) {
if (first_call) {
first_call = 0;
|
| ︙ | |||
3810 3811 3812 3813 3814 3815 3816 | 3902 3903 3904 3905 3906 3907 3908 3909 3910 3911 3912 3913 3914 3915 3916 3917 3918 3919 3920 3921 3922 3923 3924 3925 3926 3927 | + - - - - - - + + + + + + - - - + + - + + |
break;
}
CACKEY_DEBUG_PRINTF("Found reader: %s", pcsc_readers);
/* Only update the list of slots if we are actually being asked supply the slot information */
if (pSlotList) {
if (slot_reset) {
|
| ︙ | |||
5120 5121 5122 5123 5124 5125 5126 5127 5128 5129 5130 5131 5132 5133 | 5213 5214 5215 5216 5217 5218 5219 5220 5221 5222 5223 5224 5225 5226 5227 5228 5229 5230 | + + + + |
CK_DEFINE_FUNCTION(CK_RV, C_FindObjects)(CK_SESSION_HANDLE hSession, CK_OBJECT_HANDLE_PTR phObject, CK_ULONG ulMaxObjectCount, CK_ULONG_PTR pulObjectCount) {
struct cackey_identity *curr_id;
CK_ATTRIBUTE *curr_attr;
CK_ULONG curr_id_idx, curr_out_id_idx, curr_attr_idx, sess_attr_idx;
CK_ULONG matched_count, prev_matched_count;
int mutex_retval;
#ifdef CACKEY_DEBUG_SEARCH_SPEEDTEST
struct timeval start, end;
uint64_t start_int, end_int;
#endif
CACKEY_DEBUG_PRINTF("Called.");
if (!cackey_initialized) {
CACKEY_DEBUG_PRINTF("Error. Not initialized.");
return(CKR_CRYPTOKI_NOT_INITIALIZED);
|
| ︙ | |||
5184 5185 5186 5187 5188 5189 5190 5191 5192 5193 5194 5195 5196 5197 | 5281 5282 5283 5284 5285 5286 5287 5288 5289 5290 5291 5292 5293 5294 5295 5296 5297 5298 | + + + + |
if (!cackey_sessions[hSession].search_active) {
cackey_mutex_unlock(cackey_biglock);
CACKEY_DEBUG_PRINTF("Error. Search not active.");
return(CKR_OPERATION_NOT_INITIALIZED);
}
#ifdef CACKEY_DEBUG_SEARCH_SPEEDTEST
gettimeofday(&start, NULL);
#endif
curr_out_id_idx = 0;
for (curr_id_idx = cackey_sessions[hSession].search_curr_id; curr_id_idx < cackey_sessions[hSession].identities_count && ulMaxObjectCount; curr_id_idx++) {
curr_id = &cackey_sessions[hSession].identities[curr_id_idx];
CACKEY_DEBUG_PRINTF("Processing identity:%lu", (unsigned long) curr_id_idx);
|
| ︙ | |||
5229 5230 5231 5232 5233 5234 5235 5236 5237 5238 5239 5240 5241 5242 | 5330 5331 5332 5333 5334 5335 5336 5337 5338 5339 5340 5341 5342 5343 5344 5345 5346 5347 5348 5349 5350 | + + + + + + + |
curr_out_id_idx++;
} else {
CACKEY_DEBUG_PRINTF(" ... Not all %i (only found %i) attributes checked for found, not adding identity:%i", (int) cackey_sessions[hSession].search_query_count, (int) matched_count, (int) curr_id_idx);
}
}
cackey_sessions[hSession].search_curr_id = curr_id_idx;
*pulObjectCount = curr_out_id_idx;
#ifdef CACKEY_DEBUG_SEARCH_SPEEDTEST
gettimeofday(&end, NULL);
start_int = (start.tv_sec * 1000000) + start.tv_usec;
end_int = (end.tv_sec * 1000000) + end.tv_usec;
fprintf(stderr, "Search took %lu microseconds\n", (unsigned long) (end_int - start_int));
#endif
mutex_retval = cackey_mutex_unlock(cackey_biglock);
if (mutex_retval != 0) {
CACKEY_DEBUG_PRINTF("Error. Unlocking failed.");
return(CKR_GENERAL_ERROR);
}
|
| ︙ |