Add support for encrypted WebM files as defined in the RFC.

media/crypto/aes_decryptor.h

Index: media/crypto/aes_decryptor.h
diff --git a/media/crypto/aes_decryptor.h b/media/crypto/aes_decryptor.h
index d62528f0fa73beeedf61e39596b2856e9548196c..bc140754c3635a5fb61d6a2d5059e30634863844 100644
--- a/media/crypto/aes_decryptor.h
+++ b/media/crypto/aes_decryptor.h
@@ -2,15 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MEDIA_CRYPTO_AES_DECRYPTOR_H_
-#define MEDIA_CRYPTO_AES_DECRYPTOR_H_
+#ifndef MEDIA_CRYPTO_HMAC_AES_DECRYPTOR_H_
+#define MEDIA_CRYPTO_HMAC_AES_DECRYPTOR_H_
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/hash_tables.h"
-#include "base/memory/ref_counted.h"
+#include "base/memory/scoped_ptr.h"
 #include "base/synchronization/lock.h"
+#include "media/base/decoder_buffer.h"
 #include "media/base/media_export.h"
 
 namespace crypto {
@@ -19,14 +20,24 @@ class SymmetricKey;
 
 namespace media {
 
-class DecoderBuffer;
+//class DecoderBuffer;
 
-// Decrypts AES encrypted buffer into unencrypted buffer.
-class MEDIA_EXPORT AesDecryptor {
+// Checks the integrity of the encrypted data and decrypts the AES encrypted
+// buffer into an unencrypted buffer.
+class MEDIA_EXPORT HmacAesDecryptor {
  public:
-  AesDecryptor();
-  ~AesDecryptor();
+  // The size is from the WebM encrypted specification. Current WebM
+  // encrypted request for comments specification is here
+  // http://wiki.webmproject.org/encryption/webm-encryption-rfc
+  static const int kSha1DigestSize = 20;
+  static const int kKeySize = 16;
+  static const char kHmacSeed[];
+  static const char kEncryptionSeed[];
 
+  HmacAesDecryptor();
+  ~HmacAesDecryptor();
+
+  // Decryptor implementation.
   // Add a |key_id| and |key| pair to the key system. The key is not limited to
   // a decryption key. It can be any data that the key system accepts, such as
   // a license. If multiple calls of this function set different keys for the
@@ -34,22 +45,47 @@ class MEDIA_EXPORT AesDecryptor {
   void AddKey(const uint8* key_id, int key_id_size,
               const uint8* key, int key_size);
 
-  // Decrypt |input| buffer. The |input| should not be NULL.
-  // Return a DecoderBuffer with the decrypted data if decryption succeeded.
-  // Return NULL if decryption failed.
+  // Check and Decrypt |input| buffer. The |input| should not be NULL.
+  // Return a DecoderBuffer with the decrypted data if the check and
+  // decryption succeeded. Return NULL if check or decryption failed.
+  // TODO(fgalligan): Do we need to differentiate between a check failure
+  // and a decryption failure?
   scoped_refptr<DecoderBuffer> Decrypt(
       const scoped_refptr<DecoderBuffer>& input);
 
  private:
-  // KeyMap owns the crypto::SymmetricKey* and must delete them when they are
+  // Helper class that manages the HMAC and encryption keys.
+  class HmacEncryptionKeys {
+   public:
+    explicit HmacEncryptionKeys(const std::string& secret);
+    ~HmacEncryptionKeys();
+
+    // Creates the HMAC and encryption key.
+    bool Init();
+
+    std::string hmac_key() { return hmac_key_; }
+    crypto::SymmetricKey* encryption_key() { return encryption_key_.get(); }
+
+   private:
+    // The base secret that is used to derive the HMAC and encryption keys.
+    const std::string secret_;
+
+    // The key used to perform the intergrity check.
+    std::string hmac_key_;
+
+    // The key used to decrypt the data.
+    scoped_ptr<crypto::SymmetricKey> encryption_key_;
+  };
+
+  // KeysMap owns the HmacEncryptionKeys* and must delete them when they are
   // not needed any more.
-  typedef base::hash_map<std::string, crypto::SymmetricKey*> KeyMap;
-  KeyMap key_map_;
+  typedef base::hash_map<std::string, HmacEncryptionKeys*> KeysMap;
+  KeysMap keys_map_;
   base::Lock lock_;
 
-  DISALLOW_COPY_AND_ASSIGN(AesDecryptor);
+  DISALLOW_COPY_AND_ASSIGN(HmacAesDecryptor);
 };
 
 }  // namespace media
 
-#endif  // MEDIA_CRYPTO_AES_DECRYPTOR_H_
+#endif  // MEDIA_CRYPTO_HMAC_AES_DECRYPTOR_H_