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
66 lines
2.1 KiB
C++
66 lines
2.1 KiB
C++
// Copyright 2014 Google Inc. All Rights Reserved.
|
|
|
|
#ifndef WVOEC_OEMCRYPTO_LOGGING_H_
|
|
#define WVOEC_OEMCRYPTO_LOGGING_H_
|
|
|
|
#include "OEMCryptoCENC.h"
|
|
|
|
#include "log.h"
|
|
#include <string>
|
|
#include <iostream>
|
|
|
|
namespace wvoec_mock {
|
|
|
|
// The constants below represent integers with a single "on" bit that
|
|
// represents categories of logging This allows users to specify with
|
|
// more precision what they want to log. LogCategoryEnabled(category)
|
|
// is used to see if the category passed in the parameters is to
|
|
// be logged based on the current settings. Categories can be combines
|
|
// using the | (or) bitwise operator. For example
|
|
// LogCategoryEnabled(category1 | category2) will return true if
|
|
// category1 and/or category2 are set to logging.
|
|
|
|
const int kLoggingTraceOEMCryptoCalls = 0x01;
|
|
const int kLoggingDumpContentKeys = 0x02;
|
|
const int kLoggingDumpKeyControlBlocks = 0x04;
|
|
const int kLoggingDumpDerivedKeys = 0x08;
|
|
const int kLoggingTraceNonce = 0x10;
|
|
const int kLoggingTraceDecryption = 0x20;
|
|
const int kLoggingTraceUsageTable = 0x40;
|
|
const int kLoggingDumpTraceAll = 0xFF;
|
|
|
|
void SetLoggingSettings(int level, int categories);
|
|
|
|
// set level of logging
|
|
void SetLoggingLevel(int level);
|
|
|
|
void TurnOffLoggingForAllCategories();
|
|
|
|
// Returns true if the category passed is set to logging.
|
|
// Returns false otherwise. The category constant declared
|
|
// above are passed.
|
|
bool LogCategoryEnabled(int category);
|
|
|
|
// Turn on logging for the categories passed.
|
|
void AddLoggingForCategories(int categories);
|
|
|
|
// Turn off logging for the categories passed.
|
|
void RemoveLoggingForCategories(int categories);
|
|
|
|
void dump_hex_helper(std::string& buffer, std::string name,
|
|
const uint8_t* vector, size_t length);
|
|
|
|
void dump_hex(std::string name, const uint8_t* vector, size_t length);
|
|
|
|
void dump_array_part_helper(std::string& buffer, std::string array,
|
|
size_t index, std::string name,
|
|
const uint8_t* vector, size_t length);
|
|
|
|
void dump_array_part(std::string array, size_t index,
|
|
std::string name, const uint8_t* vector, size_t length);
|
|
|
|
} // namespace wvoec_mock
|
|
|
|
#endif
|
|
|