Overview
| Comment: | Updated to reset if signing fails and hope for the best afterwards | 
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive | 
| Timelines: | family | ancestors | descendants | both | trunk | 
| Files: | files | file ages | folders | 
| SHA1: | b6e428f68cc2227efe07eb787c8aad77 | 
| User & Date: | rkeene on 2015-07-23 18:25: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 | |
| 18:24 | Updated KPS certificates check-in: fed23dc867 user: rkeene tags: trunk | |
Changes
Modified cackey.c from [609a23ada9] to [029de9965c].
| ︙ | ︙ | |||
| 1437 1438 1439 1440 1441 1442 1443 1444 1445 1446 1447 1448 1449 1450 | * 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 | > > > | 1437 1438 1439 1440 1441 1442 1443 1444 1445 1446 1447 1448 1449 1450 1451 1452 1453 | * 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 | 
| ︙ | ︙ | |||
| 2984 2985 2986 2987 2988 2989 2990 | 
				CACKEY_DEBUG_PRINTF("Token absent.  Returning TOKENABSENT");
				cackey_mark_slot_reset(slot);
				return(CACKEY_PCSC_E_TOKENABSENT);
			}
 | > > > > | | 2987 2988 2989 2990 2991 2992 2993 2994 2995 2996 2997 2998 2999 3000 3001 3002 3003 3004 3005 | 
				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;
 | 
| ︙ | ︙ |