Overview
Comment: | Minor cleanup |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: | e4e500972a914a0ea9e579d999c02cb1340a0aad |
User & Date: | rkeene on 2019-06-09 18:35:45 |
Other Links: | manifest | tags |
Context
2019-06-12
| ||
19:38 | Handle converting from buffers which cannot be converted to byte arrays check-in: af11332c35 user: rkeene tags: trunk | |
2019-06-09
| ||
18:35 | Minor cleanup check-in: e4e500972a user: rkeene tags: trunk | |
2019-06-08
| ||
22:18 | Start of Tcl-based SSH agent that uses JavaScript implementation check-in: 7336ecd46a user: rkeene tags: trunk | |
Changes
Modified cackey.c from [50819dda69] to [60cd8b85ae].
190 191 192 193 194 195 196 197 198 199 200 201 202 203 ... 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 .... 3359 3360 3361 3362 3363 3364 3365 3366 3367 3368 3369 3370 3371 3372 3373 |
/* ATR If not available */ #ifndef MAX_ATR_SIZE #define MAX_ATR_SIZE 1024 #endif #ifdef CACKEY_DEBUG # ifdef HAVE_TIME_H # include <time.h> static time_t cackey_debug_start_time = 0; static unsigned long CACKEY_DEBUG_GETTIME(void) { if (cackey_debug_start_time == 0) { cackey_debug_start_time = time(NULL); } ................................................................................ unsigned long idx; \ int snprintf_ret; \ TMPBUF = (unsigned char *) (x); \ buf_user[0] = 0; \ buf_user[2] = 0; \ buf_user_p = buf_user; \ buf_user_size = sizeof(buf_user); \ for (idx = 0; idx < MIN((y), sizeof(buf_user)); idx++) { \ if (buf_user_size <= 0) { \ break; \ }; \ snprintf_ret = snprintf(buf_user_p, buf_user_size, ", %02x", TMPBUF[idx]); \ if (snprintf_ret <= 0) { \ break; \ }; \ ................................................................................ * */ static cackey_ret cackey_token_present(struct cackey_slot *slot) { cackey_ret pcsc_connect_ret; DWORD reader_len = 0, state = 0, protocol = 0, atr_len; BYTE atr[MAX_ATR_SIZE]; LONG status_ret, scard_reconn_ret; LPSTR *reader_name; CACKEY_DEBUG_PRINTF("Called."); if (slot->internal) { CACKEY_DEBUG_PRINTF("Returning token present (internal token)"); return(CACKEY_PCSC_S_TOKENPRESENT); |
> | | |
190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 ... 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 .... 3360 3361 3362 3363 3364 3365 3366 3367 3368 3369 3370 3371 3372 3373 3374 |
/* ATR If not available */ #ifndef MAX_ATR_SIZE #define MAX_ATR_SIZE 1024 #endif #ifdef CACKEY_DEBUG # define CACKEY_DEBUG_MIN(a, b) ((a) < (b) ? (a) : (b)) # ifdef HAVE_TIME_H # include <time.h> static time_t cackey_debug_start_time = 0; static unsigned long CACKEY_DEBUG_GETTIME(void) { if (cackey_debug_start_time == 0) { cackey_debug_start_time = time(NULL); } ................................................................................ unsigned long idx; \ int snprintf_ret; \ TMPBUF = (unsigned char *) (x); \ buf_user[0] = 0; \ buf_user[2] = 0; \ buf_user_p = buf_user; \ buf_user_size = sizeof(buf_user); \ for (idx = 0; idx < CACKEY_DEBUG_MIN((y), sizeof(buf_user)); idx++) { \ if (buf_user_size <= 0) { \ break; \ }; \ snprintf_ret = snprintf(buf_user_p, buf_user_size, ", %02x", TMPBUF[idx]); \ if (snprintf_ret <= 0) { \ break; \ }; \ ................................................................................ * */ static cackey_ret cackey_token_present(struct cackey_slot *slot) { cackey_ret pcsc_connect_ret; DWORD reader_len = 0, state = 0, protocol = 0, atr_len; BYTE atr[MAX_ATR_SIZE]; LONG status_ret, scard_reconn_ret; LPSTR reader_name; CACKEY_DEBUG_PRINTF("Called."); if (slot->internal) { CACKEY_DEBUG_PRINTF("Returning token present (internal token)"); return(CACKEY_PCSC_S_TOKENPRESENT); |