File util, generic crypto, and key query
This CL merges several CLs from the widevine repo: http://go/wvgerrit/18012 Add support for querying allowed usage for key. http://go/wvgerrit/17971 Add per-origin storage. http://go/wvgerrit/18152 Add OEMCrypto's generic crypto operations to CDM. http://go/wvgerrit/17911 QueryKeyControlInfo => QueryOemCryptoSessionId Note: numbering in wv_cdm_types.h was added in this CL and will be back ported to wvgerrit in a future CL. Change-Id: Idb9e9a67e94f62f25dc16c5307f75a08b3430b64
This commit is contained in:
@@ -12,6 +12,7 @@
|
||||
|
||||
#include <openssl/rsa.h>
|
||||
|
||||
#include "file_store.h"
|
||||
#include "lock.h"
|
||||
#include "oemcrypto_key_mock.h"
|
||||
#include "oemcrypto_keybox_mock.h"
|
||||
@@ -231,7 +232,7 @@ class SessionContext {
|
||||
|
||||
class CryptoEngine {
|
||||
public:
|
||||
CryptoEngine();
|
||||
CryptoEngine(wvcdm::FileSystem* file_system);
|
||||
~CryptoEngine();
|
||||
|
||||
bool Initialized() { return true; }
|
||||
@@ -267,6 +268,7 @@ class CryptoEngine {
|
||||
OEMCrypto_HDCP_Capability maximum_hdcp_capability();
|
||||
|
||||
UsageTable* usage_table() { return usage_table_; }
|
||||
wvcdm::FileSystem* file_system() { return file_system_; }
|
||||
bool local_display();
|
||||
bool closed_platform();
|
||||
bool supports_storage();
|
||||
@@ -284,6 +286,7 @@ class CryptoEngine {
|
||||
WvTestKeybox test_keybox_;
|
||||
bool use_test_keybox_;
|
||||
wvcdm::Lock session_table_lock_;
|
||||
wvcdm::FileSystem* file_system_;
|
||||
UsageTable* usage_table_;
|
||||
RSA* rsa_key_; // If no keybox, this is baked in certificate.
|
||||
|
||||
|
||||
Reference in New Issue
Block a user