}
AesDecryptor::AesDecryptor(const SessionMessageCB& session_message_cb,
- const SessionClosedCB& session_closed_cb)
+ const SessionClosedCB& session_closed_cb,
+ const SessionKeysChangeCB& session_keys_change_cb)
: session_message_cb_(session_message_cb),
- session_closed_cb_(session_closed_cb) {
+ session_closed_cb_(session_closed_cb),
+ session_keys_change_cb_(session_keys_change_cb) {
DCHECK(!session_message_cb_.is_null());
DCHECK(!session_closed_cb_.is_null());
+ DCHECK(!session_keys_change_cb_.is_null());
}
AesDecryptor::~AesDecryptor() {
key_map_.clear();
}
+void AesDecryptor::SetServerCertificate(const uint8* certificate_data,
+ int certificate_data_length,
+ scoped_ptr<SimpleCdmPromise> promise) {
+ promise->reject(
+ NOT_SUPPORTED_ERROR, 0, "SetServerCertificate() is not supported.");
+}
+
void AesDecryptor::CreateSession(const std::string& init_data_type,
const uint8* init_data,
int init_data_length,
// For now, the AesDecryptor does not care about |init_data_type| or
// |session_type|; just resolve the promise and then fire a message event
- // with the |init_data| as the request.
+ // using the |init_data| as the key ID in the license request.
// TODO(jrummell): Validate |init_data_type| and |session_type|.
std::vector<uint8> message;
if (init_data && init_data_length)
- message.assign(init_data, init_data + init_data_length);
+ CreateLicenseRequest(init_data, init_data_length, session_type, &message);
promise->resolve(web_session_id);
response_length);
KeyIdAndKeyPairs keys;
- if (!ExtractKeysFromJWKSet(key_string, &keys)) {
+ SessionType session_type = MediaKeys::TEMPORARY_SESSION;
+ if (!ExtractKeysFromJWKSet(key_string, &keys, &session_type)) {
promise->reject(
INVALID_ACCESS_ERROR, 0, "response is not a valid JSON Web Key Set.");
return;
}
promise->resolve();
+
+ // Assume that at least 1 new key has been successfully added and thus
+ // sending true.
+ session_keys_change_cb_.Run(web_session_id, true);
+}
+
+void AesDecryptor::CloseSession(const std::string& web_session_id,
+ scoped_ptr<SimpleCdmPromise> promise) {
+ // Validate that this is a reference to an active session and then forget it.
+ std::set<std::string>::iterator it = valid_sessions_.find(web_session_id);
+ DCHECK(it != valid_sessions_.end());
+
+ valid_sessions_.erase(it);
+
+ // Close the session.
+ DeleteKeysForSession(web_session_id);
+ promise->resolve();
+ session_closed_cb_.Run(web_session_id);
+}
+
+void AesDecryptor::RemoveSession(const std::string& web_session_id,
+ scoped_ptr<SimpleCdmPromise> promise) {
+ // AesDecryptor doesn't keep any persistent data, so this should be
+ // NOT_REACHED().
+ // TODO(jrummell): Make sure persistent session types are rejected.
+ // http://crbug.com/384152.
+ //
+ // However, v0.1b calls to CancelKeyRequest() will call this, so close the
+ // session, if it exists.
+ // TODO(jrummell): Remove the close() call when prefixed EME is removed.
+ // http://crbug.com/249976.
+ if (valid_sessions_.find(web_session_id) != valid_sessions_.end()) {
+ CloseSession(web_session_id, promise.Pass());
+ return;
+ }
+
+ promise->reject(INVALID_ACCESS_ERROR, 0, "Session does not exist.");
}
void AesDecryptor::GetUsableKeyIds(const std::string& web_session_id,
promise->resolve(keyids);
}
-void AesDecryptor::ReleaseSession(const std::string& web_session_id,
- scoped_ptr<SimpleCdmPromise> promise) {
- // Validate that this is a reference to an active session and then forget it.
- std::set<std::string>::iterator it = valid_sessions_.find(web_session_id);
- // TODO(jrummell): Convert back to a DCHECK once prefixed EME is removed.
- if (it == valid_sessions_.end()) {
- promise->reject(INVALID_ACCESS_ERROR, 0, "Session does not exist.");
- return;
- }
-
- valid_sessions_.erase(it);
-
- // Close the session.
- DeleteKeysForSession(web_session_id);
- promise->resolve();
- session_closed_cb_.Run(web_session_id);
-}
-
Decryptor* AesDecryptor::GetDecryptor() {
return this;
}