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

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

     1      1   -----BEGIN CERTIFICATE-----
     2         -MIIEfTCCA2WgAwIBAgICJxAwDQYJKoZIhvcNAQELBQAwgawxCzAJBgNVBAYTAlVT
            2  +MIIEezCCA2OgAwIBAgICJxEwDQYJKoZIhvcNAQELBQAwgawxCzAJBgNVBAYTAlVT
     3      3   MREwDwYDVQQIEwhWaXJnaW5pYTEPMA0GA1UEBxMGUmVzdG9uMSAwHgYDVQQKExdL
     4      4   bmlnaHRQb2ludCBTeXN0ZW1zIExMQzEXMBUGA1UECxMOS25pZ2h0UG9pbnQgSVQx
     5      5   GDAWBgNVBAsTD0tuaWdodFBvaW50IFBLSTEkMCIGA1UEAxMbS25pZ2h0UG9pbnQg
     6      6   U3lzdGVtcyBSb290IENBMB4XDTE1MDEwMTAwMDAwMFoXDTIwMDEwMTAwMDAwMFow
     7      7   gakxCzAJBgNVBAYTAlVTMREwDwYDVQQIEwhWaXJnaW5pYTEPMA0GA1UEBxMGUmVz
     8      8   dG9uMSAwHgYDVQQKExdLbmlnaHRQb2ludCBTeXN0ZW1zIExMQzEXMBUGA1UECxMO
     9      9   S25pZ2h0UG9pbnQgSVQxGDAWBgNVBAsTD0tuaWdodFBvaW50IFBLSTEhMB8GA1UE
    10     10   AxMYS25pZ2h0UG9pbnQgU3lzdGVtcyBDQSAxMIIBIjANBgkqhkiG9w0BAQEFAAOC
    11     11   AQ8AMIIBCgKCAQEAxQdIWZQsGRSFJ/3x5P1G3omvP6Z6Qv8rlrPqInAbPUr4a2TT
    12     12   CPGmJp1IcmjHxPm8Sa2UgmHRn35vVScVr/7Lifgq/vYHcVgVqap3MO/GoAjWuTqN
    13     13   pbaoxSBOpkwnfUBOgpzSSVHNcrGWs/VplrgNYvREOMm1fpe22jprxOzDVH+rD3sP
    14     14   luNkI4lo64vcc6V05d34XGMTafw8eRl8ySKVfhIORZcSp/j++R1CaVdqqR8wM0eY
    15     15   DF4nntTtT6IKktcpVkLGOtH0vXiImMdPEeiXjekiEq/DDrGrVrHqR2vJXIfjUiFX
    16         -luEIQ/TTh9yVA4ExkfGgdkrZrkBRDvvXWjFjHwIDAQABo4GpMIGmMCAGA1UdDgEB
           16  +luEIQ/TTh9yVA4ExkfGgdkrZrkBRDvvXWjFjHwIDAQABo4GnMIGkMCAGA1UdDgEB
    17     17   AAQWBBQ4LgWOLupZrGEOIQCvWkCBLwOTcDASBgNVHRMBAf8ECDAGAQH/AgEBMDcG
    18     18   A1UdHwEBAAQtMCswKaAnoCWGI2h0dHA6Ly9wa2kua25pZ2h0cG9pbnQuY29tL2Ny
    19         -bC9yb290MA8GA1UdDwEB/wQFAwMHhgAwJAYDVR0jAQEABBowGKAWBBQ5k0zyzDhs
    20         -X4G3Lr8tKuBZMyEqnjANBgkqhkiG9w0BAQsFAAOCAQEAT6vuDz9WLADBLII9CJYc
    21         -9N69OOELuDb9E4bAj/93E9S5WpZsa/nMud5kgdLiLSlsD71Pu3lUaDxPi0lOnbI0
    22         -7g3JXNEpOvNSDBnVVD0jPC4nj2XpNFSVue1mpP5bWYHyzbruEjJtoTPzvE0an6Bp
    23         -Cl96uA5MFWyKsgWtwZSnX+Ru05vSLWI7jjcAkGW+atV/iPe0vwtFJR/RiQUKyqsa
    24         -We3Xyw+T0x0UwlpKMhS7d3A+f/4pVtaLtCvLZKYyLAaji+DxlIM4WIPZ0IOD/Xbb
    25         -YagEem5bnPlmugrnGCxovJW2mBKm3iSSvZi0nW2TEVigHaBULItFRrF9J+d+8aG+
    26         -TQ==
           19  +bC9yb290MA8GA1UdDwEB/wQFAwMHhgAwIgYDVR0jAQEABBgwFoAUOZNM8sw4bF+B
           20  +ty6/LSrgWTMhKp4wDQYJKoZIhvcNAQELBQADggEBAHx0X9PkIWLPUlYWOyY1eJZs
           21  +7yPiqNFcnFM4CFCCP+Iirv6SND13DCCUD/XajQR0O9HkeGd2VgezEa7jmSTegWjK
           22  +mv1xMqMxlT9BgrOBweMFl0q1eeYRCO/JKKilNab6x1GS84e81McrCKx0SFVBnYjD
           23  +U9SPBRdNUYCgoQhrXL2uQ5R8Cid4dwdOptkM7XmRyKUM0LZvbCqR2VOzbtztL/UM
           24  +bY8fD/KnPdQe29BtymDU3X6zrGjNyj1Gq/3zKA03RhrPGxZJkvHrf8DkYkhtD5/l
           25  +q7aLkdtHICtte7BS/IaQl7bhCcOlar6Kt8dTPDhZueNy18rZqFJyq65ZW6ktxgw=
    27     26   -----END CERTIFICATE-----
    28     27   

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

     1      1   -----BEGIN CERTIFICATE-----
     2         -MIIERjCCAy6gAwIBAgIGAUvsEnbkMA0GCSqGSIb3DQEBCwUAMIGsMQswCQYDVQQG
     3         -EwJVUzERMA8GA1UECBMIVmlyZ2luaWExDzANBgNVBAcTBlJlc3RvbjEgMB4GA1UE
     4         -ChMXS25pZ2h0UG9pbnQgU3lzdGVtcyBMTEMxFzAVBgNVBAsTDktuaWdodFBvaW50
     5         -IElUMRgwFgYDVQQLEw9LbmlnaHRQb2ludCBQS0kxJDAiBgNVBAMTG0tuaWdodFBv
     6         -aW50IFN5c3RlbXMgUm9vdCBDQTAeFw0xNTAxMDEwMDAwMDBaFw0zNTAxMDEwMDAw
     7         -MDBaMIGsMQswCQYDVQQGEwJVUzERMA8GA1UECBMIVmlyZ2luaWExDzANBgNVBAcT
     8         -BlJlc3RvbjEgMB4GA1UEChMXS25pZ2h0UG9pbnQgU3lzdGVtcyBMTEMxFzAVBgNV
     9         -BAsTDktuaWdodFBvaW50IElUMRgwFgYDVQQLEw9LbmlnaHRQb2ludCBQS0kxJDAi
    10         -BgNVBAMTG0tuaWdodFBvaW50IFN5c3RlbXMgUm9vdCBDQTCCASIwDQYJKoZIhvcN
    11         -AQEBBQADggEPADCCAQoCggEBAMqF1VSV4bYdl5Lq2qtB/KXf/DaNSlTmgjhWAMQT
    12         -1eS9UqiDEDvLHdoTpqCo02/dNDmWpb3GRCt8BIuPaLp/v4xaEStS8feGjlDlBVSv
    13         -vXf4rj7is923okBjjTqz4l25QeDtJAAz4VsNkopo8Fb2wMs8glF5rNnwaQm6PgqN
    14         -8/VF4eHM0fUuq8+WxzXdk9Z50pF9/RM4m4Nj7SeFGxwSWBxvRLjYv6z8k2G1PTnE
    15         -seCeWO3NAcPbxuPcpY8dQDRng22zS3HDW/0+nW1UFLu2UiD0yECWiNPYTah/FKiC
    16         -dp8+JkOqcbyfdu7sA287AXG43rniXA95HNtwRZh1Do5l1f8CAwEAAaNsMGowIAYD
    17         -VR0OAQEABBYEFDmTTPLMOGxfgbcuvy0q4FkzISqeMA8GA1UdEwEB/wQFMAMBAf8w
    18         -DwYDVR0PAQH/BAUDAweEADAkBgNVHSMBAQAEGjAYoBYEFDmTTPLMOGxfgbcuvy0q
    19         -4FkzISqeMA0GCSqGSIb3DQEBCwUAA4IBAQAGn+FTnF6HO8wfQHJG8Ge/6TNflj5t
    20         -92i6JOIx8AAy1ZfC5HWZJWjwEa+kIy5upRm0BE/we4WJKwmMDxPZP4jC6cC9BYE2
    21         -e6sqTThsTUEVI0e41bKBCF6ErHpRlp4EfHfmTNpiSjqBgNCK7kcyeQF0bPnUHO0Q
    22         -TPrY5WUpTnRBR2NnQBvmjl0nLBWDU1+2ib5bskZfnBRCPwVYGa393VmpaBDuIozG
    23         -P0vv2UuLetj5Xa5NDPv5c43s8+Z4pW5EEb2qH0Wfh5/g6qFWVMFVFkk9Jr+qVHf3
    24         -ueZlAL7HchQgaA2f+dY53CdnL7kX4Pv79uSHKzynxSIVMP/d0fdwvwKd
            2  +MIIEQDCCAyigAwIBAgICA+gwDQYJKoZIhvcNAQELBQAwgawxCzAJBgNVBAYTAlVT
            3  +MREwDwYDVQQIEwhWaXJnaW5pYTEPMA0GA1UEBxMGUmVzdG9uMSAwHgYDVQQKExdL
            4  +bmlnaHRQb2ludCBTeXN0ZW1zIExMQzEXMBUGA1UECxMOS25pZ2h0UG9pbnQgSVQx
            5  +GDAWBgNVBAsTD0tuaWdodFBvaW50IFBLSTEkMCIGA1UEAxMbS25pZ2h0UG9pbnQg
            6  +U3lzdGVtcyBSb290IENBMB4XDTE1MDEwMTAwMDAwMFoXDTM1MDEwMTAwMDAwMFow
            7  +gawxCzAJBgNVBAYTAlVTMREwDwYDVQQIEwhWaXJnaW5pYTEPMA0GA1UEBxMGUmVz
            8  +dG9uMSAwHgYDVQQKExdLbmlnaHRQb2ludCBTeXN0ZW1zIExMQzEXMBUGA1UECxMO
            9  +S25pZ2h0UG9pbnQgSVQxGDAWBgNVBAsTD0tuaWdodFBvaW50IFBLSTEkMCIGA1UE
           10  +AxMbS25pZ2h0UG9pbnQgU3lzdGVtcyBSb290IENBMIIBIjANBgkqhkiG9w0BAQEF
           11  +AAOCAQ8AMIIBCgKCAQEAyoXVVJXhth2Xkuraq0H8pd/8No1KVOaCOFYAxBPV5L1S
           12  +qIMQO8sd2hOmoKjTb900OZalvcZEK3wEi49oun+/jFoRK1Lx94aOUOUFVK+9d/iu
           13  +PuKz3beiQGONOrPiXblB4O0kADPhWw2SimjwVvbAyzyCUXms2fBpCbo+Co3z9UXh
           14  +4czR9S6rz5bHNd2T1nnSkX39Ezibg2PtJ4UbHBJYHG9EuNi/rPyTYbU9OcSx4J5Y
           15  +7c0Bw9vG49yljx1ANGeDbbNLccNb/T6dbVQUu7ZSIPTIQJaI09hNqH8UqIJ2nz4m
           16  +Q6pxvJ927uwDbzsBcbjeueJcD3kc23BFmHUOjmXV/wIDAQABo2owaDAgBgNVHQ4B
           17  +AQAEFgQUOZNM8sw4bF+Bty6/LSrgWTMhKp4wDwYDVR0TAQH/BAUwAwEB/zAPBgNV
           18  +HQ8BAf8EBQMDB4QAMCIGA1UdIwEBAAQYMBaAFDmTTPLMOGxfgbcuvy0q4FkzISqe
           19  +MA0GCSqGSIb3DQEBCwUAA4IBAQBKb+Fl5qUlL4sl3ny13dcgulRbkvGkdst6BX6s
           20  +yrNFPukE/k6I63WtVDudQHGkeYlWoRp166pITRzReYql1RN1vpJmycUXXZAYs6rY
           21  +PPz2XywuUfRbxlw7WJDgAsvr6uz8ecxdXrfg+yUI5Ugj1cQmQbJwh1yAUH0puLjA
           22  +10MRL+ZnPmz70wfm9fYMKH0ub3Na/+fL1uM9iJkk3vlqlp/b6CWrPOAyoDUJO10c
           23  +M7DujHmfKGZDYeKOrJF24vbNMRS7pLU1NKgzznvly7yyQIkFpqIQJJEzbbhtVxIF
           24  +BRqV+jD10OOvTMg+sIlcjZq8CMKb9MvTNAWb1/mGHn9ultzf
    25     25   -----END CERTIFICATE-----

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

  1442   1442    *         the response data to be discarded.
  1443   1443    *
  1444   1444    * RETURN VALUE
  1445   1445    *     CACKEY_PCSC_S_OK           On success
  1446   1446    *     CACKEY_PCSC_E_GENERIC      On error
  1447   1447    *     CACKEY_PCSC_E_TOKENABSENT  If the sending failed because the token is
  1448   1448    *                                absent
         1449  + *     CACKEY_PCSC_E_RETRY        If something that looks retry'able went
         1450  + *                                wrong -- try the whole transaction over
         1451  + *                                again
  1449   1452    *
  1450   1453    * NOTES
  1451   1454    *     This function will connect to the PC/SC Connection Manager via
  1452   1455    *     cackey_pcsc_connect() if needed.
  1453   1456    *
  1454   1457    *     It will connect to the card in the reader attached to the slot
  1455   1458    *     specified.  It will reconnect to the card if the connection
................................................................................
  2989   2992   				CACKEY_DEBUG_PRINTF("Token absent.  Returning TOKENABSENT");
  2990   2993   
  2991   2994   				cackey_mark_slot_reset(slot);
  2992   2995   
  2993   2996   				return(CACKEY_PCSC_E_TOKENABSENT);
  2994   2997   			}
  2995   2998   
  2996         -			return(-1);
         2999  +			CACKEY_DEBUG_PRINTF("Something went wrong during signing, resetting the slot and hoping for the best.");
         3000  +
         3001  +			cackey_mark_slot_reset(slot);
         3002  +
         3003  +			return(CACKEY_PCSC_E_GENERIC);
  2997   3004   		}
  2998   3005   
  2999   3006   		tmpbuf += bytes_to_send;
  3000   3007   		tmpbuflen -= bytes_to_send;
  3001   3008   
  3002   3009   		outbuf += tmpoutbuflen;
  3003   3010   		outbuflen -= tmpoutbuflen;