Source release 14.2.0

core/src/crypto_session.cpp

@@ -117,7 +117,7 @@ void GenerateEncryptContext(const std::string& input_context,
   }
 
   const std::string kEncryptionKeyLabel = "ENCRYPTION";
-  const size_t kEncryptionKeySizeBits = wvcdm::KEY_SIZE * 8;
+  const size_t kEncryptionKeySizeBits = wvcdm::CONTENT_KEY_SIZE * 8;
 
   deriv_context->assign(kEncryptionKeyLabel);
   deriv_context->append(1, '\0');
@@ -981,6 +981,8 @@ CdmResponseType CryptoSession::SelectKey(const std::string& key_id,
       return NO_DEVICE_KEY_1;
     case OEMCrypto_ERROR_NO_CONTENT_KEY:
       return NO_CONTENT_KEY_2;
+    case OEMCrypto_KEY_NOT_LOADED:
+      return NO_CONTENT_KEY_3;
     case OEMCrypto_ERROR_INSUFFICIENT_RESOURCES:
       return INSUFFICIENT_CRYPTO_RESOURCES_2;
     case OEMCrypto_ERROR_UNKNOWN_FAILURE:
@@ -2115,6 +2117,8 @@ CdmResponseType CryptoSession::LoadUsageEntry(
       return LOAD_USAGE_ENTRY_GENERATION_SKEW;
     case OEMCrypto_ERROR_SIGNATURE_FAILURE:
       return LOAD_USAGE_ENTRY_SIGNATURE_FAILURE;
+    case OEMCrypto_ERROR_INSUFFICIENT_RESOURCES:
+      return INSUFFICIENT_CRYPTO_RESOURCES_3;
     default:
       return LOAD_USAGE_ENTRY_UNKNOWN_ERROR;
   }
@@ -2572,4 +2576,20 @@ void CryptoSession::IncrementIV(uint64_t increase_by,
   (*counter_buffer) = htonll64(ntohll64(*counter_buffer) + increase_by);
 }
 
+// The factory will either be set by WvCdmTestBase, or a default factory is
+// created on the first call to MakeCryptoSession.
+scoped_ptr<CryptoSessionFactory> CryptoSession::factory_(NULL);
+
+CryptoSession* CryptoSession::MakeCryptoSession(
+    metrics::CryptoMetrics* crypto_metrics) {
+  // If the factory_ has not been set, then use a default factory.
+  if (factory_.get() == NULL) factory_.reset(new CryptoSessionFactory());
+  return factory_->MakeCryptoSession(crypto_metrics);
+}
+
+CryptoSession* CryptoSessionFactory::MakeCryptoSession(
+    metrics::CryptoMetrics* crypto_metrics) {
+  return new CryptoSession(crypto_metrics);
+}
+
 }  // namespace wvcdm