From 3259ab99df8d8746a46ca7469635751f604e42fc Mon Sep 17 00:00:00 2001 From: Andrew Shadura Date: Wed, 25 Apr 2018 15:38:01 +0200 Subject: New upstream version 3.10.4+ds1 --- etc/certs/ESTEID-SK 2015.crt | 37 +++++++++++++++++++++++++++++++++++++ etc/certs/TEST ESTEID-SK 2015.crt | 37 +++++++++++++++++++++++++++++++++++++ etc/digidoc.conf.cmake | 34 ++++++++++++++++++++-------------- 3 files changed, 94 insertions(+), 14 deletions(-) create mode 100644 etc/certs/ESTEID-SK 2015.crt create mode 100644 etc/certs/TEST ESTEID-SK 2015.crt (limited to 'etc') diff --git a/etc/certs/ESTEID-SK 2015.crt b/etc/certs/ESTEID-SK 2015.crt new file mode 100644 index 0000000..8038a89 --- /dev/null +++ b/etc/certs/ESTEID-SK 2015.crt @@ -0,0 +1,37 @@ +-----BEGIN CERTIFICATE----- +MIIGcDCCBVigAwIBAgIQRUgJC4ec7yFWcqzT3mwbWzANBgkqhkiG9w0BAQwFADB1 +MQswCQYDVQQGEwJFRTEiMCAGA1UECgwZQVMgU2VydGlmaXRzZWVyaW1pc2tlc2t1 +czEoMCYGA1UEAwwfRUUgQ2VydGlmaWNhdGlvbiBDZW50cmUgUm9vdCBDQTEYMBYG +CSqGSIb3DQEJARYJcGtpQHNrLmVlMCAXDTE1MTIxNzEyMzg0M1oYDzIwMzAxMjE3 +MjM1OTU5WjBjMQswCQYDVQQGEwJFRTEiMCAGA1UECgwZQVMgU2VydGlmaXRzZWVy +aW1pc2tlc2t1czEXMBUGA1UEYQwOTlRSRUUtMTA3NDcwMTMxFzAVBgNVBAMMDkVT +VEVJRC1TSyAyMDE1MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA0oH6 +1NDxbdW9k8nLA1qGaL4B7vydod2Ewp/STBZB3wEtIJCLdkpEsS8pXfFiRqwDVsgG +Gbu+Q99trlb5LI7yi7rIkRov5NftBdSNPSU5rAhYPQhvZZQgOwRaHa5Ey+BaLJHm +LqYQS9hQvQsCYyws+xVvNFUpK0pGD64iycqdMuBl/nWq3fLuZppwBh0VFltm4nhr +/1S0R9TRJpqFUGbGr4OK/DwebQ5PjhdS40gCUNwmC7fPQ4vIH+x+TCk2aG+u3MoA +z0IrpVWqiwzG/vxreuPPAkgXeFCeYf6fXLsGz4WivsZFbph2pMjELu6sltlBXfAG +3fGv43t91VXicyzR/eT5dsB+zFsW1sHV+1ONPr+qzgDxCH2cmuqoZNfIIq+buob3 +eA8ee+XpJKJQr+1qGrmhggjvAhc7m6cU4x/QfxwRYhIVNhJf+sKVThkQhbJ9XxuK +k3c18wymwL1mpDD0PIGJqlssMeiuJ4IzagFbgESGNDUd4icm0hQT8CmQeUm1GbWe +BYseqPhMQX97QFBLXJLVy2SCyoAz7Bq1qA43++EcibN+yBc1nQs2Zoq8ck9MK0bC +xDMeUkQUz6VeQGp69ImOQrsw46qTz0mtdQrMSbnkXCuLan5dPm284J9HmaqiYi6j +6KLcZ2NkUnDQFesBVlMEm+fHa2iR6lnAFYZ06UECAwEAAaOCAgowggIGMB8GA1Ud +IwQYMBaAFBLyWj7qVhy/zQas8fElyalL1BSZMB0GA1UdDgQWBBSzq4i8mdVipIUq +CM20HXI7g3JHUTAOBgNVHQ8BAf8EBAMCAQYwdwYDVR0gBHAwbjAIBgYEAI96AQIw +CQYHBACL7EABAjAwBgkrBgEEAc4fAQEwIzAhBggrBgEFBQcCARYVaHR0cHM6Ly93 +d3cuc2suZWUvQ1BTMAsGCSsGAQQBzh8BAjALBgkrBgEEAc4fAQMwCwYJKwYBBAHO +HwEEMBIGA1UdEwEB/wQIMAYBAf8CAQAwQQYDVR0eBDowOKE2MASCAiIiMAqHCAAA +AAAAAAAAMCKHIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMCcGA1Ud +JQQgMB4GCCsGAQUFBwMJBggrBgEFBQcDAgYIKwYBBQUHAwQwfAYIKwYBBQUHAQEE +cDBuMCAGCCsGAQUFBzABhhRodHRwOi8vb2NzcC5zay5lZS9DQTBKBggrBgEFBQcw +AoY+aHR0cDovL3d3dy5zay5lZS9jZXJ0cy9FRV9DZXJ0aWZpY2F0aW9uX0NlbnRy +ZV9Sb290X0NBLmRlci5jcnQwPQYDVR0fBDYwNDAyoDCgLoYsaHR0cDovL3d3dy5z +ay5lZS9yZXBvc2l0b3J5L2NybHMvZWVjY3JjYS5jcmwwDQYJKoZIhvcNAQEMBQAD +ggEBAHRWDGI3P00r2sOnlvLHKk9eE7X93eT+4e5TeaQsOpE5zQRUTtshxN8Bnx2T +oQ9rgi18q+MwXm2f0mrGakYYG0bix7ZgDQvCMD/kuRYmwLGdfsTXwh8KuL6uSHF+ +U/ZTss6qG7mxCHG9YvebkN5Yj/rYRvZ9/uJ9rieByxw4wo7b19p22PXkAkXP5y3+ +qK/Oet98lqwI97kJhiS2zxFYRk+dXbazmoVHnozYKmsZaSUvoYNNH19tpS7BLdsg +i9KpbvQLb5ywIMq9ut3+b2Xvzq8yzmHMFtLIJ6Afu1jJpqD82BUAFcvi5vhnP8M7 +b974R18WCOpgNQvXDI+2/8ZINeU= +-----END CERTIFICATE----- diff --git a/etc/certs/TEST ESTEID-SK 2015.crt b/etc/certs/TEST ESTEID-SK 2015.crt new file mode 100644 index 0000000..bd666aa --- /dev/null +++ b/etc/certs/TEST ESTEID-SK 2015.crt @@ -0,0 +1,37 @@ +-----BEGIN CERTIFICATE----- +MIIGgzCCBWugAwIBAgIQEDb9gCZi4PdWc7IoNVIbsTANBgkqhkiG9w0BAQwFADB9 +MQswCQYDVQQGEwJFRTEiMCAGA1UECgwZQVMgU2VydGlmaXRzZWVyaW1pc2tlc2t1 +czEwMC4GA1UEAwwnVEVTVCBvZiBFRSBDZXJ0aWZpY2F0aW9uIENlbnRyZSBSb290 +IENBMRgwFgYJKoZIhvcNAQkBFglwa2lAc2suZWUwIBcNMTUxMjE4MDcxMzQ0WhgP +MjAzMDEyMTcyMzU5NTlaMGsxCzAJBgNVBAYTAkVFMSIwIAYDVQQKDBlBUyBTZXJ0 +aWZpdHNlZXJpbWlza2Vza3VzMRcwFQYDVQRhDA5OVFJFRS0xMDc0NzAxMzEfMB0G +A1UEAwwWVEVTVCBvZiBFU1RFSUQtU0sgMjAxNTCCAiIwDQYJKoZIhvcNAQEBBQAD +ggIPADCCAgoCggIBAMTeAFvLxmAeaOsRKaf+hlkOhW+CdEilmUIKWs+qCWVq+w8E +8PA/TohAZdUcO4KFXothmPDmfOCb0ExXcnOPCr2NndavzB39htlyYKYxkOkZi3pL +z8bZg/HvpBoy8KIg0sYdbhVPYHf6i7fuJjDac4zN1vKdVQXA6Tv5wS/e90/ZyF95 +5vycxdNLticdozm5yCDMNgsEji6QNA1zIi3+C2YmnDXx6VyxhuC2R3q0xNkwtJ4e +zs1RZGxWokTNPzQc3ilGhEJlVsS8vP624hUHwufQnwrKWpc3+D+plMIO0j3E+hmh +46gIadDRweFR/dzb+CIBHRaFh0LEBjd/cDFQlBI+E8vpkhqeWp6rp1xwnhCL201M +3E1E1Mw+51Xqj7WOfY0TzjOmQJy8WJPEwU2m44KxW1SnpeEBVkgb4XYFeQHAllc7 +J7JDv50BoIPpecgaqn1vKR7l//wDsL0MN1tDlBhl3x7TJ/fwMnwB1E3zVZR74TUZ +h5J49CAcFrfM4RmP/0hcDW8+4wNWMg2Qgst2qmPZmHCI/OJt5yMt0Ud5yPF8AWxV +ot3TxOBGjMiM8m6WsksFsQxp5WtA0DANGXIIfydTaTV16Mg+KpYVqFKxkvFBmfVp +6xApMaFl3dY/m56O9JHEqFpBDF+uDQIMjFJxJ4Pt7Mdk40zfL4PSw9Qco2T3AgMB +AAGjggINMIICCTAfBgNVHSMEGDAWgBS1NAqdpS8QxechDr7EsWVHGwN2/jAdBgNV +HQ4EFgQUScDyRDll1ZtGOw04YIOx1i0ohqYwDgYDVR0PAQH/BAQDAgEGMGYGA1Ud +IARfMF0wMQYKKwYBBAHOHwMBATAjMCEGCCsGAQUFBwIBFhVodHRwczovL3d3dy5z +ay5lZS9DUFMwDAYKKwYBBAHOHwMBAjAMBgorBgEEAc4fAwEDMAwGCisGAQQBzh8D +AQQwEgYDVR0TAQH/BAgwBgEB/wIBADBBBgNVHR4EOjA4oTYwBIICIiIwCocIAAAA +AAAAAAAwIocgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwJwYDVR0l +BCAwHgYIKwYBBQUHAwkGCCsGAQUFBwMCBggrBgEFBQcDBDCBiQYIKwYBBQUHAQEE +fTB7MCUGCCsGAQUFBzABhhlodHRwOi8vZGVtby5zay5lZS9jYV9vY3NwMFIGCCsG +AQUFBzAChkZodHRwOi8vd3d3LnNrLmVlL2NlcnRzL1RFU1Rfb2ZfRUVfQ2VydGlm +aWNhdGlvbl9DZW50cmVfUm9vdF9DQS5kZXIuY3J0MEMGA1UdHwQ8MDowOKA2oDSG +Mmh0dHBzOi8vd3d3LnNrLmVlL3JlcG9zaXRvcnkvY3Jscy90ZXN0X2VlY2NyY2Eu +Y3JsMA0GCSqGSIb3DQEBDAUAA4IBAQDBOYTpbbQuoJKAmtDPpAomDd9mKZCarIPx +AH8UXphSndMqOmIUA4oQMrLcZ6a0rMyCFR8x4NX7abc8T81cvgUAWjfNFn8+bi6+ +DgbjhYY+wZ010MHHdUo2xPajfog8cDWJPkmz+9PAdyjzhb1eYoEnm5D6o4hZQCiR +yPnOKp7LZcpsVz1IFXsqP7M5WgHk0SqY1vs+Yhu7zWPSNYFIzNNXGoUtfKhhkHiR +WFX/wdzr3fqeaQ3gs/PyD53YuJXRzFrktgJJoJWnHEYIhEwbai9+OeKr4L4kTkxv +PKTyjjpLKcjUk0Y0cxg7BuzwevonyBtL72b/FVs6XsXJJqCa3W4T +-----END CERTIFICATE----- diff --git a/etc/digidoc.conf.cmake b/etc/digidoc.conf.cmake index b2076a9..a36d65b 100644 --- a/etc/digidoc.conf.cmake +++ b/etc/digidoc.conf.cmake @@ -5,7 +5,7 @@ [ca] CA_CERT_PATH=@CMAKE_INSTALL_FULL_DATADIR@/libdigidoc -CA_CERTS=17 +CA_CERTS=18 CA_CERT_1=JUUR-SK.crt CA_CERT_1_CN=Juur-SK @@ -30,20 +30,22 @@ CA_CERT_10=ESTEID-SK 2011.crt CA_CERT_10_CN=ESTEID-SK 2011 CA_CERT_11=EID-SK 2011.crt CA_CERT_11_CN=EID-SK 2011 +CA_CERT_12=ESTEID-SK 2015.crt +CA_CERT_12_CN=ESTEID-SK 2015 -CA_CERT_12=TEST Juur-SK.crt -CA_CERT_12_CN=TEST Juur-SK -CA_CERT_13=TEST-SK.crt -CA_CERT_13_CN=TEST-SK +CA_CERT_13=TEST Juur-SK.crt +CA_CERT_13_CN=TEST Juur-SK +CA_CERT_14=TEST-SK.crt +CA_CERT_14_CN=TEST-SK -CA_CERT_14=TEST EECCRCA.crt -CA_CERT_14_CN=TEST of EE Certification Centre Root CA -CA_CERT_15=TEST ESTEID-SK 2011.crt -CA_CERT_15_CN=TEST of ESTEID-SK 2011 -CA_CERT_16=TEST EID-SK 2011.crt -CA_CERT_16_CN=TEST of EID-SK 2011 -CA_CERT_17=TEST KLASS3 2010.crt -CA_CERT_17_CN=TEST of KLASS3-SK 2010 +CA_CERT_15=TEST EECCRCA.crt +CA_CERT_15_CN=TEST of EE Certification Centre Root CA +CA_CERT_16=TEST ESTEID-SK 2011.crt +CA_CERT_16_CN=TEST of ESTEID-SK 2011 +CA_CERT_17=TEST EID-SK 2011.crt +CA_CERT_17_CN=TEST of EID-SK 2011 +CA_CERT_18=TEST KLASS3 2010.crt +CA_CERT_18_CN=TEST of KLASS3-SK 2010 @@ -60,7 +62,7 @@ SIGN_OCSP=0 USE_PROXY=0 DIGIDOC_OCSP_URL=http://ocsp.sk.ee -DIGIDOC_OCSP_RESPONDER_CERTS=24 +DIGIDOC_OCSP_RESPONDER_CERTS=25 DIGIDOC_OCSP_RESPONDER_CERT_1=TEST-SK OCSP 2005.crt DIGIDOC_OCSP_RESPONDER_CERT_1_CN=TEST-SK OCSP RESPONDER 2005 @@ -170,3 +172,7 @@ DIGIDOC_OCSP_RESPONDER_CERT_24=SK OCSP 2011.crt DIGIDOC_OCSP_RESPONDER_CERT_24_CN=SK OCSP RESPONDER 2011 DIGIDOC_OCSP_RESPONDER_CERT_24_CA=VRK CA for Qualified Certificates DIGIDOC_OCSP_RESPONDER_CERT_24_URL=http://ocsp.sk.ee/_proxy + +DIGIDOC_OCSP_RESPONDER_CERT_25=SK OCSP 2011.crt +DIGIDOC_OCSP_RESPONDER_CERT_25_CN=SK OCSP RESPONDER 2011 +DIGIDOC_OCSP_RESPONDER_CERT_25_CA=ESTEID-SK 2015 -- cgit v1.2.3