Source release 17.1.0

core/test/config_test_env.cpp

@@ -1,8 +1,9 @@
 // Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary
-// source code may only be used and distributed under the Widevine Master
-// License Agreement.
+// source code may only be used and distributed under the Widevine License
+// Agreement.
 
 #include "config_test_env.h"
+
 #include "string_conversions.h"
 
 // Holds the data needed to talk to the various provisioning and
@@ -82,6 +83,32 @@ const std::string kCpStagingProvisioningServiceCertificate =
     "8598ed5751b38694419242a875d9e00d5a5832933024b934859ec8be78adccbb"
     "1ec7127ae9afeef9c5cd2e15bd3048e8ce652f7d8c5d595a0323238c598a28";
 
+// Service certificate for qa.widevine.com
+const std::string kCpQAProvisioningServiceCertificate =
+    "0abc02080312100ec8164669cc2fdfc253b3b5e763276e18abd8cdcf05228e02"
+    "3082010a0282010100b24d497c0cc6ab5072f97623daa49b8d5564360654d8e5"
+    "8df8db7a23158f1afdd04724cbadbe87001532d9d6dec3b06973666da7759ec3"
+    "bf3083e2d9b85e7a47c340db796b085493a460eef31d56e3f15d857713c55cdb"
+    "164fe09e2a06be7fb979ad55e33a59ade3712aed2445b89fc145556a9e0093fa"
+    "36fc3ff4d05291a9633d20c80a13cd0d924ed9078395714c30b49019f4d6f5ba"
+    "093ad958aee9a164ba73ec298f905662de5859d3e6fae41c063f262d29dae75e"
+    "8654ac9d68f3e3fccc809573d0f90704a77f9bce391d0a5f265f438119e4fb0b"
+    "ec27706f5c7fc888f665730b691a0431e30cb3b57dfd078838c44550c3b79b35"
+    "0552a92a760f90c6cf02030100013a0f71612e7769646576696e652e636f6d12"
+    "800331ca1662fdc97e02debdca5b6de35dce5da87b5f61b15745ccf83e66197c"
+    "e31bc6379ae4f6a5e4fd8a0e76f979701c5a715c06d70908563626d0dd3986b5"
+    "e623a7b6336789c67f0fc68f9ec68e045f85d9a06942f4af0fe47d801cf035af"
+    "27924f1c4cd395d15ce2f92f48044254fdefe37320471d7009160f5293183ca4"
+    "a09bca71f76f1457a80eebcf12706bd79256f1b02e67dc002fc81e18c00d880f"
+    "04b0187e6ef59ae75eaaf6b16672a887b9657f1796607d1585d1998283af1650"
+    "9bd9a170c262056aad69e222a4c3180d104a76d76da29082e4f2e5297d1ec44d"
+    "ed98c999981688089d8ff2d62f0f13b96ce5e89a4c215d60f025fa29811fcdc1"
+    "848fe0581f612f45733da4b4c8803ae8088dcb3b811ea9c691daccfbe9cbf603"
+    "13e8f85eb68f2f1d8cdf9e4fc91a46157a90fffafbd9d408b319307ea4d3d4a9"
+    "d2f177355ad361f5284057dec1b186beb85dcbda64bf00a164cecc66c1878961"
+    "7748618d069c39f365e8347acdae777cc4e3c3c3c3fe9698c4f5ee1285b0e6a9"
+    "675e";
+
 // -----------------------------------------------------------------------------
 // Below are several choices for licenseing servers: production, UAT, staging
 // and staging and maybe Google Play.  We haven't tested with Google Play in a
@@ -309,42 +336,30 @@ ConfigTestEnv::ConfigTestEnv(ServerConfigurationId server_id, bool streaming,
   }
 }
 
-ConfigTestEnv& ConfigTestEnv::operator=(const ConfigTestEnv& other) {
-  this->server_id_ = other.server_id_;
-  this->client_auth_ = other.client_auth_;
-  this->key_id_ = other.key_id_;
-  this->key_system_ = other.key_system_;
-  this->license_server_ = other.license_server_;
-  this->provisioning_server_ = other.provisioning_server_;
-  this->license_service_certificate_ = other.license_service_certificate_;
-  this->provisioning_service_certificate_ =
-      other.provisioning_service_certificate_;
-  return *this;
-}
-
 void ConfigTestEnv::Init(ServerConfigurationId server_id) {
   this->server_id_ = server_id;
   client_auth_ = license_servers[server_id].client_tag;
   key_id_ = license_servers[server_id].key_id;
   key_system_ = kWidevineKeySystem;
   license_server_ = license_servers[server_id].license_server_url;
+  renewal_server_.clear();
   provisioning_server_ = license_servers[server_id].provisioning_server_url;
   license_service_certificate_ =
-      a2bs_hex(license_servers[server_id].license_service_certificate);
-  provisioning_service_certificate_ =
-      a2bs_hex(license_servers[server_id].provisioning_service_certificate);
+      wvutil::a2bs_hex(license_servers[server_id].license_service_certificate);
+  provisioning_service_certificate_ = wvutil::a2bs_hex(
+      license_servers[server_id].provisioning_service_certificate);
 }
 
 const CdmInitData ConfigTestEnv::GetInitData(ContentId content_id) {
   switch (content_id) {
     case kContentIdStreaming:
-      return wvcdm::a2bs_hex(kCpKeyId);
+      return wvutil::a2bs_hex(kCpKeyId);
     case kContentIdOffline:
-      return wvcdm::a2bs_hex(kCpOfflineKeyId);
+      return wvutil::a2bs_hex(kCpOfflineKeyId);
     case kContentIdStagingSrmOuputProtectionRequested:
-      return wvcdm::a2bs_hex(kCpStagingSrmOuputProtectionRequested);
+      return wvutil::a2bs_hex(kCpStagingSrmOuputProtectionRequested);
     case kContentIdStagingSrmOuputProtectionRequired:
-      return wvcdm::a2bs_hex(kCpStagingSrmOuputProtectionRequired);
+      return wvutil::a2bs_hex(kCpStagingSrmOuputProtectionRequired);
     default:
       return kEmptyData;
   }
@@ -366,4 +381,8 @@ const std::string& ConfigTestEnv::GetLicenseServerUrl(
   }
 }
 
+std::string ConfigTestEnv::QAProvisioningServiceCertificate() {
+  return wvutil::a2bs_hex(kCpQAProvisioningServiceCertificate);
+}
+
 }  // namespace wvcdm