CACKey: Check-in [4092b10f67]

Overview

Comment:	Merged in trunk
Downloads:	Tarball \| ZIP archive \| SQL archive
Timelines:	family \| ancestors \| descendants \| both \| reader-filtering
Files:	files \| file ages \| folders
SHA1:	4092b10f67c8e3d4d9d1de533a8a6b29c9541304
User & Date:	rkeene on 2015-07-23 18:27:36
Other Links:	manifest \| tags

Context

2015-07-23
18:28		Merged in reader filtering check-in: 30f9879615 user: rkeene tags: trunk
18:27		Merged in trunk Closed-Leaf check-in: 4092b10f67 user: rkeene tags: reader-filtering
18:25		Updated to reset if signing fails and hope for the best afterwards check-in: b6e428f68c user: rkeene tags: trunk
2015-07-17
18:54		Added support for reader filtering check-in: a2a8052958 user: rkeene tags: reader-filtering

Changes

Hide Diffs Unified Diffs Ignore Whitespace Patch

Modified build/certs/commercial/kps-ca-1.crt from [cdf1ee5afa] to [3f6ab6e991].


|













|


|
|
|
|
|
|
|
<

Modified build/certs/commercial/kps-root-ca.crt from [b0a7a486e8] to [2a0d3d9c74].


|
|
|
|
|
|
>
>
|
<
<
|
|
|
|
|
|
>
|
<
|
|
|
|
|
|

Modified cackey.c from [fd4f0feee5] to [0922233e4d].

 *         the response data to be discarded.
 *
 * RETURN VALUE
 *     CACKEY_PCSC_S_OK           On success
 *     CACKEY_PCSC_E_GENERIC      On error
 *     CACKEY_PCSC_E_TOKENABSENT  If the sending failed because the token is
 *                                absent



 *
 * NOTES
 *     This function will connect to the PC/SC Connection Manager via
 *     cackey_pcsc_connect() if needed.
 *
 *     It will connect to the card in the reader attached to the slot
 *     specified.  It will reconnect to the card if the connection
................................................................................
				CACKEY_DEBUG_PRINTF("Token absent.  Returning TOKENABSENT");

				cackey_mark_slot_reset(slot);

				return(CACKEY_PCSC_E_TOKENABSENT);
			}

			return(-1);




		}

		tmpbuf += bytes_to_send;
		tmpbuflen -= bytes_to_send;

		outbuf += tmpoutbuflen;
		outbuflen -= tmpoutbuflen;








>
>
>







 







|
>
>
>
>

 *         the response data to be discarded.
 *
 * RETURN VALUE
 *     CACKEY_PCSC_S_OK           On success
 *     CACKEY_PCSC_E_GENERIC      On error
 *     CACKEY_PCSC_E_TOKENABSENT  If the sending failed because the token is
 *                                absent
 *     CACKEY_PCSC_E_RETRY        If something that looks retry'able went
 *                                wrong -- try the whole transaction over
 *                                again
 *
 * NOTES
 *     This function will connect to the PC/SC Connection Manager via
 *     cackey_pcsc_connect() if needed.
 *
 *     It will connect to the card in the reader attached to the slot
 *     specified.  It will reconnect to the card if the connection
................................................................................
				CACKEY_DEBUG_PRINTF("Token absent.  Returning TOKENABSENT");

				cackey_mark_slot_reset(slot);

				return(CACKEY_PCSC_E_TOKENABSENT);
			}

			CACKEY_DEBUG_PRINTF("Something went wrong during signing, resetting the slot and hoping for the best.");

			cackey_mark_slot_reset(slot);

			return(CACKEY_PCSC_E_GENERIC);
		}

		tmpbuf += bytes_to_send;
		tmpbuflen -= bytes_to_send;

		outbuf += tmpoutbuflen;
		outbuflen -= tmpoutbuflen;