Merge "Allow running tests without test keybox."

libwvdrmengine/cdm/core/test/test_base.cpp

@@ -227,15 +227,33 @@ std::string WvCdmTestBase::SignHMAC(const std::string& message,
 
 TestCryptoSession::TestCryptoSession(metrics::CryptoMetrics* crypto_metrics)
     : CryptoSession(crypto_metrics) {
-  // The first CryptoSession should have initialized OEMCrypto.  This is right
-  // after that, so we should tell oemcrypto to use a test keybox.
-  if (session_count() == 1) {
+  MaybeInstallTestKeybox();
+}
+
+TestCryptoSession::TestCryptoSession(metrics::CryptoMetrics* crypto_metrics,
+                                     const TestCryptoSessionConfig* config)
+    : CryptoSession(crypto_metrics), config_(config) {
+  MaybeInstallTestKeybox();
+}
+
+void TestCryptoSession::MaybeInstallTestKeybox() {
+  if (IsTestKeyboxNeeded()) {
     CryptoSession::SetAllowTestKeybox(true);
     ReinitializeForTest();
     WvCdmTestBase::InstallTestRootOfTrust();
   }
 }
 
+bool TestCryptoSession::IsTestKeyboxNeeded() {
+  // The first CryptoSession should have initialized OEMCrypto.  This is right
+  // after that.
+  if (session_count() != 1) return false;
+  // If config is not available, assume keybox is required.
+  if (config_ == nullptr) return true;
+  // Unless disabled, test keybox is required.
+  return !config_->disable_test_keybox;
+}
+
 CdmResponseType TestCryptoSession::GenerateNonce(uint32_t* nonce) {
   CdmResponseType status = CryptoSession::GenerateNonce(nonce);
   for (int i = 0; status != NO_ERROR; i++) {
@@ -248,6 +266,7 @@ CdmResponseType TestCryptoSession::GenerateNonce(uint32_t* nonce) {
 }
 
 class TestCryptoSessionFactory : public CryptoSessionFactory {
+ public:
   CryptoSession* MakeCryptoSession(
       metrics::CryptoMetrics* crypto_metrics) override {
     // We need to add extra locking here because we need to make sure that there
@@ -257,9 +276,18 @@ class TestCryptoSessionFactory : public CryptoSessionFactory {
     // InstallTestRootOfTrust is only called in the constructor of the
     // TestCryptoSession, above.
     std::unique_lock<std::mutex> auto_lock(init_lock_);
-    return new TestCryptoSession(crypto_metrics);
+    return new TestCryptoSession(crypto_metrics, &session_config_);
   }
+
+  void SetDisableTestKeybox(bool disable) {
+    std::unique_lock<std::mutex> auto_lock(init_lock_);
+    session_config_.disable_test_keybox = disable;
+  }
+
+ private:
   std::mutex init_lock_;
+  // Shared with all TestCryptoSession instances created by this factory.
+  TestCryptoSessionConfig session_config_;
 };
 
 void WvCdmTestBase::SetUp() {
@@ -279,7 +307,13 @@ void WvCdmTestBase::SetUp() {
       std::string(test_info->test_case_name()) + "." + test_info->name();
   int overwrite = 1;  // Set value even if already set.
   setenv("MODEL_NAME", model_name.c_str(), overwrite);
-  CryptoSession::SetCryptoSessionFactory(new TestCryptoSessionFactory());
+  TestCryptoSessionFactory* factory = new TestCryptoSessionFactory();
+  CryptoSession::SetCryptoSessionFactory(factory);
+  const char* const disable_test_keybox_flag = getenv("DISABLE_TEST_KEYBOX");
+  if (disable_test_keybox_flag != nullptr &&
+      !strcmp(disable_test_keybox_flag, "yes")) {
+    factory->SetDisableTestKeybox(true);
+  }
   // TODO(fredgc): Add a test version of DeviceFiles.
 }
 

libwvdrmengine/cdm/core/test/test_base.h

@@ -103,12 +103,28 @@ class WvCdmTestBaseWithEngine : public WvCdmTestBase {
   TestCdmEngine cdm_engine_;
 };
 
+struct TestCryptoSessionConfig {
+  // Disables newly created TestCryptoSession instances from installing
+  // a test keybox.
+  bool disable_test_keybox = false;
+};
+
 class TestCryptoSession : public CryptoSession {
  public:
   explicit TestCryptoSession(metrics::CryptoMetrics* crypto_metrics);
+  TestCryptoSession(metrics::CryptoMetrics* crypto_metrics,
+                    const TestCryptoSessionConfig* config);
   // This intercepts nonce flood errors, which is useful for tests that request
   // many nonces and are not time critical.
   CdmResponseType GenerateNonce(uint32_t* nonce) override;
+
+ private:
+  // Called once when TestCryptoSession is constructed.
+  void MaybeInstallTestKeybox();
+  bool IsTestKeyboxNeeded();
+
+  // An un-owned pointer to the config.
+  const TestCryptoSessionConfig* const config_ = nullptr;
 };
 
 // Given a PSSH data structure, this makes a PSSH string for use in