Overview
| Comment: | Merged in trunk |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | reader-filtering |
| Files: | files | file ages | folders |
| SHA1: |
4092b10f67c8e3d4d9d1de533a8a6b29 |
| User & Date: | rkeene on 2015-07-23 18:27:36 |
| Other Links: | branch diff | 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
Modified build/certs/commercial/kps-ca-1.crt from [cdf1ee5afa] to [3f6ab6e991].
1 | -----BEGIN CERTIFICATE----- | | | | | | | | | | < | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 | -----BEGIN CERTIFICATE----- MIIEezCCA2OgAwIBAgICJxEwDQYJKoZIhvcNAQELBQAwgawxCzAJBgNVBAYTAlVT MREwDwYDVQQIEwhWaXJnaW5pYTEPMA0GA1UEBxMGUmVzdG9uMSAwHgYDVQQKExdL bmlnaHRQb2ludCBTeXN0ZW1zIExMQzEXMBUGA1UECxMOS25pZ2h0UG9pbnQgSVQx GDAWBgNVBAsTD0tuaWdodFBvaW50IFBLSTEkMCIGA1UEAxMbS25pZ2h0UG9pbnQg U3lzdGVtcyBSb290IENBMB4XDTE1MDEwMTAwMDAwMFoXDTIwMDEwMTAwMDAwMFow gakxCzAJBgNVBAYTAlVTMREwDwYDVQQIEwhWaXJnaW5pYTEPMA0GA1UEBxMGUmVz dG9uMSAwHgYDVQQKExdLbmlnaHRQb2ludCBTeXN0ZW1zIExMQzEXMBUGA1UECxMO S25pZ2h0UG9pbnQgSVQxGDAWBgNVBAsTD0tuaWdodFBvaW50IFBLSTEhMB8GA1UE AxMYS25pZ2h0UG9pbnQgU3lzdGVtcyBDQSAxMIIBIjANBgkqhkiG9w0BAQEFAAOC AQ8AMIIBCgKCAQEAxQdIWZQsGRSFJ/3x5P1G3omvP6Z6Qv8rlrPqInAbPUr4a2TT CPGmJp1IcmjHxPm8Sa2UgmHRn35vVScVr/7Lifgq/vYHcVgVqap3MO/GoAjWuTqN pbaoxSBOpkwnfUBOgpzSSVHNcrGWs/VplrgNYvREOMm1fpe22jprxOzDVH+rD3sP luNkI4lo64vcc6V05d34XGMTafw8eRl8ySKVfhIORZcSp/j++R1CaVdqqR8wM0eY DF4nntTtT6IKktcpVkLGOtH0vXiImMdPEeiXjekiEq/DDrGrVrHqR2vJXIfjUiFX luEIQ/TTh9yVA4ExkfGgdkrZrkBRDvvXWjFjHwIDAQABo4GnMIGkMCAGA1UdDgEB AAQWBBQ4LgWOLupZrGEOIQCvWkCBLwOTcDASBgNVHRMBAf8ECDAGAQH/AgEBMDcG A1UdHwEBAAQtMCswKaAnoCWGI2h0dHA6Ly9wa2kua25pZ2h0cG9pbnQuY29tL2Ny bC9yb290MA8GA1UdDwEB/wQFAwMHhgAwIgYDVR0jAQEABBgwFoAUOZNM8sw4bF+B ty6/LSrgWTMhKp4wDQYJKoZIhvcNAQELBQADggEBAHx0X9PkIWLPUlYWOyY1eJZs 7yPiqNFcnFM4CFCCP+Iirv6SND13DCCUD/XajQR0O9HkeGd2VgezEa7jmSTegWjK mv1xMqMxlT9BgrOBweMFl0q1eeYRCO/JKKilNab6x1GS84e81McrCKx0SFVBnYjD U9SPBRdNUYCgoQhrXL2uQ5R8Cid4dwdOptkM7XmRyKUM0LZvbCqR2VOzbtztL/UM bY8fD/KnPdQe29BtymDU3X6zrGjNyj1Gq/3zKA03RhrPGxZJkvHrf8DkYkhtD5/l q7aLkdtHICtte7BS/IaQl7bhCcOlar6Kt8dTPDhZueNy18rZqFJyq65ZW6ktxgw= -----END CERTIFICATE----- |
Added build/certs/commercial/kps-root-ca-crl.crt version [71b6a2e103].
> > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 | -----BEGIN CERTIFICATE----- MIIEbjCCA1agAwIBAgICB9AwDQYJKoZIhvcNAQELBQAwgawxCzAJBgNVBAYTAlVT MREwDwYDVQQIEwhWaXJnaW5pYTEPMA0GA1UEBxMGUmVzdG9uMSAwHgYDVQQKExdL bmlnaHRQb2ludCBTeXN0ZW1zIExMQzEXMBUGA1UECxMOS25pZ2h0UG9pbnQgSVQx GDAWBgNVBAsTD0tuaWdodFBvaW50IFBLSTEkMCIGA1UEAxMbS25pZ2h0UG9pbnQg U3lzdGVtcyBSb290IENBMB4XDTE1MDEwMTAwMDAwMFoXDTM1MDEwMTAwMDAwMFow gawxCzAJBgNVBAYTAlVTMREwDwYDVQQIEwhWaXJnaW5pYTEPMA0GA1UEBxMGUmVz dG9uMSAwHgYDVQQKExdLbmlnaHRQb2ludCBTeXN0ZW1zIExMQzEXMBUGA1UECxMO S25pZ2h0UG9pbnQgSVQxGDAWBgNVBAsTD0tuaWdodFBvaW50IFBLSTEkMCIGA1UE AxMbS25pZ2h0UG9pbnQgU3lzdGVtcyBSb290IENBMIIBIjANBgkqhkiG9w0BAQEF AAOCAQ8AMIIBCgKCAQEAxCweWY/eRfRiWGzB5zPiuZg5X3r+WmkQZllRVQ2N/gxP S2TRLvuJGpvy3T/NdhT/Kkd0DZXz4C4fBd2w26d2bEhl+cVWNJo+fQSZgowbt9gA Yh1pf21Hkq2Qux/yOXFghNXykETcrRigcJVXIuSaNMCNpnVLb+nkOkh9xBaZXqCG KinKhgeUE9kq06hBPz36l2ds3x5ymjYxipffeIjIeam8P/BaVtFFsxD9wPov4G8N z88lcJb7znWfgYlC/t4lJGaWvMg7OCSOwe2kCWQkPjG0avIH3HACGapEm4m/7n9q jSqR0sJMw/it14t6Z2XUPdPjJ+ptf5xOEoW9d5TBvwIDAQABo4GXMIGUMBIGCSsG AQUFBzABBQEBAAQCBQAwIAYDVR0OAQEABBYEFKPVbX6Njigl8loa5aYmAHMmjoWG MA8GA1UdDwEB/wQFAwMHAgAwDwYDVR0TAQEABAUwAwEB/zAWBgNVHSUBAQAEDDAK BggrBgEFBQcDCTAiBgNVHSMBAQAEGDAWgBQ5k0zyzDhsX4G3Lr8tKuBZMyEqnjAN BgkqhkiG9w0BAQsFAAOCAQEAA492XT48XfUtOgsvHrHNJ1gpanjsheziskuOyhpP bIzmwXYlaiYNiYm0NjZ3Y+rLW26gYUTCmFUPNkVibxC9RsqxBUMlyg33XL+2Qd1p CUvhS9uRcwUJnn5ujNKpWZnUWE1/b3iVlGqeUaO4hhPtbA+i0PJ1Eocd1SLR7L6k ZH4aOB/lgAR8vLHvgViiA9FzxprAJKG1nRl3VEosjkLY4z4ukDGP/lw/VypoxNkT 4ftWay1IuGUeG5bBoANd/9Xdcs1dxVGmUi95r4PU7RS39DsG8A09Fi2QZCu/JpbM pFR+x1zxLo31oth4bxE0C4mUSlU6oyV4ULFNoQoFrHN6Dg== -----END CERTIFICATE----- |
Modified build/certs/commercial/kps-root-ca.crt from [b0a7a486e8] to [2a0d3d9c74].
1 | -----BEGIN CERTIFICATE----- | | | | | | | < | | > | | | | | | > | < | | | | | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 | -----BEGIN CERTIFICATE----- MIIEQDCCAyigAwIBAgICA+gwDQYJKoZIhvcNAQELBQAwgawxCzAJBgNVBAYTAlVT MREwDwYDVQQIEwhWaXJnaW5pYTEPMA0GA1UEBxMGUmVzdG9uMSAwHgYDVQQKExdL bmlnaHRQb2ludCBTeXN0ZW1zIExMQzEXMBUGA1UECxMOS25pZ2h0UG9pbnQgSVQx GDAWBgNVBAsTD0tuaWdodFBvaW50IFBLSTEkMCIGA1UEAxMbS25pZ2h0UG9pbnQg U3lzdGVtcyBSb290IENBMB4XDTE1MDEwMTAwMDAwMFoXDTM1MDEwMTAwMDAwMFow gawxCzAJBgNVBAYTAlVTMREwDwYDVQQIEwhWaXJnaW5pYTEPMA0GA1UEBxMGUmVz dG9uMSAwHgYDVQQKExdLbmlnaHRQb2ludCBTeXN0ZW1zIExMQzEXMBUGA1UECxMO S25pZ2h0UG9pbnQgSVQxGDAWBgNVBAsTD0tuaWdodFBvaW50IFBLSTEkMCIGA1UE AxMbS25pZ2h0UG9pbnQgU3lzdGVtcyBSb290IENBMIIBIjANBgkqhkiG9w0BAQEF AAOCAQ8AMIIBCgKCAQEAyoXVVJXhth2Xkuraq0H8pd/8No1KVOaCOFYAxBPV5L1S qIMQO8sd2hOmoKjTb900OZalvcZEK3wEi49oun+/jFoRK1Lx94aOUOUFVK+9d/iu PuKz3beiQGONOrPiXblB4O0kADPhWw2SimjwVvbAyzyCUXms2fBpCbo+Co3z9UXh 4czR9S6rz5bHNd2T1nnSkX39Ezibg2PtJ4UbHBJYHG9EuNi/rPyTYbU9OcSx4J5Y 7c0Bw9vG49yljx1ANGeDbbNLccNb/T6dbVQUu7ZSIPTIQJaI09hNqH8UqIJ2nz4m Q6pxvJ927uwDbzsBcbjeueJcD3kc23BFmHUOjmXV/wIDAQABo2owaDAgBgNVHQ4B AQAEFgQUOZNM8sw4bF+Bty6/LSrgWTMhKp4wDwYDVR0TAQH/BAUwAwEB/zAPBgNV HQ8BAf8EBQMDB4QAMCIGA1UdIwEBAAQYMBaAFDmTTPLMOGxfgbcuvy0q4FkzISqe MA0GCSqGSIb3DQEBCwUAA4IBAQBKb+Fl5qUlL4sl3ny13dcgulRbkvGkdst6BX6s yrNFPukE/k6I63WtVDudQHGkeYlWoRp166pITRzReYql1RN1vpJmycUXXZAYs6rY PPz2XywuUfRbxlw7WJDgAsvr6uz8ecxdXrfg+yUI5Ugj1cQmQbJwh1yAUH0puLjA 10MRL+ZnPmz70wfm9fYMKH0ub3Na/+fL1uM9iJkk3vlqlp/b6CWrPOAyoDUJO10c M7DujHmfKGZDYeKOrJF24vbNMRS7pLU1NKgzznvly7yyQIkFpqIQJJEzbbhtVxIF BRqV+jD10OOvTMg+sIlcjZq8CMKb9MvTNAWb1/mGHn9ultzf -----END CERTIFICATE----- |
Modified cackey.c from [fd4f0feee5] to [0922233e4d].
| ︙ | ︙ | |||
1442 1443 1444 1445 1446 1447 1448 1449 1450 1451 1452 1453 1454 1455 | * 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 | > > > | 1442 1443 1444 1445 1446 1447 1448 1449 1450 1451 1452 1453 1454 1455 1456 1457 1458 | * 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 |
| ︙ | ︙ | |||
2989 2990 2991 2992 2993 2994 2995 |
CACKEY_DEBUG_PRINTF("Token absent. Returning TOKENABSENT");
cackey_mark_slot_reset(slot);
return(CACKEY_PCSC_E_TOKENABSENT);
}
| > > > > | | 2992 2993 2994 2995 2996 2997 2998 2999 3000 3001 3002 3003 3004 3005 3006 3007 3008 3009 3010 |
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;
|
| ︙ | ︙ |