f6c2a60485
This merges the following changes from the Widevine CDM repository: 564f4cc Add CdmClientPropertySet to CDM Adds an interface to the CDM that allows it to query its client for certain properties. In this case, this includes the ability to specify what security level is desired, as well as support for service ceritifcate privacy mode. 9cfbd3e Force Level 3 fallback Adds support for voluntarily invoking L3 crypto to the OEMCrypto wrapper. 95d12c1 Add pointer to CdmClientPropertySet class to OpenSession. Adds support for storing the property set on a session-by-session basis and choosing the appropriate crypto level. 17de442 Add Settable Properties for Clank to Android Adds support for setting the aforementioned properties to the DrmEngine bbe704d Fixes to force fallback to level three security Corrections to invoke provisioning, OEMCrypto API with configured security level rather than the default. Unit tests were also revised. Note that some parts of this are also support for the ability to use a service certificate-based privacy mode. The remaining code for supporting this mode is still forthcoming. Bug: 10109249 Change-Id: I2755e4dea1de3e8a56cff237360298f7b7f1bddc
40 lines
1.4 KiB
C++
40 lines
1.4 KiB
C++
/*********************************************************************
|
|
* oemcrypto_adapter.h
|
|
*
|
|
* (c) Copyright 2013 Google, Inc.
|
|
*
|
|
* This interface allows CDM to open a Level 3 session instead of
|
|
* letting the wrapper function choose between level 1 or level 3.
|
|
*
|
|
*********************************************************************/
|
|
|
|
#ifndef OEMCRYPTO_ADAPTER_H_
|
|
#define OEMCRYPTO_ADAPTER_H_
|
|
|
|
#include "OEMCryptoCENC.h"
|
|
|
|
namespace wvcdm {
|
|
|
|
enum SecurityLevel {
|
|
kLevelDefault,
|
|
kLevel3
|
|
};
|
|
|
|
/* This attempts to open a session at the desired security level.
|
|
If one level is not available, the other will be used instead. */
|
|
OEMCryptoResult OEMCrypto_OpenSession(OEMCrypto_SESSION* session,
|
|
SecurityLevel level);
|
|
OEMCryptoResult OEMCrypto_IsKeyboxValid(SecurityLevel level);
|
|
OEMCryptoResult OEMCrypto_GetDeviceID(uint8_t* deviceID, size_t* idLength,
|
|
SecurityLevel level);
|
|
OEMCryptoResult OEMCrypto_GetKeyData(uint8_t* keyData, size_t* keyDataLength,
|
|
SecurityLevel level);
|
|
OEMCryptoResult OEMCrypto_InstallKeybox(const uint8_t* keybox,
|
|
size_t keyBoxLength,
|
|
SecurityLevel level);
|
|
uint32_t OEMCrypto_APIVersion(SecurityLevel level);
|
|
const char* OEMCrypto_SecurityLevel(SecurityLevel level);
|
|
} // namespace wvcdm
|
|
|
|
#endif // OEMCRYPTO_ADAPTER_H_
|