From 7639e0297fc2a00fa927fb658cf53a4fad00aca8 Mon Sep 17 00:00:00 2001
From: "John \"Juce\" Bruce" <juce@google.com>
Date: Wed, 4 Mar 2015 12:52:28 -0800
Subject: [PATCH] Merge Widevine CDM-Side Core Changes

This is a combined merge of several small changes to the core in the
Widevine CDM repository:

http://go/wvgerrit/10941
  Rename privacy_crypto to allow more variants.

http://go/wvgerrit/11530
  Add Missing Header to properties.h

http://go/wvgerrit/11531
  More Loosely Couple CdmEngine and CdmSession

Change-Id: I5b3f738ae495ab267da1440421dd7aa6f7860194
---
 libwvdrmengine/cdm/Android.mk                                 | 2 +-
 libwvdrmengine/cdm/core/include/cdm_engine.h                  | 2 +-
 libwvdrmengine/cdm/core/include/privacy_crypto.h              | 2 +-
 libwvdrmengine/cdm/core/include/properties.h                  | 4 ++++
 .../src/{privacy_crypto.cpp => privacy_crypto_openssl.cpp}    | 0
 5 files changed, 7 insertions(+), 3 deletions(-)
 rename libwvdrmengine/cdm/core/src/{privacy_crypto.cpp => privacy_crypto_openssl.cpp} (100%)

diff --git a/libwvdrmengine/cdm/Android.mk b/libwvdrmengine/cdm/Android.mk
index 9c17b33c..3cdfcdbd 100644
--- a/libwvdrmengine/cdm/Android.mk
+++ b/libwvdrmengine/cdm/Android.mk
@@ -31,7 +31,7 @@ LOCAL_SRC_FILES := \
     $(CORE_SRC_DIR)/max_res_engine.cpp \
     $(CORE_SRC_DIR)/oemcrypto_adapter_dynamic.cpp \
     $(CORE_SRC_DIR)/policy_engine.cpp \
-    $(CORE_SRC_DIR)/privacy_crypto.cpp \
+    $(CORE_SRC_DIR)/privacy_crypto_openssl.cpp \
     $(SRC_DIR)/wv_content_decryption_module.cpp
 
 LOCAL_MODULE := libcdm
diff --git a/libwvdrmengine/cdm/core/include/cdm_engine.h b/libwvdrmengine/cdm/core/include/cdm_engine.h
index d7b8bbc6..15448ad0 100644
--- a/libwvdrmengine/cdm/core/include/cdm_engine.h
+++ b/libwvdrmengine/cdm/core/include/cdm_engine.h
@@ -5,7 +5,6 @@
 
 #include <string>
 
-#include "cdm_session.h"
 #include "certificate_provisioning.h"
 #include "crypto_session.h"
 #include "initialization_data.h"
@@ -17,6 +16,7 @@
 namespace wvcdm {
 
 class CdmClientPropertySet;
+class CdmSession;
 class CryptoEngine;
 class UsagePropertySet;
 class WvCdmEventListener;
diff --git a/libwvdrmengine/cdm/core/include/privacy_crypto.h b/libwvdrmengine/cdm/core/include/privacy_crypto.h
index 309aeecc..f4238639 100644
--- a/libwvdrmengine/cdm/core/include/privacy_crypto.h
+++ b/libwvdrmengine/cdm/core/include/privacy_crypto.h
@@ -55,7 +55,7 @@ class RsaPublicKey {
   bool Encrypt(const std::string& plaintext,
                std::string* ciphertext);
 
-  // Verify RSSASSA-PSS signature. Caller retains ownership of all parameters.
+  // Verify RSASSA-PSS signature. Caller retains ownership of all parameters.
   // Returns true if validation succeeds, false otherwise.
   bool VerifySignature(const std::string& message,
                        const std::string& signature);
diff --git a/libwvdrmengine/cdm/core/include/properties.h b/libwvdrmengine/cdm/core/include/properties.h
index 6fe200ea..b163e6c9 100644
--- a/libwvdrmengine/cdm/core/include/properties.h
+++ b/libwvdrmengine/cdm/core/include/properties.h
@@ -11,6 +11,10 @@
 #include "scoped_ptr.h"
 #include "wv_cdm_types.h"
 
+#if defined(UNIT_TEST)
+# include "gtest/gtest_prod.h"
+#endif
+
 namespace wvcdm {
 
 typedef std::map<CdmSessionId, const CdmClientPropertySet*>
diff --git a/libwvdrmengine/cdm/core/src/privacy_crypto.cpp b/libwvdrmengine/cdm/core/src/privacy_crypto_openssl.cpp
similarity index 100%
rename from libwvdrmengine/cdm/core/src/privacy_crypto.cpp
rename to libwvdrmengine/cdm/core/src/privacy_crypto_openssl.cpp