From 71f4976eeea33b7cd2b7493893c292184b7adbfb Mon Sep 17 00:00:00 2001 From: Krzysztof Jackiewicz Date: Wed, 27 Jul 2022 17:03:00 +0200 Subject: [PATCH] [Non-ACR][SecureRepository] Get rid of quickly expiring certificates in tests - Replace third party certificates with manually created ones having long expiration periods. - Keep only intermediate third party certificate for chain creation i and OCSP validation. Also replace it with another one having longer expiration period. - Adjust tests where necessary. Change-Id: I9a4c8aa888adce293e00105975624901bc013ac9 --- .../res/cert-im-for-ocsp-test.pem | 31 --------- .../Tizen.Securerepository.Tests/res/cert-im.pem | 31 +++++++++ .../res/cert-leaf-for-ocsp-test.pem | 74 ---------------------- .../res/test-cert-im.pem | 22 +++++++ .../res/test-cert-leaf.pem | 20 ++++++ .../res/test-cert-root.pem | 22 +++++++ .../support/TestConfig.cs | 28 ++++++-- .../testcase/TSCertificate.cs | 2 +- .../testcase/TSCertificateManager.cs | 62 +++++++++--------- 9 files changed, 149 insertions(+), 143 deletions(-) delete mode 100755 tct-suite-vs/Tizen.Securerepository.Tests/res/cert-im-for-ocsp-test.pem create mode 100644 tct-suite-vs/Tizen.Securerepository.Tests/res/cert-im.pem delete mode 100755 tct-suite-vs/Tizen.Securerepository.Tests/res/cert-leaf-for-ocsp-test.pem create mode 100644 tct-suite-vs/Tizen.Securerepository.Tests/res/test-cert-im.pem create mode 100644 tct-suite-vs/Tizen.Securerepository.Tests/res/test-cert-leaf.pem create mode 100644 tct-suite-vs/Tizen.Securerepository.Tests/res/test-cert-root.pem diff --git a/tct-suite-vs/Tizen.Securerepository.Tests/res/cert-im-for-ocsp-test.pem b/tct-suite-vs/Tizen.Securerepository.Tests/res/cert-im-for-ocsp-test.pem deleted file mode 100755 index 4c2e0ae..0000000 --- a/tct-suite-vs/Tizen.Securerepository.Tests/res/cert-im-for-ocsp-test.pem +++ /dev/null @@ -1,31 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIFWjCCBEKgAwIBAgIQDxSWXyAgaZlP1ceseIlB4jANBgkqhkiG9w0BAQsFADBa -MQswCQYDVQQGEwJJRTESMBAGA1UEChMJQmFsdGltb3JlMRMwEQYDVQQLEwpDeWJl -clRydXN0MSIwIAYDVQQDExlCYWx0aW1vcmUgQ3liZXJUcnVzdCBSb290MB4XDTIw -MDcyMTIzMDAwMFoXDTI0MTAwODA3MDAwMFowTzELMAkGA1UEBhMCVVMxHjAcBgNV -BAoTFU1pY3Jvc29mdCBDb3Jwb3JhdGlvbjEgMB4GA1UEAxMXTWljcm9zb2Z0IFJT -QSBUTFMgQ0EgMDEwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCqYnfP -mmOyBoTzkDb0mfMUUavqlQo7Rgb9EUEf/lsGWMk4bgj8T0RIzTqk970eouKVuL5R -IMW/snBjXXgMQ8ApzWRJCZbar879BV8rKpHoAW4uGJssnNABf2n17j9TiFy6BWy+ -IhVnFILyLNK+W2M3zK9gheiWa2uACKhuvgCca5Vw/OQYErEdG7LBEzFnMzTmJcli -W1iCdXby/vI/OxbfqkKD4zJtm45DJvC9Dh+hpzqvLMiK5uo/+aXSJY+SqhoIEpz+ -rErHw+uAlKuHFtEjSeeku8eR3+Z5ND9BSqc6JtLqb0bjOHPm5dSRrgt4nnil75bj -c9j3lWXpBb9PXP9Sp/nPCK+nTQmZwHGjUnqlO9ebAVQD47ZisFonnDAmjrZNVqEX -F3p7laEHrFMxttYuD81BdOzxAbL9Rb/8MeFGQjE2Qx65qgVfhH+RsYuuD9dUw/3w -ZAhq05yO6nk07AM9c+AbNtRoEcdZcLCHfMDcbkXKNs5DJncCqXAN6LhXVERCw/us -G2MmCMLSIx9/kwt8bwhUmitOXc6fpT7SmFvRAtvxg84wUkg4Y/Gx++0j0z6StSeN -0EJz150jaHG6WV4HUqaWTb98Tm90IgXAU4AW2GBOlzFPiU5IY9jt+eXC2Q6yC/Zp -TL1LAcnL3Qa/OgLrHN0wiw1KFGD51WRPQ0Sh7QIDAQABo4IBJTCCASEwHQYDVR0O -BBYEFLV2DDARzseSQk1Mx1wsyKkM6AtkMB8GA1UdIwQYMBaAFOWdWTCCR1jMrPoI -VDaGezq1BE3wMA4GA1UdDwEB/wQEAwIBhjAdBgNVHSUEFjAUBggrBgEFBQcDAQYI -KwYBBQUHAwIwEgYDVR0TAQH/BAgwBgEB/wIBADA0BggrBgEFBQcBAQQoMCYwJAYI -KwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmRpZ2ljZXJ0LmNvbTA6BgNVHR8EMzAxMC+g -LaArhilodHRwOi8vY3JsMy5kaWdpY2VydC5jb20vT21uaXJvb3QyMDI1LmNybDAq -BgNVHSAEIzAhMAgGBmeBDAECATAIBgZngQwBAgIwCwYJKwYBBAGCNyoBMA0GCSqG -SIb3DQEBCwUAA4IBAQCfK76SZ1vae4qt6P+dTQUO7bYNFUHR5hXcA2D59CJWnEj5 -na7aKzyowKvQupW4yMH9fGNxtsh6iJswRqOOfZYC4/giBO/gNsBvwr8uDW7t1nYo -DYGHPpvnpxCM2mYfQFHq576/TmeYu1RZY29C4w8xYBlkAA8mDJfRhMCmehk7cN5F -JtyWRj2cZj/hOoI45TYDBChXpOlLZKIYiG1giY16vhCRi6zmPzEwv+tk156N6cGS -Vm44jTQ/rs1sa0JSYjzUaYngoFdZC4OfxnIkQvUIA4TOFmPzNPEFdjcZsgbeEz4T -cGHTBPK4R28F44qIMCtHRV55VMX53ev6P3hRddJb ------END CERTIFICATE----- diff --git a/tct-suite-vs/Tizen.Securerepository.Tests/res/cert-im.pem b/tct-suite-vs/Tizen.Securerepository.Tests/res/cert-im.pem new file mode 100644 index 0000000..e5aa681 --- /dev/null +++ b/tct-suite-vs/Tizen.Securerepository.Tests/res/cert-im.pem @@ -0,0 +1,31 @@ +-----BEGIN CERTIFICATE----- +MIIFYjCCBEqgAwIBAgIQd70NbNs2+RrqIQ/E8FjTDTANBgkqhkiG9w0BAQsFADBX +MQswCQYDVQQGEwJCRTEZMBcGA1UEChMQR2xvYmFsU2lnbiBudi1zYTEQMA4GA1UE +CxMHUm9vdCBDQTEbMBkGA1UEAxMSR2xvYmFsU2lnbiBSb290IENBMB4XDTIwMDYx +OTAwMDA0MloXDTI4MDEyODAwMDA0MlowRzELMAkGA1UEBhMCVVMxIjAgBgNVBAoT +GUdvb2dsZSBUcnVzdCBTZXJ2aWNlcyBMTEMxFDASBgNVBAMTC0dUUyBSb290IFIx +MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAthECix7joXebO9y/lD63 +ladAPKH9gvl9MgaCcfb2jH/76Nu8ai6Xl6OMS/kr9rH5zoQdsfnFl97vufKj6bwS +iV6nqlKr+CMny6SxnGPb15l+8Ape62im9MZaRw1NEDPjTrETo8gYbEvs/AmQ351k +KSUjB6G00j0uYODP0gmHu81I8E3CwnqIiru6z1kZ1q+PsAewnjHxgsHA3y6mbWwZ +DrXYfiYaRQM9sHmklCitD38m5agI/pboPGiUU+6DOogrFZYJsuB6jC511pzrp1Zk +j5ZPaK49l8KEj8C8QMALXL32h7M1bKwYUH+E4EzNktMg6TO8UpmvMrUpsyUqtEj5 +cuHKZPfmghCN6J3Cioj6OGaK/GP5Afl4/Xtcd/p2h/rs37EOeZVXtL0m79YB0esW +CruOC7XFxYpVq9Os6pFLKcwZpDIlTirxZUTQAs6qzkm06p98g7BAe+dDq6dso499 +iYH6TKX/1Y7DzkvgtdizjkXPdsDtQCv9Uw+wp9U7DbGKogPeMa3Md+pvez7W35Ei +Eua++tgy/BBjFFFy3l3WFpO9KWgz7zpm7AeKJt8T11dleCfeXkkUAKIAf5qoIbap +sZWwpbkNFhHax2xIPEDgfg1azVY80ZcFuctL7TlLnMQ/0lUTbiSw1nH69MG6zO0b +9f6BQdgAmD06yK56mDcYBZUCAwEAAaOCATgwggE0MA4GA1UdDwEB/wQEAwIBhjAP +BgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBTkrysmcRorSCeFL1JmLO/wiRNxPjAf +BgNVHSMEGDAWgBRge2YaRQ2XyolQL30EzTSo//z9SzBgBggrBgEFBQcBAQRUMFIw +JQYIKwYBBQUHMAGGGWh0dHA6Ly9vY3NwLnBraS5nb29nL2dzcjEwKQYIKwYBBQUH +MAKGHWh0dHA6Ly9wa2kuZ29vZy9nc3IxL2dzcjEuY3J0MDIGA1UdHwQrMCkwJ6Al +oCOGIWh0dHA6Ly9jcmwucGtpLmdvb2cvZ3NyMS9nc3IxLmNybDA7BgNVHSAENDAy +MAgGBmeBDAECATAIBgZngQwBAgIwDQYLKwYBBAHWeQIFAwIwDQYLKwYBBAHWeQIF +AwMwDQYJKoZIhvcNAQELBQADggEBADSkHrEoo9C0dhemMXoh6dFSPsjbdBZBiLg9 +NR3t5P+T4Vxfq7vqfM/b5A3Ri1fyJm9bvhdGaJQ3b2t6yMAYN/olUazsaL+yyEn9 +WprKASOshIArAoyZl+tJaox118fessmXn1hIVw41oeQa1v1vg4Fv74zPl6/AhSrw +9U5pCZEt4Wi4wStz6dTZ/CLANx8LZh1J7QJVj2fhMtfTJr9w4z30Z209fOU0iOMy ++qduBmpvvYuR7hZL6Dupszfnw0Skfths18dG9ZKb59UhvmaSGZRVbNQpsg3BZlvi +d0lIKO2d1xozclOzgjXPYovJJIultzkMu34qQb9Sz/yilrbCgj8= +-----END CERTIFICATE----- \ No newline at end of file diff --git a/tct-suite-vs/Tizen.Securerepository.Tests/res/cert-leaf-for-ocsp-test.pem b/tct-suite-vs/Tizen.Securerepository.Tests/res/cert-leaf-for-ocsp-test.pem deleted file mode 100755 index ae25d50..0000000 --- a/tct-suite-vs/Tizen.Securerepository.Tests/res/cert-leaf-for-ocsp-test.pem +++ /dev/null @@ -1,74 +0,0 @@ ------BEGIN CERTIFICATE----- -MIINWDCCC0CgAwIBAgITEgAtFJyg3q6Puh27sQAAAC0UnDANBgkqhkiG9w0BAQsF -ADBPMQswCQYDVQQGEwJVUzEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9u -MSAwHgYDVQQDExdNaWNyb3NvZnQgUlNBIFRMUyBDQSAwMTAeFw0yMjA2MTAwMTE1 -NDFaFw0yMjEyMTAwMTE1NDFaMBcxFTATBgNVBAMTDHd3dy5iaW5nLmNvbTCCASIw -DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL8sdZYQ+f3lROucTlyDAVTlH2C8 -na0X+Q9IJhKA/J1HmC7WhYbreG54dJvDC5J8dlXs7VcJw4+2zHePozofwQ1MuVz7 -hzCztVoCWAsMkXNQcGzvEFUpI08xTPgkgEQQQrLWd9AoJ8kbkKV2GOQ6fbujj/Bx -80PKC1wLYLn7QHPZiYN/ID/TdE6qaTxOfBCMG2g6b6xep5DTw7/8YwOKb3HK0Hij -/RD0iTaxNQrq4xanBqZvjIpbOM1QaTnGLETMmmsu/HBEYpk24R1X/LvFSbNc3zHy -f5kCfK/zA0kPkqlggmbOW9ZPzQs8CZ9SbJv5fxEpi3UzWUlc286mtGLrZNECAwEA -AaOCCWMwgglfMIIBfAYKKwYBBAHWeQIEAgSCAWwEggFoAWYAdgBGpVXrdfqRIDC1 -oolp9PN9ESxBdL79SbiFq/L8cP5tRwAAAYFLN69wAAAEAwBHMEUCIGTND7bl7y2c -PUBTR4qse7n1J3y3QVHtwxxInN8017dvAiEAzAY98uWMgzsXToG22QuFfgZITqUP -mUDyDR6wjLLxTYYAdQBVgdTCFpA2AUrqC5tXPFPwwOQ4eHAlCBcvo6odBxPTDAAA -AYFLN7B6AAAEAwBGMEQCIGvArKHV/doC367M/K3k+QzrdJkdSzuDF0pXftPau9RP -AiAdGw4rMcThB+ateVyBx1ePL+f6x3fZVi4utU59u+zY2wB1AEHIyrHfIkZKEMah -OglCh15OMYsbA+vrS8do8JBilgb2AAABgUs3r/sAAAQDAEYwRAIgD2JGU3HOI1ub -MmsaOi5wV82K04NdYLrPhbuALtgnsnkCIF2G0Rq8qsABzAlnO6zXbNP4qPXztlF9 -c1kcPGbUn07cMCcGCSsGAQQBgjcVCgQaMBgwCgYIKwYBBQUHAwEwCgYIKwYBBQUH -AwIwPgYJKwYBBAGCNxUHBDEwLwYnKwYBBAGCNxUIh9qGdYPu2QGCyYUbgbWeYYX0 -62CBXYWGjkGHwphQAgFkAgEnMIGHBggrBgEFBQcBAQR7MHkwUwYIKwYBBQUHMAKG -R2h0dHA6Ly93d3cubWljcm9zb2Z0LmNvbS9wa2kvbXNjb3JwL01pY3Jvc29mdCUy -MFJTQSUyMFRMUyUyMENBJTIwMDEuY3J0MCIGCCsGAQUFBzABhhZodHRwOi8vb2Nz -cC5tc29jc3AuY29tMB0GA1UdDgQWBBTPhtbKWKRl7m/t8mbyPQQwi99VOzAOBgNV -HQ8BAf8EBAMCBLAwggVtBgNVHREEggVkMIIFYIIMd3d3LmJpbmcuY29tghBkaWN0 -LmJpbmcuY29tLmNughMqLnBsYXRmb3JtLmJpbmcuY29tggoqLmJpbmcuY29tgghi -aW5nLmNvbYIWaWVvbmxpbmUubWljcm9zb2Z0LmNvbYITKi53aW5kb3dzc2VhcmNo -LmNvbYIZY24uaWVvbmxpbmUubWljcm9zb2Z0LmNvbYIRKi5vcmlnaW4uYmluZy5j -b22CDSoubW0uYmluZy5uZXSCDiouYXBpLmJpbmcuY29tghhlY24uZGV2LnZpcnR1 -YWxlYXJ0aC5uZXSCDSouY24uYmluZy5uZXSCDSouY24uYmluZy5jb22CEHNzbC1h -cGkuYmluZy5jb22CEHNzbC1hcGkuYmluZy5uZXSCDiouYXBpLmJpbmcubmV0gg4q -LmJpbmdhcGlzLmNvbYIPYmluZ3NhbmRib3guY29tghZmZWVkYmFjay5taWNyb3Nv -ZnQuY29tghtpbnNlcnRtZWRpYS5iaW5nLm9mZmljZS5uZXSCDnIuYmF0LmJpbmcu -Y29tghAqLnIuYmF0LmJpbmcuY29tghIqLmRpY3QuYmluZy5jb20uY26CDyouZGlj -dC5iaW5nLmNvbYIOKi5zc2wuYmluZy5jb22CECouYXBwZXguYmluZy5jb22CFiou -cGxhdGZvcm0uY24uYmluZy5jb22CDXdwLm0uYmluZy5jb22CDCoubS5iaW5nLmNv -bYIPZ2xvYmFsLmJpbmcuY29tghF3aW5kb3dzc2VhcmNoLmNvbYIOc2VhcmNoLm1z -bi5jb22CESouYmluZ3NhbmRib3guY29tghkqLmFwaS50aWxlcy5kaXR1LmxpdmUu -Y29tgg8qLmRpdHUubGl2ZS5jb22CGCoudDAudGlsZXMuZGl0dS5saXZlLmNvbYIY -Ki50MS50aWxlcy5kaXR1LmxpdmUuY29tghgqLnQyLnRpbGVzLmRpdHUubGl2ZS5j -b22CGCoudDMudGlsZXMuZGl0dS5saXZlLmNvbYIVKi50aWxlcy5kaXR1LmxpdmUu -Y29tggszZC5saXZlLmNvbYITYXBpLnNlYXJjaC5saXZlLmNvbYIUYmV0YS5zZWFy -Y2gubGl2ZS5jb22CFWNud2ViLnNlYXJjaC5saXZlLmNvbYIMZGV2LmxpdmUuY29t -gg1kaXR1LmxpdmUuY29tghFmYXJlY2FzdC5saXZlLmNvbYIOaW1hZ2UubGl2ZS5j -b22CD2ltYWdlcy5saXZlLmNvbYIRbG9jYWwubGl2ZS5jb20uYXWCFGxvY2Fsc2Vh -cmNoLmxpdmUuY29tghRsczRkLnNlYXJjaC5saXZlLmNvbYINbWFpbC5saXZlLmNv -bYIRbWFwaW5kaWEubGl2ZS5jb22CDmxvY2FsLmxpdmUuY29tgg1tYXBzLmxpdmUu -Y29tghBtYXBzLmxpdmUuY29tLmF1gg9taW5kaWEubGl2ZS5jb22CDW5ld3MubGl2 -ZS5jb22CHG9yaWdpbi5jbndlYi5zZWFyY2gubGl2ZS5jb22CFnByZXZpZXcubG9j -YWwubGl2ZS5jb22CD3NlYXJjaC5saXZlLmNvbYISdGVzdC5tYXBzLmxpdmUuY29t -gg52aWRlby5saXZlLmNvbYIPdmlkZW9zLmxpdmUuY29tghV2aXJ0dWFsZWFydGgu -bGl2ZS5jb22CDHdhcC5saXZlLmNvbYISd2VibWFzdGVyLmxpdmUuY29tghN3ZWJt -YXN0ZXJzLmxpdmUuY29tghV3d3cubG9jYWwubGl2ZS5jb20uYXWCFHd3dy5tYXBz -LmxpdmUuY29tLmF1MIGwBgNVHR8EgagwgaUwgaKggZ+ggZyGTWh0dHA6Ly9tc2Ny -bC5taWNyb3NvZnQuY29tL3BraS9tc2NvcnAvY3JsL01pY3Jvc29mdCUyMFJTQSUy -MFRMUyUyMENBJTIwMDEuY3JshktodHRwOi8vY3JsLm1pY3Jvc29mdC5jb20vcGtp -L21zY29ycC9jcmwvTWljcm9zb2Z0JTIwUlNBJTIwVExTJTIwQ0ElMjAwMS5jcmww -VwYDVR0gBFAwTjBCBgkrBgEEAYI3KgEwNTAzBggrBgEFBQcCARYnaHR0cDovL3d3 -dy5taWNyb3NvZnQuY29tL3BraS9tc2NvcnAvY3BzMAgGBmeBDAECATAfBgNVHSME -GDAWgBS1dgwwEc7HkkJNTMdcLMipDOgLZDAdBgNVHSUEFjAUBggrBgEFBQcDAQYI -KwYBBQUHAwIwDQYJKoZIhvcNAQELBQADggIBAB26QQoY9CP1wxr34qQBIURTkqNv -FPnC9cIWilX/mHoF1Br1UoZMMmiCqueSeqfWRzCJvgmX3LI0mwwuHK6v1+aCLtNA -ZTmMBDta0bHECngcv3OYsCsLq721HMx41jghii4MU6AbAa/lfp4HTYwa+3/F5S9c -nV2iRDU5b5dAa4sVCagzAqYrZ6lqRA4ZqBtf0dbjdHAY39qeC7qFsZXm45IsDcwL -1TvCfDaUMwT0QxVNSfqRyX1YtygcfEqhQ6Ixe9uEO8I0PrULK/Nv1/ljV7B//YpJ -1Y/8LUKLVZf5/hUWniF1dk5ieCudGaMJrMKEb+phBpGi4/rIiLmtcu5vhXs0Surb -+5BaCdDv6DCPbs54MzAqDbPtvq4QhdxZJqF9GSgppdkeG71jduoWGf6//myU0FL8 -mQo7e0AQRXpI73bgm22ltnv1hv5dVxCcow4dwsyO1y+wTm54slnUIbnz5Q/ersm+ -A46ArbcRRvmp86hwZlflq7Ck4c53RXAncWUW7bkAMmdYFpDBRkMh/VsCt9pV6LcZ -CwibBdeCW4u530hJSeQ7IUkru7cqInzPgJaWA4Rd5Z8ZmKySR9LFi3E+wGL7d9bC -ck1o2m9gskB4yaxNivRn6XAo8dF2bsHxVmqwpzbdQ2BXECzJ9WwxrThRJXZo9BOR -WneHWxrOCzK3NWzJ ------END CERTIFICATE----- diff --git a/tct-suite-vs/Tizen.Securerepository.Tests/res/test-cert-im.pem b/tct-suite-vs/Tizen.Securerepository.Tests/res/test-cert-im.pem new file mode 100644 index 0000000..5c36e89 --- /dev/null +++ b/tct-suite-vs/Tizen.Securerepository.Tests/res/test-cert-im.pem @@ -0,0 +1,22 @@ +-----BEGIN CERTIFICATE----- +MIIDljCCAn6gAwIBAgICEAAwDQYJKoZIhvcNAQEFBQAwZjELMAkGA1UEBhMCQVUx +EzARBgNVBAgMClNvbWUtU3RhdGUxDTALBgNVBAoMBEFDTUUxEDAOBgNVBAsMB1Rl +c3RpbmcxITAfBgNVBAMMGFRlc3Qgcm9vdCBjYSBjZXJ0aWZpY2F0ZTAeFw0xNTAx +MTYxNjQ1MzRaFw0zNTAxMTExNjQ1MzRaMGQxCzAJBgNVBAYTAkFVMRMwEQYDVQQI +DApTb21lLVN0YXRlMQ0wCwYDVQQKDARBQ01FMRAwDgYDVQQLDAdUZXN0aW5nMR8w +HQYDVQQDDBZUZXN0IElNIENBIGNlcnRpZmljYXRlMIIBIjANBgkqhkiG9w0BAQEF +AAOCAQ8AMIIBCgKCAQEAzmBF78qClgoKfnLAncMXZwZ14TW+5kags1+QCYeg3c7j +L9+RvDxIaX2tKf1sukJcwQfYqUlQkwt+58LMOb2ORtkpj8Or6WCWCZ0BzneT8ug7 +nxJT4m9+bohMF0JoKjjB2H4KNMHamLIwUxRKt6nyfk81kVhJOi2vzzxd+UCPi6Pc +UAbJNH48eNgOIg55nyFovVzYj8GIo/9GvHJj83PPa/KlJZ+Z1qZASZZ/VYorplVT +thsHXKfejhFy5YJ9t7n/vyAQsyBsagZsvX19xnH41fbYXHKf8UbXG23rNaZlchs6 +XJVLQdzOpj3WTj/lCocVHqLaZISLhNQ3aI7kUBUdiwIDAQABo1AwTjAdBgNVHQ4E +FgQUoCYNaCBP4jl/3SYQuK8Ka+6i3QEwHwYDVR0jBBgwFoAUt6pkzFt1PZlfYRL/ +HGnufF4frdwwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAjRzWiD97 +Htv4Kxpm3P+C+xP9AEteCJfO+7p8MWgtWEJOknJyt55zeKS2JwZIq57KcbqD8U7v +vAUx1ymtUhlFPFd7J1mJ3pou+3aFYmGShYhGHpbrmUwjp7HVP588jrW1NoZVHdMc +4OgJWFrViXeu9+maIcekjMB/+9Y0dUgQuK5ZuT5H/Jwet7Th/o9uufTUZjBzRvrB +pbXgQpqgME2av4Q/6LuldPCTHLtWXgFUU2R+yCGmuGilvhFJnKoQryAbYnIQNWE8 +SLoHQ9s1i7Zyb7HU6UAaqMOz15LBkyAqtNyJcO2p7Q/p5YK0xfD4xisI5qXucqVm +F2obL5qJSTN/RQ== +-----END CERTIFICATE----- \ No newline at end of file diff --git a/tct-suite-vs/Tizen.Securerepository.Tests/res/test-cert-leaf.pem b/tct-suite-vs/Tizen.Securerepository.Tests/res/test-cert-leaf.pem new file mode 100644 index 0000000..e78e449 --- /dev/null +++ b/tct-suite-vs/Tizen.Securerepository.Tests/res/test-cert-leaf.pem @@ -0,0 +1,20 @@ +-----BEGIN CERTIFICATE----- +MIIDOzCCAiMCAQEwDQYJKoZIhvcNAQEFBQAwZDELMAkGA1UEBhMCQVUxEzARBgNV +BAgMClNvbWUtU3RhdGUxDTALBgNVBAoMBEFDTUUxEDAOBgNVBAsMB1Rlc3Rpbmcx +HzAdBgNVBAMMFlRlc3QgSU0gQ0EgY2VydGlmaWNhdGUwHhcNMTUwMTE2MTY0ODE0 +WhcNMzUwMTExMTY0ODE0WjBjMQswCQYDVQQGEwJBVTETMBEGA1UECAwKU29tZS1T +dGF0ZTENMAsGA1UECgwEQUNNRTEQMA4GA1UECwwHVGVzdGluZzEeMBwGA1UEAwwV +VGVzdCBsZWFmIGNlcnRpZmljYXRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB +CgKCAQEAzTdDIa2tDmRxFnIgiG+mBz8GoSVODs0ImNQGbqj+pLhBOFRH8fsah4Jl +z5YF9KwhMVLknnHGFLE/Nb7Ac35kEzhMQMpTRxohW83oxw3eZ8zN/FBoKqg4qHRq +QR8kS10YXTgrBR0ex/Vp+OUKEw6h7yL2r4Tpvrn9/qHwsxtLxqWbDIVf1O9b1Lfc +bllYMdmV5E62yN5tcwrDP8gvHjFnVeLzrG8wTpc9FR90/0Jkfp5jAJcArOBLrT0E +4VRqs+4HuwT8jAwFAmNnc7IYX5qSjtSWkmmHe73K/lzB+OiI0JEc/3eWUTWqwTSk +4tNCiQGBKJ39LXPTBBJdzmxVH7CUDQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQAp +UdDOGu3hNiG+Vn10aQ6B1ZmOj3t+45gUV3sC+y8hB8EK1g4P5Ke9bVDts0T5eOnj +CSc+6VoND5O4adI0IFFRFljHNVnvjeosHfUZNnowsmA2ptQBtC1g5ZKRvKXlkC5/ +i5BGgRqPFA7y9WB9Y05MrJHf3E+Oz/RBsLeeNiNN+rF5X1vYExvGHpo0M0zS0ze9 +HtC0aOy8ocsTrQkf3ceHTAXx2i8ftoSSD4klojtWFpWMrNQa52F7wB9nU6FfKRuF +Zj/T1JkYXKkEwZU6nAR2jdZp3EP9xj3o15V/tyFcXHx6l8NTxn4cJb+Xe4VquQJz +6ON7PVe0ABN/AlwVQiFE +-----END CERTIFICATE----- \ No newline at end of file diff --git a/tct-suite-vs/Tizen.Securerepository.Tests/res/test-cert-root.pem b/tct-suite-vs/Tizen.Securerepository.Tests/res/test-cert-root.pem new file mode 100644 index 0000000..d6e1e80 --- /dev/null +++ b/tct-suite-vs/Tizen.Securerepository.Tests/res/test-cert-root.pem @@ -0,0 +1,22 @@ +-----BEGIN CERTIFICATE----- +MIIDnzCCAoegAwIBAgIJAMH/ADkC5YSTMA0GCSqGSIb3DQEBBQUAMGYxCzAJBgNV +BAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMQ0wCwYDVQQKDARBQ01FMRAwDgYD +VQQLDAdUZXN0aW5nMSEwHwYDVQQDDBhUZXN0IHJvb3QgY2EgY2VydGlmaWNhdGUw +HhcNMTQxMjMwMTcyMTUyWhcNMjQxMjI3MTcyMTUyWjBmMQswCQYDVQQGEwJBVTET +MBEGA1UECAwKU29tZS1TdGF0ZTENMAsGA1UECgwEQUNNRTEQMA4GA1UECwwHVGVz +dGluZzEhMB8GA1UEAwwYVGVzdCByb290IGNhIGNlcnRpZmljYXRlMIIBIjANBgkq +hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0EJRdUtd2th0vTVF7QxvDKzyFCF3w9vC +9IDE/Yr12w+a9jd0s7/eG96qTHIYffS3B7x2MB+d4n+SR3W0qmYh7xk8qfEgH3da +eDoV59IZ9r543KM+g8jm6KffYGX1bIJVVY5OhBRbO9nY6byYpd5kbCIUB6dCf7/W +rQl1aIdLGFIegAzPGFPXDcU6F192686x54bxt/itMX4agHJ9ZC/rrTBIZghVsjJo +5/AH5WZpasv8sfrGiiohAxtieoYoJkv5MOYP4/2lPlOY+Cgw1Yoz+HHv31AllgFs +BquBb/kJVmCCNsAOcnvQzTZUsW/TXz9G2nwRdqI1nSy2JvVjZGsqGQIDAQABo1Aw +TjAdBgNVHQ4EFgQUt6pkzFt1PZlfYRL/HGnufF4frdwwHwYDVR0jBBgwFoAUt6pk +zFt1PZlfYRL/HGnufF4frdwwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOC +AQEAld7Qwq0cdzDQ51w1RVLwTR8Oy25PB3rzwEHcSGJmdqlMi3xOdaz80S1R1BBX +ldvGBG5Tn0vT7xSuhmSgI2/HnBpy9ocHVOmhtNB4473NieEpfTYrnGXrFxu46Wus +9m/ZnugcQ2G6C54A/NFtvgLmaC8uH8M7gKdS6uYUwJFQEofkjmd4UpOYSqmcRXhS +Jzd5FYFWkJhKJYp3nlENSOD8CUFFVGekm05nFN2gRVc/qaqQkEX77+XYvhodLRsV +qMn7nf7taidDKLO2T4bhujztnTYOhhaXKgPy7AtZ28N2wvX96VyAPB/vrchGmyBK +kOg11TpPdNDkhb1J4ZCh2gupDg== +-----END CERTIFICATE----- \ No newline at end of file diff --git a/tct-suite-vs/Tizen.Securerepository.Tests/support/TestConfig.cs b/tct-suite-vs/Tizen.Securerepository.Tests/support/TestConfig.cs index 49aa66f..453294c 100755 --- a/tct-suite-vs/Tizen.Securerepository.Tests/support/TestConfig.cs +++ b/tct-suite-vs/Tizen.Securerepository.Tests/support/TestConfig.cs @@ -23,8 +23,10 @@ namespace Tizen.Security.SecureRepository.Tests private static TestConfig _instance = null; private static readonly object _padlock = new Object(); - private string _cert_leaf; private string _cert_im; + private string _test_cert_leaf; + private string _test_cert_im; + private string _test_cert_root; private string _cert_invalid; private string _pkcs12; private string _pkcs12_invalid; @@ -33,8 +35,10 @@ namespace Tizen.Security.SecureRepository.Tests { string resourcePath = application.DirectoryInfo.Resource; - _cert_leaf = resourcePath + "cert-leaf-for-ocsp-test.pem"; - _cert_im = resourcePath + "cert-im-for-ocsp-test.pem"; + _cert_im = resourcePath + "cert-im.pem"; + _test_cert_leaf = resourcePath + "test-cert-leaf.pem"; + _test_cert_im = resourcePath + "test-cert-im.pem"; + _test_cert_root = resourcePath + "test-cert-root.pem"; _cert_invalid = resourcePath + "invalid-cert.pem"; _pkcs12 = resourcePath + "pkcs12.p12"; _pkcs12_invalid = resourcePath + "invalid-pkcs12.p12"; @@ -53,14 +57,24 @@ namespace Tizen.Security.SecureRepository.Tests } } - public string CertLeafPath + public string CertIntermediatePath { - get { return _cert_leaf; } + get { return _cert_im; } } - public string CertIntermediatePath + public string TestCertLeafPath { - get { return _cert_im; } + get { return _test_cert_leaf; } + } + + public string TestCertIntermediatePath + { + get { return _test_cert_im; } + } + + public string TestCertRootPath + { + get { return _test_cert_root; } } public string CertInvalidPath diff --git a/tct-suite-vs/Tizen.Securerepository.Tests/testcase/TSCertificate.cs b/tct-suite-vs/Tizen.Securerepository.Tests/testcase/TSCertificate.cs index 8a7db60..69fb91d 100755 --- a/tct-suite-vs/Tizen.Securerepository.Tests/testcase/TSCertificate.cs +++ b/tct-suite-vs/Tizen.Securerepository.Tests/testcase/TSCertificate.cs @@ -24,7 +24,7 @@ namespace Tizen.Security.SecureRepository.Tests [Description("Tizen.Security.SecureRepository.Certificate Tests")] public class CertificateTests { - private static string _certPath = TestUtils.TestConfig.CertLeafPath; + private static string _certPath = TestUtils.TestConfig.CertIntermediatePath; protected static Certificate LoadDefaultCert() { diff --git a/tct-suite-vs/Tizen.Securerepository.Tests/testcase/TSCertificateManager.cs b/tct-suite-vs/Tizen.Securerepository.Tests/testcase/TSCertificateManager.cs index 9c5bf91..a68eb16 100755 --- a/tct-suite-vs/Tizen.Securerepository.Tests/testcase/TSCertificateManager.cs +++ b/tct-suite-vs/Tizen.Securerepository.Tests/testcase/TSCertificateManager.cs @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016 Samsung Electronics Co., Ltd All Rights Reserved + * Copyright (c) 2016 - 2021 Samsung Electronics Co., Ltd All Rights Reserved * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -31,8 +31,10 @@ namespace Tizen.Security.SecureRepository.Tests { private static string[] _aliases = {"C#API_CERT_TEST", "C#API_CERT_TEST2"}; private string _alias = _aliases[0]; - private string _certPath = TestUtils.TestConfig.CertLeafPath; - private string _certIntermediatePath = TestUtils.TestConfig.CertIntermediatePath; + private string _certPath = TestUtils.TestConfig.CertIntermediatePath; + private string _testCertLeafPath = TestUtils.TestConfig.TestCertLeafPath; + private string _testCertImPath = TestUtils.TestConfig.TestCertIntermediatePath; + private string _testCertRootPath = TestUtils.TestConfig.TestCertRootPath; [Test] [Category("P1")] @@ -274,7 +276,7 @@ namespace Tizen.Security.SecureRepository.Tests [Test] [Category("P1")] - [Description("Verifies and generate a certficate chain from a leaf certificate and an intermediate CA certificate and returns that chain")] + [Description("Verifies and generates a certficate chain from a leaf certificate and returns that chain")] [Property("SPEC", "Tizen.Security.SecureRepository.CertificateManager.GetCertificateChain M")] [Property("SPEC_URL", "-")] [Property("CRITERIA", "MR")] @@ -287,18 +289,15 @@ namespace Tizen.Security.SecureRepository.Tests * 1. Load certificates to make chain */ var certLeaf = Certificate.Load(_certPath); - var certIntermediate = Certificate.Load(_certIntermediatePath); - var untrustedCerts = new List(); - untrustedCerts.Add(certIntermediate); /* TEST CODE */ - var retval = CertificateManager.GetCertificateChain(certLeaf, untrustedCerts); + var retval = CertificateManager.GetCertificateChain(certLeaf, null); int size = 0; var enumerator = retval.GetEnumerator(); while (enumerator.MoveNext()) ++size; - Assert.True(size == 3, "Invalid certificate chain size!"); + Assert.True(size == 2, "Invalid certificate chain size!"); } [Test] @@ -330,7 +329,7 @@ namespace Tizen.Security.SecureRepository.Tests * PRECONDITION * 1. Load certificates to make chain */ - var certLeaf = Certificate.Load(_certPath); + var certLeaf = Certificate.Load(_testCertLeafPath); /* TEST CODE */ Assert.Throws(delegate { @@ -352,14 +351,17 @@ namespace Tizen.Security.SecureRepository.Tests * PRECONDITION * 1. Load certificates to make chain */ - var certLeaf = Certificate.Load(_certPath); - var certIntermediate = Certificate.Load(_certIntermediatePath); + var certLeaf = Certificate.Load(_testCertLeafPath); + var certIntermediate = Certificate.Load(_testCertImPath); var untrustedCerts = new List(); untrustedCerts.Add(certIntermediate); + var certRoot = Certificate.Load(_testCertRootPath); + var trustedCerts = new List(); + trustedCerts.Add(certRoot); /* TEST CODE */ var retval = CertificateManager.GetCertificateChain( - certLeaf, untrustedCerts, null, true); + certLeaf, untrustedCerts, trustedCerts, false); int size = 0; var enumerator = retval.GetEnumerator(); while (enumerator.MoveNext()) @@ -382,17 +384,20 @@ namespace Tizen.Security.SecureRepository.Tests * PRECONDITION * 1. Load valid leaf certificate * 2. Load valid untrusted certificates + * 3. Load valid trusted certificates */ - var certLeaf = Certificate.Load(_certPath); + var certLeaf = Certificate.Load(_testCertLeafPath); var untrustedCerts = new List(); - untrustedCerts.Add(Certificate.Load(_certIntermediatePath)); + untrustedCerts.Add(Certificate.Load(_testCertImPath)); + var trustedCerts = new List(); + trustedCerts.Add(Certificate.Load(_testCertRootPath)); /* TEST CODE */ Assert.Throws(delegate { - CertificateManager.GetCertificateChain(certLeaf, null, null, true); + CertificateManager.GetCertificateChain(certLeaf, null, trustedCerts, false); }); Assert.Throws(delegate { - CertificateManager.GetCertificateChain(null, untrustedCerts, null, true); + CertificateManager.GetCertificateChain(null, untrustedCerts, trustedCerts, false); }); } @@ -410,19 +415,21 @@ namespace Tizen.Security.SecureRepository.Tests * PRECONDITION * 1. Load certificates to make chain */ - var certLeaf = Certificate.Load(_certPath); + var certLeaf = Certificate.Load(_testCertLeafPath); var untrustedCerts = new List(); - untrustedCerts.Add(Certificate.Load(_certIntermediatePath)); + untrustedCerts.Add(Certificate.Load(_testCertImPath)); + var trustedCerts = new List(); + trustedCerts.Add(Certificate.Load(_testCertRootPath)); /* TEST CODE */ Assert.Throws(delegate { CertificateManager.GetCertificateChain( - certLeaf, new List(), null, true); + certLeaf, new List(), trustedCerts, false); }); Assert.Throws(delegate { CertificateManager.GetCertificateChain( new Certificate(Util.GenerateRandom(2048), DataFormat.Pem), - untrustedCerts, null, true); + untrustedCerts, null, false); }); } @@ -438,21 +445,16 @@ namespace Tizen.Security.SecureRepository.Tests /* * PRECONDITION * 1. Load leaf certificate to check OCSP - * 2. Load intermediate certificate to make chain - * 3. Make chain + * 2. Make chain */ - var certLeaf = Certificate.Load(_certPath); - var certIntermediate = Certificate.Load(_certIntermediatePath); - var untrustedCerts = new List(); - untrustedCerts.Add(certIntermediate); + var cert = Certificate.Load(_certPath); - var retval = CertificateManager.GetCertificateChain( - certLeaf, untrustedCerts, null, true); + var retval = CertificateManager.GetCertificateChain(cert, null, null, true); int size = 0; var enumerator = retval.GetEnumerator(); while (enumerator.MoveNext()) ++size; - Assert.True(size == 3, "Invalid certificate chain size!"); + Assert.True(size == 2, "Invalid certificate chain size!"); /* TEST CODE */ var status = CertificateManager.CheckOcsp(retval); -- 2.7.4