Source release v3.2.0

core/test/generic_crypto_unittest.cpp

@@ -11,6 +11,7 @@
 
 #include "cdm_engine.h"
 
+#include "default_service_certificate.h"
 #include "license_request.h"
 #include "log.h"
 #include "oec_session_util.h"
@@ -33,6 +34,7 @@ class WvGenericOperationsTest : public testing::Test {
   virtual void SetUp() {
     ::testing::Test::SetUp();
 
+    // TODO(fredgc or gmorgan): This should be updated for provisioning 3.0
     // Load test keybox. This keybox will be used by any CryptoSession
     // created by the CDM under test.
     ASSERT_EQ(OEMCrypto_SUCCESS, OEMCrypto_LoadTestKeybox());
@@ -72,7 +74,8 @@ class WvGenericOperationsTest : public testing::Test {
   void OecSessionSetup(uint32_t oec_session_id) {
     buffer_size_ = 160;
     oec_util_session_.SetSessionId(oec_session_id);
-    oec_util_session_.GenerateTestSessionKeys();
+    // TODO(fredgc or gmorgan): This should be updated for provisioning 3.0
+    oec_util_session_.GenerateDerivedKeysFromKeybox();
     MakeFourKeys();
   }
 
@@ -159,6 +162,7 @@ class WvGenericOperationsTest : public testing::Test {
     CdmCertificateType cert_type = kCertificateWidevine;
     std::string cert_authority;
     std::string cert, wrapped_key;
+    cdm_engine_->SetServiceCertificate(kDefaultServiceCertificate);
     ASSERT_EQ(NO_ERROR,
               cdm_engine_->GetProvisioningRequest(
                   cert_type, cert_authority, &prov_request,
@@ -202,7 +206,8 @@ TEST_F(WvGenericOperationsTest, NormalSessionOpenClose) {
 TEST_F(WvGenericOperationsTest, GenerateSessionKeys) {
   wvoec::Session s;
   ASSERT_NO_FATAL_FAILURE(s.open());
-  ASSERT_NO_FATAL_FAILURE(s.GenerateTestSessionKeys());
+  // TODO(fredgc or gmorgan): This should be updated for provisioning 3.0
+  ASSERT_NO_FATAL_FAILURE(s.GenerateDerivedKeysFromKeybox());
   ASSERT_NO_FATAL_FAILURE(s.close());
 }