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

Merge "The Entitlement key map was not being cleaned up." into rvc-dev am: bd8e573e0c am: 5bedd9c4ad am: 2308e673b2

Browse Source 
Change-Id: Ie35b9c9c53204a75be5603a3e4f09d3f972415f1
This commit is contained in:
TreeHugger Robot
2020-05-27 04:35:53 +00:00
committed by Automerger Merge Worker
parent 5c24259ece 2308e673b2
commit 743f9971b8
2 changed files with 11 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
libwvdrmengine/oemcrypto/ref/src/oemcrypto_session_key_table.cpp
View File

@@ -11,17 +11,9 @@
namespace wvoec_ref { namespace wvoec_ref {
SessionKeyTable::~SessionKeyTable() {
for (KeyMap::iterator i = keys_.begin(); i != keys_.end(); ++i) {
if (nullptr != i->second) {
delete i->second;
}
}
}
bool SessionKeyTable::Insert(const KeyId key_id, const Key& key_data) { bool SessionKeyTable::Insert(const KeyId key_id, const Key& key_data) {
if (keys_.find(key_id) != keys_.end()) return false; if (keys_.find(key_id) != keys_.end()) return false;
keys_[key_id] = new Key(key_data); keys_[key_id] = std::unique_ptr<Key>(new Key(key_data));
return true; return true;
} }
@@ -29,12 +21,11 @@ Key* SessionKeyTable::Find(const KeyId key_id) {
if (keys_.find(key_id) == keys_.end()) { if (keys_.find(key_id) == keys_.end()) {
return nullptr; return nullptr;
} }
return keys_[key_id]; return keys_[key_id].get();
} }
void SessionKeyTable::Remove(const KeyId key_id) { void SessionKeyTable::Remove(const KeyId key_id) {
if (keys_.find(key_id) != keys_.end()) { if (keys_.find(key_id) != keys_.end()) {
delete keys_[key_id];
keys_.erase(key_id); keys_.erase(key_id);
} }
} }
@@ -49,7 +40,7 @@ bool EntitlementKeyTable::Insert(const KeyId key_id, const Key& key_data) {
// |key_id| and |key_data| are for an entitlement key. Insert a new // |key_id| and |key_data| are for an entitlement key. Insert a new
// entitlement key entry. // entitlement key entry.
if (keys_.find(key_id) != keys_.end()) return false; if (keys_.find(key_id) != keys_.end()) return false;
keys_[key_id] = new EntitlementKey(key_data); keys_[key_id] = std::unique_ptr<EntitlementKey>(new EntitlementKey(key_data));
// If this is a new insertion, we don't have a content key assigned yet. // If this is a new insertion, we don't have a content key assigned yet.
return true; return true;
} }
@@ -65,7 +56,7 @@ Key* EntitlementKeyTable::Find(const KeyId key_id) {
if (keys_.find(it->second) == keys_.end()) { if (keys_.find(it->second) == keys_.end()) {
return nullptr; return nullptr;
} }
return keys_[it->second]; return keys_[it->second].get();
} }
void EntitlementKeyTable::Remove(const KeyId key_id) { void EntitlementKeyTable::Remove(const KeyId key_id) {
@@ -108,7 +99,7 @@ EntitlementKey* EntitlementKeyTable::GetEntitlementKey(
if (it == keys_.end()) { if (it == keys_.end()) {
return nullptr; return nullptr;
} }
return it->second; return it->second.get();
} }
} // namespace wvoec_ref } // namespace wvoec_ref

11
libwvdrmengine/oemcrypto/ref/src/oemcrypto_session_key_table.h
View File

@@ -9,6 +9,7 @@
#include <stdint.h> #include <stdint.h>
#include <map> #include <map>
#include <memory>
#include <vector> #include <vector>
#include "disallow_copy_and_assign.h" #include "disallow_copy_and_assign.h"
@@ -23,18 +24,18 @@ class UsageTable;
class UsageTableEntry; class UsageTableEntry;
typedef std::vector<uint8_t> KeyId; typedef std::vector<uint8_t> KeyId;
typedef std::map<KeyId, Key*> KeyMap; typedef std::map<KeyId, std::unique_ptr<Key>> KeyMap;
typedef std::map<KeyId, EntitlementKey*> EntitlementKeyMap; typedef std::map<KeyId, std::unique_ptr<EntitlementKey>> EntitlementKeyMap;
// SessionKeyTable holds the keys for the current session // SessionKeyTable holds the keys for the current session
class SessionKeyTable { class SessionKeyTable {
public: public:
SessionKeyTable() {} SessionKeyTable() {}
~SessionKeyTable(); ~SessionKeyTable() {}
bool Insert(const KeyId key_id, const Key& key_data); bool Insert(const KeyId key_id, const Key& key_data);
Key* Find(const KeyId key_id); Key* Find(const KeyId key_id);
Key* FirstKey() { return keys_.begin()->second; } Key* FirstKey() { return keys_.begin()->second.get(); }
void Remove(const KeyId key_id); void Remove(const KeyId key_id);
void UpdateDuration(const KeyControlBlock& control); void UpdateDuration(const KeyControlBlock& control);
size_t size() const { return keys_.size(); } size_t size() const { return keys_.size(); }
@@ -53,7 +54,7 @@ class EntitlementKeyTable {
~EntitlementKeyTable() {} ~EntitlementKeyTable() {}
bool Insert(const KeyId key_id, const Key& key_data); bool Insert(const KeyId key_id, const Key& key_data);
Key* Find(const KeyId key_id); Key* Find(const KeyId key_id);
Key* FirstKey() { return keys_.begin()->second; } Key* FirstKey() { return keys_.begin()->second.get(); }
void Remove(const KeyId key_id); void Remove(const KeyId key_id);
void UpdateDuration(const KeyControlBlock& control); void UpdateDuration(const KeyControlBlock& control);
size_t size() const { return contentid_to_entitlementid_.size(); } size_t size() const { return contentid_to_entitlementid_.size(); }