widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Separate key session SelectKey methods"

Browse Source
This commit is contained in:
Srujan Gaddam
2019-02-27 01:18:18 +00:00
committed by Android (Google) Code Review
parent b3000dbcee 6a8bd096f4
commit 99cea1b363
2 changed files with 33 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libwvdrmengine/cdm/core/include/entitlement_key_session.h
View File

@@ -44,7 +44,10 @@ class EntitlementKeySession : public ContentKeySession {
OEMCrypto_EntitledContentKeyObject MakeOecEntitledKey( OEMCrypto_EntitledContentKeyObject MakeOecEntitledKey(
const CryptoKey& input_key, std::string& message); const CryptoKey& input_key, std::string& message);
std::map<std::string, CryptoKey> entitled_keys_; // Find the CryptoKey for the given entitled content key id.
std::map<KeyId, CryptoKey> entitled_keys_;
// Find the current entitled content key id for the given entitlement key id.
std::map<KeyId, KeyId> current_loaded_content_keys_;
}; };
} // namespace wvcdm } // namespace wvcdm

46
libwvdrmengine/cdm/core/src/entitlement_key_session.cpp
View File

@@ -5,8 +5,10 @@
#include "entitlement_key_session.h" #include "entitlement_key_session.h"
#include "crypto_key.h" #include "crypto_key.h"
#include "crypto_session.h"
#include "log.h" #include "log.h"
namespace wvcdm { namespace wvcdm {
EntitlementKeySession::EntitlementKeySession(CryptoSessionId oec_session_id, EntitlementKeySession::EntitlementKeySession(CryptoSessionId oec_session_id,
metrics::CryptoMetrics* metrics) metrics::CryptoMetrics* metrics)
@@ -43,30 +45,40 @@ OEMCryptoResult EntitlementKeySession::LoadEntitledContentKeys(
OEMCryptoResult EntitlementKeySession::SelectKey(const std::string& key_id, OEMCryptoResult EntitlementKeySession::SelectKey(const std::string& key_id,
CdmCipherMode cipher_mode) { CdmCipherMode cipher_mode) {
// Before the key can be selected, it must be loaded under its associated
// entitlement key. This could, in theory, be done ahead of time during
// LoadEntitledContentKeys(), but OEMCrypto v14 only supports one content key
// per entitlement key at a time, (b/110266851) so we must swap out for the
// correct key every time SelectKey() is called.
if (entitled_keys_.find(key_id) == entitled_keys_.end()) { if (entitled_keys_.find(key_id) == entitled_keys_.end()) {
LOGE("Unknown entitled key ID selected."); LOGE("Unknown entitled key ID selected.");
return OEMCrypto_ERROR_NO_CONTENT_KEY; return OEMCrypto_ERROR_NO_CONTENT_KEY;
} }
std::string message; CryptoKey entitled_content_key = entitled_keys_[key_id];
OEMCrypto_EntitledContentKeyObject entitled_key = if (current_loaded_content_keys_[entitled_content_key
MakeOecEntitledKey(entitled_keys_[key_id], message); .entitlement_key_id()] != key_id) {
// Before the key can be selected, it must be loaded under its associated
// entitlement key. This could, in theory, be done ahead of time during
// LoadEntitledContentKeys(), but OEMCrypto v14 only supports one content
// key per entitlement key at a time, (b/110266851) so we must swap out for
// the correct key every time the current content key id has changed for an
// entitlement key.
std::string message;
OEMCrypto_EntitledContentKeyObject entitled_key =
MakeOecEntitledKey(entitled_content_key, message);
OEMCryptoResult result = OEMCrypto_SUCCESS;
M_TIME(
result = OEMCrypto_LoadEntitledContentKeys(
oec_session_id_, reinterpret_cast<const uint8_t*>(message.data()),
message.size(), 1, &entitled_key),
metrics_, oemcrypto_load_entitled_keys_, result);
if (result != OEMCrypto_SUCCESS) {
return result;
}
OEMCryptoResult result = OEMCrypto_SUCCESS; current_loaded_content_keys_[entitled_content_key.entitlement_key_id()] =
M_TIME(result = OEMCrypto_LoadEntitledContentKeys( key_id;
oec_session_id_, reinterpret_cast<const uint8_t*>(message.data()),
message.size(), 1, &entitled_key), return ContentKeySession::SelectKey(key_id, cipher_mode);
metrics_, oemcrypto_load_entitled_keys_, result); } else {
if (result != OEMCrypto_SUCCESS) { return OEMCrypto_SUCCESS;
return result;
} }
return ContentKeySession::SelectKey(key_id, cipher_mode);
} }
OEMCrypto_EntitledContentKeyObject EntitlementKeySession::MakeOecEntitledKey( OEMCrypto_EntitledContentKeyObject EntitlementKeySession::MakeOecEntitledKey(