Merge Changes from CDM repository

This CL merges the following changes from the Widevine repository: Avoid CdmSession reinitialization https://widevine-internal-review.googlesource.com/#/c/10530/ Fix timer-related unit tests. https://widevine-internal-review.googlesource.com/#/c/10510/ Correct return statement bug: 15590802 https://widevine-internal-review.googlesource.com/#/c/10553/ Usage reporting fixes bug/15388863 https://widevine-internal-review.googlesource.com/#/c/10460/ Make public methods virtual https://widevine-internal-review.googlesource.com/#/c/10500/ Fix the SetTimer contract in the CDM. https://widevine-internal-review.googlesource.com/#/c/10493/ Move inline CDM methods, add OVERRIDE. https://widevine-internal-review.googlesource.com/#/c/10475/ Simplify storage APIs related cleanup. https://widevine-internal-review.googlesource.com/#/c/10473/ Duration values are not correctly reported when queried b/15592374 https://widevine-internal-review.googlesource.com/#/c/10437/ Propagate IsKeyValid() through ContentDecryptionModule. https://widevine-internal-review.googlesource.com/#/c/10483/ Minor clean up in config_test_env. https://widevine-internal-review.googlesource.com/#/c/10440/ General clean up. https://widevine-internal-review.googlesource.com/#/c/10441/ Refactor HttpSocket and simplify UrlRequest interface. https://widevine-internal-review.googlesource.com/#/c/10410/ Install good keybox at end of unit tests b/15385981 https://widevine-internal-review.googlesource.com/#/c/10374/ Privacy crypto fixes b/15475012 https://widevine-internal-review.googlesource.com/#/c/10383/ Incorporate header files to resolve build issued based on customers feedback. https://widevine-internal-review.googlesource.com/#/c/10420/ Support unprovisioning b/12247651 https://widevine-internal-review.googlesource.com/#/c/10356/ Correct usage of Host::Allocate and Cdm::Decrypt. https://widevine-internal-review.googlesource.com/#/c/10378/ Fix logging bug, arguments in wrong order. https://widevine-internal-review.googlesource.com/#/c/10380/ Rename types that look like constants. https://widevine-internal-review.googlesource.com/#/c/10379/ Fix offline test failures b/13909635 https://widevine-internal-review.googlesource.com/#/c/10348/ Add -DUNIT_TEST to the unit test makefile for Android https://widevine-internal-review.googlesource.com/#/c/10375/ Refactor privacy-crypto and add dummy version. https://widevine-internal-review.googlesource.com/#/c/10353/ Remove References to Apiary https://widevine-internal-review.googlesource.com/#/c/9924/ Delete oldest entry in usage table when full bug: 15184824 https://widevine-internal-review.googlesource.com/#/c/10295/ Port DeviceFiles to iOS. https://widevine-internal-review.googlesource.com/#/c/10355/ Make testing functions in DeviceFiles private. https://widevine-internal-review.googlesource.com/#/c/10354/ Add RSA encryption to haystack https://widevine-internal-review.googlesource.com/#/c/10280/ Add string and vector includes to CDM header. https://widevine-internal-review.googlesource.com/#/c/10352/ First version of oemcrypto logging https://widevine-internal-review.googlesource.com/#/c/10252/ Update Names of Secure Stop Methods bug: 11987015 https://widevine-internal-review.googlesource.com/#/c/10152/ Adjust timing on the Usage Table unit test https://widevine-internal-review.googlesource.com/#/c/10307/ Fix all compiler warnings in CDM source release. https://widevine-internal-review.googlesource.com/#/c/10293/ Fix memset bug: args in wrong order https://widevine-internal-review.googlesource.com/#/c/10292/ Partial revert of 'Remove refs to test prov server, Level3 support...' https://widevine-internal-review.googlesource.com/#/c/10281/ Pack structure OEMCrypto_PST_Report https://widevine-internal-review.googlesource.com/#/c/10243/ Remove refs to test prov server, Level3 support; remove dead code https://widevine-internal-review.googlesource.com/#/c/10220/ Partial revert of 'Document data strings; clean up license server parameters.' https://widevine-internal-review.googlesource.com/#/c/10188/ Document data strings; clean up license server parameters. https://widevine-internal-review.googlesource.com/#/c/10120/ Fix broken build after partner branch merge. https://widevine-internal-review.googlesource.com/#/c/10181/ TODO Cleanup - core/src, core/include https://widevine-internal-review.googlesource.com/#/c/9965/ TODO Cleanup - cdm, chromium, core/test. https://widevine-internal-review.googlesource.com/#/c/9419/ Remove unneeded properties. https://widevine-internal-review.googlesource.com/#/c/10162/ Change-Id: If2bb9d743a562a3875bebb91933c0aaadea286b2
2014-06-25 13:02:54 -07:00
parent 8a8feb747c
commit b5e8b87fed
66 changed files with 2927 additions and 1998 deletions
--- a/libwvdrmengine/oemcrypto/mock/src/oemcrypto_logging.cpp
+++ b/libwvdrmengine/oemcrypto/mock/src/oemcrypto_logging.cpp
@@ -0,0 +1,109 @@
+// Copyright 2014 Google Inc. All Rights Reserved.
+
+#include "oemcrypto_logging.h"
+
+#include <stdio.h>
+
+namespace wvoec_mock {
+
+int logging_category_setting = 0x00;
+
+void SetLoggingSettings(int level, int categories) {
+  SetLoggingLevel(level);
+  TurnOffLoggingForAllCategories();
+  AddLoggingForCategories(categories);
+}
+
+void TurnOffLoggingForAllCategories() {
+  logging_category_setting = 0;
+}
+
+void SetLoggingLevel(int level){;
+  wvcdm::g_cutoff =  static_cast<wvcdm::LogPriority>(level);
+}
+
+void SetLoggingLevel(wvcdm::LogPriority level) {
+  wvcdm::g_cutoff = level;
+}
+
+void AddLoggingForCategories(int categories) {
+  logging_category_setting |= categories;
+}
+
+void RemoveLoggingForCategories(int categories) {
+  logging_category_setting &= ~categories;
+}
+
+bool LogCategoryEnabled(int categories) {
+  return ( (logging_category_setting & categories) !=0 );
+}
+
+void dump_hex_helper(std::string& buffer, std::string name,
+                            const uint8_t* vector, size_t length) {
+  buffer += name + " = ";
+  if (vector == NULL) {
+    buffer +="NULL;\n";
+    LOGE(buffer.c_str());
+    return;
+  }
+  int a, b;
+  char int_to_hexcar[16] = {'0', '1', '2', '3', '4', '5', '6', '7',
+            '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'};
+  for (size_t i = 0; i < length; i++) {
+    if (i == 0) {
+      buffer += "\n     wvcdm::a2b_hex(\"";
+    } else if (i % 32 == 0) {
+      buffer += "\"\n                    \"";
+    }
+    a = vector[i] % 16;
+    b = (vector[i] - a) / 16;
+    buffer += int_to_hexcar[b];
+    buffer += int_to_hexcar[a];
+  }
+  buffer += "\");\n";
+}
+
+void dump_hex(std::string name, const uint8_t* vector, size_t length) {
+  std::string buffer="";
+  dump_hex_helper(buffer, name, vector, length);
+  LOGV(buffer.c_str());
+}
+
+void dump_array_part_helper(std::string& buffer, std::string array,
+                            size_t index, std::string name,
+                            const uint8_t* vector, size_t length) {
+  char index_str[256];
+
+  snprintf(index_str, sizeof index_str, "%zu", index);
+
+  if (vector == NULL) {
+    buffer += array.c_str();
+    buffer += "[";
+    buffer += index_str;
+    buffer += "].";
+    buffer += name.c_str();
+    buffer += " = NULL;\n";
+    LOGW(buffer.c_str());
+    return;
+  }
+  buffer += "std::string s";
+  buffer += index_str;
+  buffer+= "_";
+  dump_hex_helper(buffer, name, vector, length);
+  buffer += array.c_str();
+  buffer += "[";
+  buffer += index_str;
+  buffer += "]." + name + " = message_ptr + message.find(s";
+  buffer += index_str;
+  buffer += "_" + name + ".data());\n";
+}
+
+void dump_array_part(std::string array, size_t index,
+                     std::string name, const uint8_t* vector, size_t length) {
+  std::string buffer ="";
+  dump_array_part_helper(buffer, array, index, name, vector, length);
+  LOGV(buffer.c_str());
+}
+
+} // namespace wvoec_mock
+