OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "media/cdm/aes_decryptor.h" | 5 #include "media/cdm/aes_decryptor.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 #include <list> | 8 #include <list> |
9 #include <utility> | 9 #include <utility> |
10 #include <vector> | 10 #include <vector> |
(...skipping 543 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
554 KeyIdToSessionKeysMap::iterator key_id_entry = key_map_.find(key_id); | 554 KeyIdToSessionKeysMap::iterator key_id_entry = key_map_.find(key_id); |
555 if (key_id_entry != key_map_.end()) { | 555 if (key_id_entry != key_map_.end()) { |
556 key_id_entry->second->Insert(session_id, std::move(decryption_key)); | 556 key_id_entry->second->Insert(session_id, std::move(decryption_key)); |
557 return true; | 557 return true; |
558 } | 558 } |
559 | 559 |
560 // |key_id| not found, so need to create new entry. | 560 // |key_id| not found, so need to create new entry. |
561 std::unique_ptr<SessionIdDecryptionKeyMap> inner_map( | 561 std::unique_ptr<SessionIdDecryptionKeyMap> inner_map( |
562 new SessionIdDecryptionKeyMap()); | 562 new SessionIdDecryptionKeyMap()); |
563 inner_map->Insert(session_id, std::move(decryption_key)); | 563 inner_map->Insert(session_id, std::move(decryption_key)); |
564 key_map_.add(key_id, std::move(inner_map)); | 564 key_map_[key_id] = std::move(inner_map); |
565 return true; | 565 return true; |
566 } | 566 } |
567 | 567 |
568 AesDecryptor::DecryptionKey* AesDecryptor::GetKey_Locked( | 568 AesDecryptor::DecryptionKey* AesDecryptor::GetKey_Locked( |
569 const std::string& key_id) const { | 569 const std::string& key_id) const { |
570 key_map_lock_.AssertAcquired(); | 570 key_map_lock_.AssertAcquired(); |
571 KeyIdToSessionKeysMap::const_iterator key_id_found = key_map_.find(key_id); | 571 KeyIdToSessionKeysMap::const_iterator key_id_found = key_map_.find(key_id); |
572 if (key_id_found == key_map_.end()) | 572 if (key_id_found == key_map_.end()) |
573 return NULL; | 573 return NULL; |
574 | 574 |
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
616 bool AesDecryptor::DecryptionKey::Init() { | 616 bool AesDecryptor::DecryptionKey::Init() { |
617 CHECK(!secret_.empty()); | 617 CHECK(!secret_.empty()); |
618 decryption_key_ = | 618 decryption_key_ = |
619 crypto::SymmetricKey::Import(crypto::SymmetricKey::AES, secret_); | 619 crypto::SymmetricKey::Import(crypto::SymmetricKey::AES, secret_); |
620 if (!decryption_key_) | 620 if (!decryption_key_) |
621 return false; | 621 return false; |
622 return true; | 622 return true; |
623 } | 623 } |
624 | 624 |
625 } // namespace media | 625 } // namespace media |
OLD | NEW |