Fix tests

Change-Id: I5183918ae55974d58715a945703e2e9f1f45f0ca

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f5b5c8e..002ba42 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,6 +23,7 @@ SET(CMAKE_SKIP_RPATH          "TRUE")
 ADD_DEFINITIONS("-Wall")
 ADD_DEFINITIONS("-Wextra")
 ADD_DEFINITIONS("-Werror")
+ADD_DEFINITIONS("-Wno-deprecated-declarations")
 
 SET(TARGET_VCORE_LIB "cert-svc-vcore")
 SET(TARGET_CERT_SERVER "cert-server")

diff --git a/tests/pkcs12/new_test_cases.cpp b/tests/pkcs12/new_test_cases.cpp
index 6004125..495efe5 100644 (file)
--- a/tests/pkcs12/new_test_cases.cpp
+++ b/tests/pkcs12/new_test_cases.cpp
@@ -84,7 +84,7 @@ RUNNER_TEST(CERTSVC_PKCS12_1002_certsvc_set_cert_to_disabled_and_get_status_for_
        CertStatus status = ENABLED;
        int result;
        CREATE_INSTANCE
-       CertSvcString Alias = wrapper_certsvc_string_new("24ad0b63.0");
+       CertSvcString Alias = wrapper_certsvc_string_new("9c8dfbd4.0");
        result = certsvc_pkcs12_get_certificate_status_from_store(instance, SYSTEM_STORE, Alias, &status);
        RUNNER_ASSERT_MSG(result == CERTSVC_SUCCESS, "Get certificate status from system store failed.");
 

diff --git a/tests/vcore/test-common.cpp b/tests/vcore/test-common.cpp
index 5ed98d4..8e4d0a9 100644 (file)
--- a/tests/vcore/test-common.cpp
+++ b/tests/vcore/test-common.cpp
@@ -49,119 +49,91 @@ const std::string TestData::tpk_sdk_sample_path[3] = {
        std::string(TESTAPP_RES_DIR) + "apps/tpk-sdk-sample/mediaContent",
        std::string(TESTAPP_RES_DIR) + "apps/tpk-sdk-sample/player"};
 
-// BING, signed by Microsoft IT TLS CA 2, expires 30 Apr 2021
+// bing.com, signed by Microsoft RSA TLS CA 01, expires 15 Nov 2023
 const std::string TestData::certEE =
-       "MIIN+jCCC+KgAwIBAgITIAAGDxuOsc5CY0aDQgAAAAYPGzANBgkqhkiG9w0BAQsF"
-       "ADCBizELMAkGA1UEBhMCVVMxEzARBgNVBAgTCldhc2hpbmd0b24xEDAOBgNVBAcT"
-       "B1JlZG1vbmQxHjAcBgNVBAoTFU1pY3Jvc29mdCBDb3Jwb3JhdGlvbjEVMBMGA1UE"
-       "CxMMTWljcm9zb2Z0IElUMR4wHAYDVQQDExVNaWNyb3NvZnQgSVQgVExTIENBIDIw"
-       "HhcNMTkwNDMwMjA0ODAwWhcNMjEwNDMwMjA0ODAwWjAXMRUwEwYDVQQDEwx3d3cu"
-       "YmluZy5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDhIlPb0iP7"
-       "xRmUScK43QI7Ci/lvfMumWhRFAHcFzjIDHs74sq0B+ze8HW5PR6LWRe/d3yR5dC8"
-       "7gQs0qXGitzsP9vWJcpwKV273tlnWiEfgZx5tvNCFdHOqoYoHL3a8zed/JkGTEeX"
-       "ukGEX0TeBgCjcVTj5qRxJhjlWxs3AcB/q4f4vi3QG80TbSU2UO0lkvhvfs73C1jq"
-       "i7Zspia/YsMqcQ6X+APAZ+4guKjQr5q32tzj2FGtJO6ZmZuNV9Wwb32891UhwZ3D"
-       "2PrIcnCNlIQ1/Fah6im7Vc67qO2x/++r7gO7PtR8byCFnFuNUVQxhSIkCkj6FvPx"
-       "cYefok0wJ0VRAgMBAAGjggnIMIIJxDCCAfQGCisGAQQB1nkCBAIEggHkBIIB4AHe"
-       "AHUA7ku9t3XOYLrhQmkfq+GeZqMPfl+wctiDAMR7iXqo/csAAAFqcApGzAAABAMA"
-       "RjBEAiAiASIs5j19VcTLbxcOGHQlIl62d3iy1FY8dnNq+6lebQIgchbSq2Qh78zs"
-       "mmucyslucBycij/FYUe3F1lNpJiB9KsAdgBVgdTCFpA2AUrqC5tXPFPwwOQ4eHAl"
-       "CBcvo6odBxPTDAAAAWpwCkgDAAAEAwBHMEUCIQDx6RqcvDdfIY9qdAuaRFBVvSHN"
-       "ttpAzie3KP9AAiGvBwIgSMvjse/hJusDoRFnSTtX96ierTaqzQH4oDLLnW/Gwc0A"
-       "dQBc3EOS/uarRUSxXprUVuYQN/vV+kfcoXOUsl7m9scOygAAAWpwCkbmAAAEAwBG"
-       "MEQCICbYF6Lv93BFrwLguzmas/5gQ87fzRHkTaMxDSD7PlhRAiA/DXOeTcHaiUPQ"
-       "WsKbJ/7x9EWKvVisqtQMnYk6cBxbBwB2AESUZS6w7s6vxEAH2Kj+KMDa5oK+2Msx"
-       "tT/TM5a1toGoAAABanAKRtoAAAQDAEcwRQIgardRfR7bxwSGF212a603dXYz6O5z"
-       "YHpPks8/RR/AMzQCIQD4VYDD+2zVDHEjz8elkKEzhgzTdOMtc1yYhCU+eHAGkjAn"
-       "BgkrBgEEAYI3FQoEGjAYMAoGCCsGAQUFBwMCMAoGCCsGAQUFBwMBMD4GCSsGAQQB"
-       "gjcVBwQxMC8GJysGAQQBgjcVCIfahnWD7tkBgsmFG4G1nmGF9OtggV2E0t9CgueT"
-       "egIBZAIBHTCBhQYIKwYBBQUHAQEEeTB3MFEGCCsGAQUFBzAChkVodHRwOi8vd3d3"
-       "Lm1pY3Jvc29mdC5jb20vcGtpL21zY29ycC9NaWNyb3NvZnQlMjBJVCUyMFRMUyUy"
-       "MENBJTIwMi5jcnQwIgYIKwYBBQUHMAGGFmh0dHA6Ly9vY3NwLm1zb2NzcC5jb20w"
-       "HQYDVR0OBBYEFDcHtZt8HkKSRO8ETiTkCLixB9PaMAsGA1UdDwQEAwIEsDCCBW0G"
-       "A1UdEQSCBWQwggVgggx3d3cuYmluZy5jb22CEGRpY3QuYmluZy5jb20uY26CEyou"
-       "cGxhdGZvcm0uYmluZy5jb22CCiouYmluZy5jb22CCGJpbmcuY29tghZpZW9ubGlu"
-       "ZS5taWNyb3NvZnQuY29tghMqLndpbmRvd3NzZWFyY2guY29tghljbi5pZW9ubGlu"
-       "ZS5taWNyb3NvZnQuY29tghEqLm9yaWdpbi5iaW5nLmNvbYINKi5tbS5iaW5nLm5l"
-       "dIIOKi5hcGkuYmluZy5jb22CGGVjbi5kZXYudmlydHVhbGVhcnRoLm5ldIINKi5j"
-       "bi5iaW5nLm5ldIINKi5jbi5iaW5nLmNvbYIQc3NsLWFwaS5iaW5nLmNvbYIQc3Ns"
-       "LWFwaS5iaW5nLm5ldIIOKi5hcGkuYmluZy5uZXSCDiouYmluZ2FwaXMuY29tgg9i"
-       "aW5nc2FuZGJveC5jb22CFmZlZWRiYWNrLm1pY3Jvc29mdC5jb22CG2luc2VydG1l"
-       "ZGlhLmJpbmcub2ZmaWNlLm5ldIIOci5iYXQuYmluZy5jb22CECouci5iYXQuYmlu"
-       "Zy5jb22CEiouZGljdC5iaW5nLmNvbS5jboIPKi5kaWN0LmJpbmcuY29tgg4qLnNz"
-       "bC5iaW5nLmNvbYIQKi5hcHBleC5iaW5nLmNvbYIWKi5wbGF0Zm9ybS5jbi5iaW5n"
-       "LmNvbYINd3AubS5iaW5nLmNvbYIMKi5tLmJpbmcuY29tgg9nbG9iYWwuYmluZy5j"
-       "b22CEXdpbmRvd3NzZWFyY2guY29tgg5zZWFyY2gubXNuLmNvbYIRKi5iaW5nc2Fu"
-       "ZGJveC5jb22CGSouYXBpLnRpbGVzLmRpdHUubGl2ZS5jb22CDyouZGl0dS5saXZl"
-       "LmNvbYIYKi50MC50aWxlcy5kaXR1LmxpdmUuY29tghgqLnQxLnRpbGVzLmRpdHUu"
-       "bGl2ZS5jb22CGCoudDIudGlsZXMuZGl0dS5saXZlLmNvbYIYKi50My50aWxlcy5k"
-       "aXR1LmxpdmUuY29tghUqLnRpbGVzLmRpdHUubGl2ZS5jb22CCzNkLmxpdmUuY29t"
-       "ghNhcGkuc2VhcmNoLmxpdmUuY29tghRiZXRhLnNlYXJjaC5saXZlLmNvbYIVY253"
-       "ZWIuc2VhcmNoLmxpdmUuY29tggxkZXYubGl2ZS5jb22CDWRpdHUubGl2ZS5jb22C"
-       "EWZhcmVjYXN0LmxpdmUuY29tgg5pbWFnZS5saXZlLmNvbYIPaW1hZ2VzLmxpdmUu"
-       "Y29tghFsb2NhbC5saXZlLmNvbS5hdYIUbG9jYWxzZWFyY2gubGl2ZS5jb22CFGxz"
-       "NGQuc2VhcmNoLmxpdmUuY29tgg1tYWlsLmxpdmUuY29tghFtYXBpbmRpYS5saXZl"
-       "LmNvbYIObG9jYWwubGl2ZS5jb22CDW1hcHMubGl2ZS5jb22CEG1hcHMubGl2ZS5j"
-       "b20uYXWCD21pbmRpYS5saXZlLmNvbYINbmV3cy5saXZlLmNvbYIcb3JpZ2luLmNu"
-       "d2ViLnNlYXJjaC5saXZlLmNvbYIWcHJldmlldy5sb2NhbC5saXZlLmNvbYIPc2Vh"
-       "cmNoLmxpdmUuY29tghJ0ZXN0Lm1hcHMubGl2ZS5jb22CDnZpZGVvLmxpdmUuY29t"
-       "gg92aWRlb3MubGl2ZS5jb22CFXZpcnR1YWxlYXJ0aC5saXZlLmNvbYIMd2FwLmxp"
-       "dmUuY29tghJ3ZWJtYXN0ZXIubGl2ZS5jb22CE3dlYm1hc3RlcnMubGl2ZS5jb22C"
-       "FXd3dy5sb2NhbC5saXZlLmNvbS5hdYIUd3d3Lm1hcHMubGl2ZS5jb20uYXUwgawG"
-       "A1UdHwSBpDCBoTCBnqCBm6CBmIZLaHR0cDovL21zY3JsLm1pY3Jvc29mdC5jb20v"
-       "cGtpL21zY29ycC9jcmwvTWljcm9zb2Z0JTIwSVQlMjBUTFMlMjBDQSUyMDIuY3Js"
-       "hklodHRwOi8vY3JsLm1pY3Jvc29mdC5jb20vcGtpL21zY29ycC9jcmwvTWljcm9z"
-       "b2Z0JTIwSVQlMjBUTFMlMjBDQSUyMDIuY3JsME0GA1UdIARGMEQwQgYJKwYBBAGC"
-       "NyoBMDUwMwYIKwYBBQUHAgEWJ2h0dHA6Ly93d3cubWljcm9zb2Z0LmNvbS9wa2kv"
-       "bXNjb3JwL2NwczAfBgNVHSMEGDAWgBSRnjtEbD1XnEJ3KjTXT9HMSpcs2jAdBgNV"
-       "HSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDQYJKoZIhvcNAQELBQADggIBAA1g"
-       "NJF5ks5Qrg0/qeOXQbcO3SCs+HKTKxVL8QdaTL3s5gsmWQzcYNS671DmN4lEob2g"
-       "WWZKyKAzQbjDOcf9ndxX4+i+PaCw5K3uONbMOwnuOCwRvDy8YEoCb3OzKFX4sjzh"
-       "1HVL/ljKHUPT+9ap/SpYserNxixibqF2LZYx+9hwr1bcx9GWrg3CoFUFgSZqRQ14"
-       "eiK94iM5kzJLKynKPhez+UOwS5VRev1mxh5nD9hBPzXHHqI9mNWu/lyr7KPUMigi"
-       "QfKKZuqV6W3i1H3BoJi1uDkL3SJo1F39XN3AyGSAZWS9RNn5JzEQQGiJRjrz/PE1"
-       "vTg1BlbsPdKa4gGZGdGBWcj2eXZc+GbLpTy3qWlmJrEn2KGLeomyndlftRPFrBUH"
-       "/5Mio5OeSawjlacBV25fKaoZ1BPc3i+HGKd5ctddCy6kJsgdMD221zGvf/0uW25Z"
-       "ImzDeH7KkOcGbzyWJwBzDgra0RP+qRgK3aYPSWI81OLlnHJ2VOix/UU63NCK2fO/"
-       "URzE8KxoHrgRGXCE52viHv6ksL7QXWelbERU7GEpcZU1suPhDohn4CrfrCYCjpa5"
-       "Ys6ci7Rren82SsXJBfNrgm2U4lxWfzWj+2Ay6yATbdoOPntue8cbbMoTzoNMHQXD"
-       "2DpjtFPs8/RVOFQb0IFVluCrTAnHmI8tTtsmzg6z";
+       "MIIJGTCCBwGgAwIBAgITEgAxQ0VlMES59RTscQAAADFDRTANBgkqhkiG9w0BAQsF"
+       "ADBPMQswCQYDVQQGEwJVUzEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9u"
+       "MSAwHgYDVQQDExdNaWNyb3NvZnQgUlNBIFRMUyBDQSAwMTAeFw0yMjExMTUyMDE2"
+       "MzhaFw0yMzExMTUyMDE2MzhaMGExCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJXQTEQ"
+       "MA4GA1UEBxMHUmVkbW9uZDEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9u"
+       "MRMwEQYDVQQDEwpyLmJpbmcuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB"
+       "CgKCAQEAvzvBoCT8A/rooZzeDm7yJ9PdB5c4ZE54P4q+R5ZaY3l9+UH7wkD/AMgx"
+       "5RUwpCg3JlZaSrl5kjp6xvjmhvy08v/mp0Jw80zG33lQ8DOk16VYBwpoSBy2Pn6E"
+       "6bhDYHGFybPzpKlKxiJHSYuiAF+05FfUk/jBmXFMkmsDlm5Fwq1y6/da4K0bJImC"
+       "msWDPDZrf3A8fu9lQeNRv3tbvrknOCGKaQ15iHxRpHhvMDxfX4/ba/ztw23wMExv"
+       "YKdAkUHQUMygbZE/vSBQhPtqqHFc+IY9sKpJ35oa4lfklnzgxlACogTmytJsrhry"
+       "lDeTp9bBAQwV2T7enHwoy1jdFaaJQwIDAQABo4IE2jCCBNYwggF+BgorBgEEAdZ5"
+       "AgQCBIIBbgSCAWoBaAB1AOg+0No+9QY1MudXKLyJa8kD08vREWvs62nhd31tBr1u"
+       "AAABhHz5BCoAAAQDAEYwRAIgTDH4xbzeE641O31H3wgjEfWbEhEKOfppCp+tYA3i"
+       "1CgCIF2TX3NmpCL3XEYDtbBv1ryuIA3cPGhgzynDWAdMiY5wAHYAVYHUwhaQNgFK"
+       "6gubVzxT8MDkOHhwJQgXL6OqHQcT0wwAAAGEfPkEXwAABAMARzBFAiEA3ao53zxV"
+       "/geztebynoFndOYoZiKOf0rSsa/PAEAsczcCIEOtGgNpraLTEJhe1OYbnuAo9Rak"
+       "eAbFPfjJdALwgGWVAHcAejKMVNi3LbYg6jjgUh7phBZwMhOFTTvSK8E6V6NS61IA"
+       "AAGEfPkC5AAABAMASDBGAiEAzov/r1LY9ELiZbJ2690S3ujq3gzpJ3Sxi6VN58gF"
+       "jH4CIQCG8bsL4aIfW3vB+o6mNl2xB9/cPEMbmFgUPBU8Lyr9uzAnBgkrBgEEAYI3"
+       "FQoEGjAYMAoGCCsGAQUFBwMCMAoGCCsGAQUFBwMBMD0GCSsGAQQBgjcVBwQwMC4G"
+       "JisGAQQBgjcVCIfahnWD7tkBgsmFG4G1nmGF9OtggV25+BCGkdB4AgFkAgElMIGH"
+       "BggrBgEFBQcBAQR7MHkwUwYIKwYBBQUHMAKGR2h0dHA6Ly93d3cubWljcm9zb2Z0"
+       "LmNvbS9wa2kvbXNjb3JwL01pY3Jvc29mdCUyMFJTQSUyMFRMUyUyMENBJTIwMDEu"
+       "Y3J0MCIGCCsGAQUFBzABhhZodHRwOi8vb2NzcC5tc29jc3AuY29tMB0GA1UdDgQW"
+       "BBSukOod1pztVw1Lx47hPotC/higDTAOBgNVHQ8BAf8EBAMCBLAwgeQGA1UdEQSB"
+       "3DCB2YIKci5iaW5nLmNvbYIUdGhha2EubXNmdHN0YXRpYy5jb22CDnRoYWthLmJp"
+       "bmcuY29tghF0aC5tc2Z0c3RhdGljLmNvbYILdGguYmluZy5jb22CE3Jha2EubXNm"
+       "dHN0YXRpYy5jb22CDXJha2EuYmluZy5jb22CEHIubXNmdHN0YXRpYy5jb22CDWFr"
+       "YW0uYmluZy5jb22CDSoubW0uYmluZy5uZXSCEyouZXhwbGljaXQuYmluZy5uZXSC"
+       "ECouYmluZ3N0YXRpYy5jb22CCiouYmluZy5jb20wgbAGA1UdHwSBqDCBpTCBoqCB"
+       "n6CBnIZNaHR0cDovL21zY3JsLm1pY3Jvc29mdC5jb20vcGtpL21zY29ycC9jcmwv"
+       "TWljcm9zb2Z0JTIwUlNBJTIwVExTJTIwQ0ElMjAwMS5jcmyGS2h0dHA6Ly9jcmwu"
+       "bWljcm9zb2Z0LmNvbS9wa2kvbXNjb3JwL2NybC9NaWNyb3NvZnQlMjBSU0ElMjBU"
+       "TFMlMjBDQSUyMDAxLmNybDBXBgNVHSAEUDBOMEIGCSsGAQQBgjcqATA1MDMGCCsG"
+       "AQUFBwIBFidodHRwOi8vd3d3Lm1pY3Jvc29mdC5jb20vcGtpL21zY29ycC9jcHMw"
+       "CAYGZ4EMAQICMB8GA1UdIwQYMBaAFLV2DDARzseSQk1Mx1wsyKkM6AtkMB0GA1Ud"
+       "JQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATANBgkqhkiG9w0BAQsFAAOCAgEAUce0"
+       "vFbvYp03JZdLVC7vjMuKOloMCcGQy0CUO3P+T4322/JvQGjgKStq/9FA+GMvqmu0"
+       "yuC4R69o8wlDOhabeJYt2T87BpE31GBHoAYkFE7kdSYfF6FP3fq2FzYcIi8OoKWI"
+       "HHZ1RsIrMKaC3sWxhrmdIpDImdgXFBXlA1CPFafeioF50bQXmjndR0xMNwnpnRNS"
+       "6XNHC9rYARXe7Jj0qk8JYTvLgPGkkaMHmnS7Hn914d1dFIZ2hyVvA+rUtVRQ1oQx"
+       "Q+R+wsRl59Q15MCSIMWnp5Fcg1gcAduGuRCvWKpusJmX3tWjdUSKEQ1UP1qV0eMm"
+       "lh64jNwJ+ejX6psgyWO2a+dFpuD2l8MgFb2gN2RgS4YsPZyDitCBkezHrmsn8txQ"
+       "yaRStDiu6UgS1Z3cqxsNHfct4BdLd7ngzBMY5CacUcCHjwPyoIHYu4G6f84LztQT"
+       "s+uwMhnP9iP/6RiF3xgJMyrIKxUjC0aDjgYyOOVS6VpVLsdVdq0KImHElO5aknT0"
+       "UzvSa5LocKrmAUv+23Dvy/UU94vERy3WelqFzb+ktRgvje0LSsHaIQC8YhokEFx2"
+       "cXdJs7PwmADM4dFCD467C2lsXTzrS4WcvSLfq6xOZ2enl8L6qfQpJ58J49uhUqx3"
+       "lJtG1Q+rccyveDAacyyCp/pDdMQdYLranGFFioA=";
 
-// Microsoft IT TLS CA 2, signed by Baltimore CyberTrust Root, expires 20 May 2024
+// Microsoft RSA TLS CA 01, signed by Baltimore CyberTrust Root, expires 08 Oct 2024
 const std::string TestData::certIM =
-       "MIIFtDCCBJygAwIBAgIQDywQyVsGwJN/uNRJ+D6FaTANBgkqhkiG9w0BAQsFADBa"
+       "MIIFWjCCBEKgAwIBAgIQDxSWXyAgaZlP1ceseIlB4jANBgkqhkiG9w0BAQsFADBa"
        "MQswCQYDVQQGEwJJRTESMBAGA1UEChMJQmFsdGltb3JlMRMwEQYDVQQLEwpDeWJl"
-       "clRydXN0MSIwIAYDVQQDExlCYWx0aW1vcmUgQ3liZXJUcnVzdCBSb290MB4XDTE2"
-       "MDUyMDEyNTE1N1oXDTI0MDUyMDEyNTE1N1owgYsxCzAJBgNVBAYTAlVTMRMwEQYD"
-       "VQQIEwpXYXNoaW5ndG9uMRAwDgYDVQQHEwdSZWRtb25kMR4wHAYDVQQKExVNaWNy"
-       "b3NvZnQgQ29ycG9yYXRpb24xFTATBgNVBAsTDE1pY3Jvc29mdCBJVDEeMBwGA1UE"
-       "AxMVTWljcm9zb2Z0IElUIFRMUyBDQSAyMIICIjANBgkqhkiG9w0BAQEFAAOCAg8A"
-       "MIICCgKCAgEAnqoVwRuhY1/mURjFFrsR3AtNm5EKukBJK9zWBgvFd1ksNEJFC06o"
-       "yRbwKPMflpW/HtOfzIeBliGk57MwZq18bgASr70sPUWuoD917HUgBfxBYoF8zA7Z"
-       "Ie5zAHODFboJL7Fg/apgbQs/GiZZNCi0QkQUWzw0nTUmVSNQ0mz6pCu95Dv1WMsL"
-       "GyPGfdN9zD3Q/QEDyJ695QgjRIxYA1DUE+54ti2k6r0ycKFQYkyWwZ25HD1h2kYt"
-       "3ovW85vF6y7tjTqUEcLbgKUCB81/955hdLLsbFd6f9o2PkU8xuOc3U+bUedvv6Sb"
-       "tvGjBEZeFyH8/CaQhzlsKMH0+OPOFv/bMqcLarPw1V1sOV1bl4W9vi2278niblzI"
-       "bEHt7nN888p4KNIwqCcXaGhbtS4tjn3NKI6v1d2XRyxIvCJDjgoZ09zF39Pyoe92"
-       "sSRikZh7xns4tQEQ8BCs4o5NBSx8UxEsgyzNSskWGEWqsIjt+7+A1skDDZv6k2o8"
-       "VCHNbTLFKS7d72wMI4ErpzVsBIicxaG2ezuMBBuqThxIiJ+G9zfoP9lxim/9rvJA"
-       "xbh3nujA1VJfkOYTJIojEAYCxR3QjEoGdapJmBle97AfqEBnwoJsu2wav8h9v+po"
-       "DL4h6dRzRUxY1DHypcFlXGoHu/REQgFLq2IN30/AhQLN90Pj9TT2RQECAwEAAaOC"
-       "AUIwggE+MB0GA1UdDgQWBBSRnjtEbD1XnEJ3KjTXT9HMSpcs2jAfBgNVHSMEGDAW"
-       "gBTlnVkwgkdYzKz6CFQ2hns6tQRN8DASBgNVHRMBAf8ECDAGAQH/AgEAMA4GA1Ud"
-       "DwEB/wQEAwIBhjAnBgNVHSUEIDAeBggrBgEFBQcDAQYIKwYBBQUHAwIGCCsGAQUF"
-       "BwMJMDQGCCsGAQUFBwEBBCgwJjAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AuZGln"
-       "aWNlcnQuY29tMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwzLmRpZ2ljZXJ0"
-       "LmNvbS9PbW5pcm9vdDIwMjUuY3JsMD0GA1UdIAQ2MDQwMgYEVR0gADAqMCgGCCsG"
-       "AQUFBwIBFhxodHRwczovL3d3dy5kaWdpY2VydC5jb20vQ1BTMA0GCSqGSIb3DQEB"
-       "CwUAA4IBAQBsf+pqb89rW8E0rP/cDuB9ixMX4C9OWQ7EA7n0BSllR64ZmuhU9mTV"
-       "2L0G4HEiGXvOmt15i99wJ0ho2/dvMxm1ZeufkAfMuEc5fQ9RE5ENgNR2UCuFB2Bt"
-       "bVmaKUAWxscN4GpXS4AJv+/HS0VXs5Su19J0DA8Bg+lo8ekCl4dq2G1m1WsCvFBI"
-       "oLIjd4neCLlGoxT2jA43lj2JpQ/SMkLkLy9DXj/JHdsqJDR5ogcij4VIX8V+bVD0"
-       "NCw7kQa6Ulq9Zo0jDEq1at4zSeH4mV2PMM3LwIXBA2xo5sda1cnUWJo3Pq4uMgcL"
-       "e0t+fCut38NMkTl8F0arflspaqUVVUov";
+       "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";
 
-// Baltimore CyberTrust Root, (root CA), expires May 13, 2025
+// Baltimore CyberTrust Root, (root CA), expires 12 May 2025
 const std::string TestData::certRoot =
        "MIIDdzCCAl+gAwIBAgIEAgAAuTANBgkqhkiG9w0BAQUFADBaMQswCQYDVQQGEwJJ"
        "RTESMBAGA1UEChMJQmFsdGltb3JlMRMwEQYDVQQLEwpDeWJlclRydXN0MSIwIAYD"

diff --git a/tests/vcore/test-common.h b/tests/vcore/test-common.h
index 2699cd5..b7e89eb 100644 (file)
--- a/tests/vcore/test-common.h
+++ b/tests/vcore/test-common.h
@@ -35,9 +35,9 @@ extern const std::string tpk_with_userdata_path;
 extern const std::string attacked_tpk_with_userdata_path;
 extern const std::string tpk_sdk_sample_path[3];
 
-extern const std::string certEE;   /* MBANK,    signed by SYMANTEC, expires 04 Feb 2016 */
-extern const std::string certIM;   /* SYMANTEC, signed by VERISIGN, expires 30 Oct 2023 */
-extern const std::string certRoot; /* VERISIGN, signed by self,     expires 30 Oct 2023 */
+extern const std::string certEE;   /* bing.com, expires 15 Nov 2023 */
+extern const std::string certIM;   /* Microsoft RSA TLS CA 01, expires 08 Oct 2024*/
+extern const std::string certRoot; /* Baltimore CyberTrust Root, expires 12 May 2025 */
 
 extern const std::string googleCA;
 extern const std::string google2nd;

diff --git a/tests/vcore/test-signature-validator.cpp b/tests/vcore/test-signature-validator.cpp
index ed27e40..b520609 100644 (file)
--- a/tests/vcore/test-signature-validator.cpp
+++ b/tests/vcore/test-signature-validator.cpp
@@ -135,6 +135,7 @@ RUNNER_TEST(T00102_positive_public_check_ref)
 
 RUNNER_TEST(T00103_positive_partner_check_ref)
 {
+       RUNNER_IGNORED_MSG("Ignored test, expired certificate");
        auto retVector = runCheck(TestData::widget_partner_path,
                                                          true,
                                                          true);
@@ -169,6 +170,7 @@ RUNNER_TEST(T00104_positive_public_uncheck_ref)
 
 RUNNER_TEST(T00105_positive_partner_uncheck_ref)
 {
+       RUNNER_IGNORED_MSG("Ignored test, expired certificate");
        auto retVector = runCheck(TestData::widget_partner_path,
                                                          true,
                                                          false);
@@ -243,6 +245,7 @@ RUNNER_TEST(T00108_distributor_disregard_check)
 
 RUNNER_TEST(T00109_positive_platform_check_ref)
 {
+       RUNNER_IGNORED_MSG("Ignored test, expired certificate");
        auto retVector = runCheck(TestData::widget_platform_path,
                                                          true,
                                                          true);
@@ -260,6 +263,7 @@ RUNNER_TEST(T00109_positive_platform_check_ref)
 
 RUNNER_TEST(T00110_positive_platform_uncheck_ref)
 {
+       RUNNER_IGNORED_MSG("Ignored test, expired certificate");
        auto retVector = runCheck(TestData::widget_platform_path,
                                                          true,
                                                          false);