Update key control block logging
Merge from Widevine repo of http://go/wvgerrit/72386 This CL changes reference and testbed OEMCyrpto only. Updates the logging of the key control block for testing by adding new bits to log and cleaning up the format. Also, update access to entitlement keys so that they can also have their key control block logged in tests. Test: reference and test code only. Bug: http://b/113594182 Full Decrypt Path Testing - Top Level Bug: http://b/68648263 Log Key Control Block Change-Id: I259d6f29eceb9f097640aa50f43443e308797f69
This commit is contained in:
@@ -102,18 +102,13 @@ bool EntitlementKeyTable::SetContentKey(
|
||||
return true;
|
||||
}
|
||||
|
||||
bool EntitlementKeyTable::GetEntitlementKey(
|
||||
const KeyId& entitlement_id,
|
||||
const std::vector<uint8_t>** entitlement_key) {
|
||||
if (!entitlement_key) {
|
||||
return false;
|
||||
}
|
||||
EntitlementKey* EntitlementKeyTable::GetEntitlementKey(
|
||||
const KeyId& entitlement_id) {
|
||||
EntitlementKeyMap::iterator it = keys_.find(entitlement_id);
|
||||
if (it == keys_.end()) {
|
||||
return false;
|
||||
return nullptr;
|
||||
}
|
||||
*entitlement_key = &it->second->entitlement_key();
|
||||
return true;
|
||||
return it->second;
|
||||
}
|
||||
|
||||
} // namespace wvoec_ref
|
||||
|
||||
Reference in New Issue
Block a user