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

media/crypto/aes_decryptor_unittest.cc

Index: media/crypto/aes_decryptor_unittest.cc
diff --git a/media/crypto/aes_decryptor_unittest.cc b/media/crypto/aes_decryptor_unittest.cc
index 814bd6c420baa7805f5bf7498026ee85005fa048..c918eff41467e4249e85b7f9f0904b9ddf25098d 100644
--- a/media/crypto/aes_decryptor_unittest.cc
+++ b/media/crypto/aes_decryptor_unittest.cc
@@ -5,10 +5,12 @@
 #include <string>
 
 #include "base/basictypes.h"
+#include "base/sys_byteorder.h"
 #include "media/base/decoder_buffer.h"
 #include "media/base/decrypt_config.h"
 #include "media/base/mock_filters.h"
 #include "media/crypto/aes_decryptor.h"
+#include "media/webm/webm_constants.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using ::testing::_;
@@ -19,85 +21,218 @@ using ::testing::StrNe;
 
 namespace media {
 
-static const char kClearKeySystem[] = "org.w3.clearkey";
-static const uint8 kInitData[] = { 0x69, 0x6e, 0x69, 0x74 };
-// |kEncryptedData| is encrypted from |kOriginalData| using |kRightKey|.
-// Modifying any of these independently would fail the test.
-static const uint8 kOriginalData[] = {
-  0x4f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x61, 0x6c,
-  0x20, 0x64, 0x61, 0x74, 0x61, 0x2e
-};
-static const uint8 kEncryptedData[] = {
-  0x82, 0x3A, 0x76, 0x92, 0xEC, 0x7F, 0xF8, 0x85,
-  0xEC, 0x23, 0x52, 0xFB, 0x19, 0xB1, 0xB9, 0x09
+// |encrypted_data| is encrypted from |plain_text| using |key|. |key_id| is
+// used to distinguish |key|.
+struct WebmEncryptedData {
+  uint8 plain_text[32];
+  int plain_text_size;
+  uint8 key_id[32];
+  int key_id_size;
+  uint8 key[32];
+  int key_size;
+  uint8 encrypted_data[64];
+  int encrypted_data_size;
 };
-static const uint8 kRightKey[] = {
-  0x41, 0x20, 0x77, 0x6f, 0x6e, 0x64, 0x65, 0x72,
-  0x66, 0x75, 0x6c, 0x20, 0x6b, 0x65, 0x79, 0x21
+
+static const char kClearKeySystem[] = "org.w3.clearkey";
+
+// Frames 0 & 1 are encrypted with the same key. Frame 2 is encrypted with a
+// different key.
+const WebmEncryptedData kEncryptedFrames[] = {

[ddorwin, 2012/07/13 00:48:00]

We should probably change all these frame constants to contain "WebM" in the
name.

[fgalligan1, 2012/07/13 21:40:41]

Done.

+  {
+    // plaintext
+    "Original data.", 14,
+    // key_id
+    { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+      0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
+      0x10, 0x11, 0x12, 0x13,
+      }, 20,
+    // key
+    { 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b,
+      0x1c, 0x1d, 0x1e, 0x1f, 0x20, 0x21, 0x22, 0x23,
+      }, 16,
+    // encrypted_data
+    { 0xfb, 0xe7, 0x1d, 0xbb, 0x4c, 0x23, 0xce, 0xba,
+      0xcc, 0xf8, 0xda, 0xc0, 0xff, 0xff, 0xff, 0xff,
+      0xff, 0xff, 0xff, 0xff, 0x99, 0xaa, 0xff, 0xb7,
+      0x74, 0x02, 0x4e, 0x1c, 0x75, 0x3d, 0xee, 0xcb,
+      0x64, 0xf7,
+      }, 34,
+  },
+  {
+    // plaintext
+    "Changed Original data.", 22,
+    // key_id
+    { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+      0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
+      0x10, 0x11, 0x12, 0x13,
+      }, 20,
+    // key
+    { 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b,
+      0x1c, 0x1d, 0x1e, 0x1f, 0x20, 0x21, 0x22, 0x23,
+      }, 16,
+    // encrypted_data
+    { 0x43, 0xe4, 0x78, 0x7a, 0x43, 0xe1, 0x49, 0xbb,
+      0x44, 0x38, 0xdf, 0xfc, 0x00, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0x00, 0x00, 0xec, 0x8e, 0x87, 0x21,
+      0xd3, 0xb9, 0x1c, 0x61, 0xf6, 0x5a, 0x60, 0xaa,
+      0x07, 0x0e, 0x96, 0xd0, 0x54, 0x5d, 0x35, 0x9a,
+      0x4a, 0xd3,
+      }, 42,
+  },
+  {
+    // plaintext
+    "Original data.", 14,
+    // key_id
+    { 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2a, 0x2b,
+      0x2c, 0x2d, 0x2e, 0x2f, 0x30,
+      }, 13,
+    // key
+    { 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38,
+      0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f, 0x40,
+      }, 16,
+    // encrypted_data
+    { 0xd9, 0x43, 0x30, 0xfd, 0x82, 0x77, 0x62, 0x04,
+      0x08, 0xc2, 0x48, 0x89, 0x00, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0x00, 0x01, 0x48, 0x5e, 0x4a, 0x41,
+      0x2a, 0x8b, 0xf4, 0xc6, 0x47, 0x54, 0x90, 0x34,
+      0xf4, 0x8b,
+      }, 34,
+  },
 };
+
 static const uint8 kWrongKey[] = {
   0x49, 0x27, 0x6d, 0x20, 0x61, 0x20, 0x77, 0x72,
   0x6f, 0x6e, 0x67, 0x20, 0x6b, 0x65, 0x79, 0x2e
 };
 static const uint8 kWrongSizedKey[] = { 0x20, 0x20 };
-static const uint8 kKeyId1[] = {
-  0x4b, 0x65, 0x79, 0x20, 0x49, 0x44, 0x20, 0x31
+
+// This is the encrypted data from frame 0 of |kEncryptedFrames| except byte 0
+// is changed from 0xfb to 0xfc. Bytes 0-11 of WebM encrypted data contains the
+// HMAC.
+static const unsigned char kFrame0HmacDataChanged[] = {
+  0xfc, 0xe7, 0x1d, 0xbb, 0x4c, 0x23, 0xce, 0xba,
+  0xcc, 0xf8, 0xda, 0xc0, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0x99, 0xaa, 0xff, 0xb7,
+  0x74, 0x02, 0x4e, 0x1c, 0x75, 0x3d, 0xee, 0xcb,
+  0x64, 0xf7
 };
-static const uint8 kKeyId2[] = {
-  0x4b, 0x65, 0x79, 0x20, 0x49, 0x44, 0x20, 0x32
+
+// This is the encrypted data from frame 0 of |kEncryptedFrames| except byte 12
+// is changed from 0xff to 0x0f. Bytes 12-19 of WebM encrypted data contains the
+// IV.
+static const unsigned char kFrame0IvDataChanged[] = {
+  0xfb, 0xe7, 0x1d, 0xbb, 0x4c, 0x23, 0xce, 0xba,
+  0xcc, 0xf8, 0xda, 0xc0, 0x0f, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0x99, 0xaa, 0xff, 0xb7,
+  0x74, 0x02, 0x4e, 0x1c, 0x75, 0x3d, 0xee, 0xcb,
+  0x64, 0xf7
+};
+
+// This is the encrypted data from frame 0 of |kEncryptedFrames| except byte 33
+// is changed from 0xf7 to 0xf8. Bytes 20+ of WebM encrypted data contains the
+// encrypted frame.
+static const unsigned char kFrame0FrameDataChanged[] = {
+  0xfb, 0xe7, 0x1d, 0xbb, 0x4c, 0x23, 0xce, 0xba,
+  0xcc, 0xf8, 0xda, 0xc0, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0x99, 0xaa, 0xff, 0xb7,
+  0x74, 0x02, 0x4e, 0x1c, 0x75, 0x3d, 0xee, 0xcb,
+  0x64, 0xf8
 };
 
 class AesDecryptorTest : public testing::Test {
  public:
-  AesDecryptorTest() : decryptor_(&client_) {
-    encrypted_data_ = DecoderBuffer::CopyFrom(kEncryptedData,
-                                              arraysize(kEncryptedData));
-  }
+  AesDecryptorTest() : decryptor_(&client_) {}
 
  protected:
-  void GenerateKeyRequest() {
+  // Returns a 16 byte CTR counter block. The CTR counter block format is a
+  // CTR IV appended with a CTR block counter. |iv| is a CTR IV. |iv_size| is
+  // the size of |iv| in bytes.
+  static std::string GenerateCounterBlock(const uint8* iv, int iv_size) {

[ddorwin, 2012/07/13 00:48:00]

Why is this here now? Does AesDecryptor assume 16 bytes now? Do we check that?
Has the meaning of the DecryptConfig parameter changed? I don't recall seeing
any comments about that.

[fgalligan1, 2012/07/13 21:40:41]

I was debating whether I should add this function here or just define the WebM
IV in the last patch. I added the function here because this test is also
performing some tasks handled in the demuxer with creating the encrypted buffer.
I could define the data such that it will look more like when it comes form the
demuxer. I.e. the encrypted data will only the IV and the data, not the HMAC.  

As for the comments, I added a comment to the patch message, but I also added a
comment to DecryptConfig now. 

[ddorwin, 2012/07/14 00:50:31]

What comment is that?
If they are really all counter blocks, should we rename the parameters to
DecryptConfig? I guess that might make it CTR-specific, but all of this is right
now.

[fgalligan1, 2012/07/16 23:51:42]

The issue is ISO named this IV in CENC where the CTR RFC calls this Counter
Block. I'm fine with calling it counter block. I'm also fine with leaving it as
it is.  

+    const int kDecryptionKeySize = 16;
+    CHECK_GT(iv_size, 0);
+    CHECK_LE(iv_size, kDecryptionKeySize);
+    char counter_block_data[kDecryptionKeySize];
+
+    // Set the IV.
+    memcpy(counter_block_data, iv, iv_size);
+
+    // Set block counter to all 0's.
+    memset(counter_block_data + iv_size, 0, kDecryptionKeySize - iv_size);
+
+    return std::string(counter_block_data, kDecryptionKeySize);
+  }
+
+  // Creates a WebM encrypted buffer that the demuxer would pass to the
+  // decryptor. |data| is the payload of a WebM encrypted Block. |key_id| is
+  // initialization data from the WebM file. Every encrypted Block has
+  // an HMAC and IV prepended to an encrypted frame. Current encrypted WebM
+  // request for comments specification is here
+  // http://wiki.webmproject.org/encryption/webm-encryption-rfc
+  scoped_refptr<DecoderBuffer> CreateWebMEncryptedBuffer(const uint8* data,
+                                                         int data_size,
+                                                         const uint8* key_id,
+                                                         int key_id_size) {
+    scoped_refptr<DecoderBuffer> encrypted_buffer = DecoderBuffer::CopyFrom(
+        data + kWebMHmacSize, data_size - kWebMHmacSize);
+    CHECK(encrypted_buffer);
+
+    uint64 network_iv;
+    memcpy(&network_iv, data + kWebMHmacSize, sizeof(network_iv));
+    const uint64 iv = base::NetToHost64(network_iv);
+    std::string webm_iv =
+        GenerateCounterBlock(reinterpret_cast<const uint8*>(&iv), sizeof(iv));
+    encrypted_buffer->SetDecryptConfig(
+        scoped_ptr<DecryptConfig>(new DecryptConfig(
+            key_id, key_id_size,
+            reinterpret_cast<const uint8*>(webm_iv.data()), webm_iv.size(),
+            data, kWebMHmacSize,
+            sizeof(iv))));
+    return encrypted_buffer;
+  }
+
+  void GenerateKeyRequest(const uint8* key_id, int key_id_size) {
     EXPECT_CALL(client_, KeyMessageMock(kClearKeySystem, StrNe(std::string()),
                                         NotNull(), Gt(0), ""))
         .WillOnce(SaveArg<1>(&session_id_string_));
-    decryptor_.GenerateKeyRequest(kClearKeySystem,
-                                  kInitData, arraysize(kInitData));
+    decryptor_.GenerateKeyRequest(kClearKeySystem, key_id, key_id_size);
   }
 
-  template <int KeyIdSize, int KeySize>
-  void AddKeyAndExpectToSucceed(const uint8 (&key_id)[KeyIdSize],
-                                const uint8 (&key)[KeySize]) {
+  void AddKeyAndExpectToSucceed(const uint8* key_id, int key_id_size,
+                                const uint8* key, int key_size) {
     EXPECT_CALL(client_, KeyAdded(kClearKeySystem, session_id_string_));
-    decryptor_.AddKey(kClearKeySystem, key, KeySize, key_id, KeyIdSize,
+    decryptor_.AddKey(kClearKeySystem, key, key_size, key_id, key_id_size,
                       session_id_string_);
   }
 
-  template <int KeyIdSize, int KeySize>
-  void AddKeyAndExpectToFail(const uint8 (&key_id)[KeyIdSize],
-                             const uint8 (&key)[KeySize]) {
+  void AddKeyAndExpectToFail(const uint8* key_id, int key_id_size,
+                             const uint8* key, int key_size) {
     EXPECT_CALL(client_, KeyError(kClearKeySystem, session_id_string_,
                                   Decryptor::kUnknownError, 0));
-    decryptor_.AddKey(kClearKeySystem, key, KeySize, key_id, KeyIdSize,
+    decryptor_.AddKey(kClearKeySystem, key, key_size, key_id, key_id_size,
                       session_id_string_);
   }
 
-  template <int KeyIdSize>
-  void SetKeyIdForEncryptedData(const uint8 (&key_id)[KeyIdSize]) {
-    encrypted_data_->SetDecryptConfig(
-        scoped_ptr<DecryptConfig>(new DecryptConfig(key_id, KeyIdSize)));
-  }
-
-  void DecryptAndExpectToSucceed() {
+  void DecryptAndExpectToSucceed(const uint8* data, int data_size,
+                                 const uint8* plain_text,
+                                 int plain_text_size,
+                                 const uint8* key_id, int key_id_size) {
+    scoped_refptr<DecoderBuffer> encrypted_data =
+        CreateWebMEncryptedBuffer(data, data_size, key_id, key_id_size);
     scoped_refptr<DecoderBuffer> decrypted =
-        decryptor_.Decrypt(encrypted_data_);
+        decryptor_.Decrypt(encrypted_data);
     ASSERT_TRUE(decrypted);
-    int data_length = sizeof(kOriginalData);
-    ASSERT_EQ(data_length, decrypted->GetDataSize());
-    EXPECT_EQ(0, memcmp(kOriginalData, decrypted->GetData(), data_length));
+    ASSERT_EQ(plain_text_size, decrypted->GetDataSize());
+    EXPECT_EQ(0, memcmp(plain_text, decrypted->GetData(), plain_text_size));
   }
 
-  void DecryptAndExpectToFail() {
+  void DecryptAndExpectToFail(const uint8* data, int data_size,
+                              const uint8* plain_text, int plain_text_size,
+                              const uint8* key_id, int key_id_size) {
+    scoped_refptr<DecoderBuffer> encrypted_data =
+        CreateWebMEncryptedBuffer(data, data_size, key_id, key_id_size);
     scoped_refptr<DecoderBuffer> decrypted =
-        decryptor_.Decrypt(encrypted_data_);
+        decryptor_.Decrypt(encrypted_data);
     EXPECT_FALSE(decrypted);
   }
 
@@ -108,39 +243,129 @@ class AesDecryptorTest : public testing::Test {
 };
 
 TEST_F(AesDecryptorTest, NormalDecryption) {
-  GenerateKeyRequest();
-  AddKeyAndExpectToSucceed(kKeyId1, kRightKey);
-  SetKeyIdForEncryptedData(kKeyId1);
-  ASSERT_NO_FATAL_FAILURE(DecryptAndExpectToSucceed());
+  const WebmEncryptedData& frame = kEncryptedFrames[0];
+  GenerateKeyRequest(frame.key_id, frame.key_id_size);
+  AddKeyAndExpectToSucceed(frame.key_id, frame.key_id_size,
+                           frame.key, frame.key_size);
+  ASSERT_NO_FATAL_FAILURE(DecryptAndExpectToSucceed(frame.encrypted_data,
+                                                    frame.encrypted_data_size,
+                                                    frame.plain_text,
+                                                    frame.plain_text_size,
+                                                    frame.key_id,
+                                                    frame.key_id_size));
 }
 
 TEST_F(AesDecryptorTest, WrongKey) {
-  GenerateKeyRequest();
-  AddKeyAndExpectToSucceed(kKeyId1, kWrongKey);
-  SetKeyIdForEncryptedData(kKeyId1);
-  ASSERT_NO_FATAL_FAILURE(DecryptAndExpectToFail());
-}
-
-TEST_F(AesDecryptorTest, MultipleKeys) {
-  GenerateKeyRequest();
-  AddKeyAndExpectToSucceed(kKeyId1, kRightKey);
-  AddKeyAndExpectToSucceed(kKeyId2, kWrongKey);
-  SetKeyIdForEncryptedData(kKeyId1);
-  ASSERT_NO_FATAL_FAILURE(DecryptAndExpectToSucceed());
+  const WebmEncryptedData& frame = kEncryptedFrames[0];
+  GenerateKeyRequest(frame.key_id, frame.key_id_size);
+  AddKeyAndExpectToSucceed(frame.key_id, frame.key_id_size,
+                           kWrongKey, arraysize(kWrongKey));
+  ASSERT_NO_FATAL_FAILURE(DecryptAndExpectToFail(frame.encrypted_data,
+                                                 frame.encrypted_data_size,
+                                                 frame.plain_text,
+                                                 frame.plain_text_size,
+                                                 frame.key_id,
+                                                 frame.key_id_size));
 }
 
 TEST_F(AesDecryptorTest, KeyReplacement) {
-  GenerateKeyRequest();
-  SetKeyIdForEncryptedData(kKeyId1);
-  AddKeyAndExpectToSucceed(kKeyId1, kWrongKey);
-  ASSERT_NO_FATAL_FAILURE(DecryptAndExpectToFail());
-  AddKeyAndExpectToSucceed(kKeyId1, kRightKey);
-  ASSERT_NO_FATAL_FAILURE(DecryptAndExpectToSucceed());
+  const WebmEncryptedData& frame = kEncryptedFrames[0];
+  GenerateKeyRequest(frame.key_id, frame.key_id_size);
+  AddKeyAndExpectToSucceed(frame.key_id, frame.key_id_size,
+                           kWrongKey, arraysize(kWrongKey));
+  ASSERT_NO_FATAL_FAILURE(DecryptAndExpectToFail(frame.encrypted_data,
+                                                 frame.encrypted_data_size,
+                                                 frame.plain_text,
+                                                 frame.plain_text_size,
+                                                 frame.key_id,
+                                                 frame.key_id_size));
+  AddKeyAndExpectToSucceed(frame.key_id, frame.key_id_size,
+                           frame.key, frame.key_size);
+  ASSERT_NO_FATAL_FAILURE(DecryptAndExpectToSucceed(frame.encrypted_data,
+                                                    frame.encrypted_data_size,
+                                                    frame.plain_text,
+                                                    frame.plain_text_size,
+                                                    frame.key_id,
+                                                    frame.key_id_size));
 }
 
 TEST_F(AesDecryptorTest, WrongSizedKey) {
-  GenerateKeyRequest();
-  AddKeyAndExpectToFail(kKeyId1, kWrongSizedKey);
+  const WebmEncryptedData& frame = kEncryptedFrames[0];
+  GenerateKeyRequest(frame.key_id, frame.key_id_size);
+  AddKeyAndExpectToFail(frame.key_id, frame.key_id_size,
+                        kWrongSizedKey, arraysize(kWrongSizedKey));
+}
+
+TEST_F(AesDecryptorTest, MultipleKeysAndFrames) {
+  const WebmEncryptedData& frame = kEncryptedFrames[0];
+  GenerateKeyRequest(frame.key_id, frame.key_id_size);
+  AddKeyAndExpectToSucceed(frame.key_id, frame.key_id_size,
+                           frame.key, frame.key_size);
+  ASSERT_NO_FATAL_FAILURE(DecryptAndExpectToSucceed(frame.encrypted_data,
+                                                    frame.encrypted_data_size,
+                                                    frame.plain_text,
+                                                    frame.plain_text_size,
+                                                    frame.key_id,
+                                                    frame.key_id_size));
+
+  const WebmEncryptedData& frame2 = kEncryptedFrames[2];
+  GenerateKeyRequest(frame2.key_id, frame2.key_id_size);
+  AddKeyAndExpectToSucceed(frame2.key_id, frame2.key_id_size,
+                           frame2.key, frame2.key_size);
+
+  const WebmEncryptedData& frame1 = kEncryptedFrames[1];
+  ASSERT_NO_FATAL_FAILURE(DecryptAndExpectToSucceed(frame1.encrypted_data,
+                                                    frame1.encrypted_data_size,
+                                                    frame1.plain_text,
+                                                    frame1.plain_text_size,
+                                                    frame1.key_id,
+                                                    frame1.key_id_size));
+
+  ASSERT_NO_FATAL_FAILURE(DecryptAndExpectToSucceed(frame2.encrypted_data,
+                                                    frame2.encrypted_data_size,
+                                                    frame2.plain_text,
+                                                    frame2.plain_text_size,
+                                                    frame2.key_id,
+                                                    frame2.key_id_size));
+}
+
+TEST_F(AesDecryptorTest, HmacCheckFailure) {
+  const WebmEncryptedData& frame = kEncryptedFrames[0];
+  GenerateKeyRequest(frame.key_id, frame.key_id_size);
+  AddKeyAndExpectToSucceed(frame.key_id, frame.key_id_size,
+                           frame.key, frame.key_size);
+  ASSERT_NO_FATAL_FAILURE(DecryptAndExpectToFail(kFrame0HmacDataChanged,
+                                                 frame.encrypted_data_size,
+                                                 frame.plain_text,
+                                                 frame.plain_text_size,
+                                                 frame.key_id,
+                                                 frame.key_id_size));
+}
+
+TEST_F(AesDecryptorTest, IvCheckFailure) {
+  const WebmEncryptedData& frame = kEncryptedFrames[0];
+  GenerateKeyRequest(frame.key_id, frame.key_id_size);
+  AddKeyAndExpectToSucceed(frame.key_id, frame.key_id_size,
+                           frame.key, frame.key_size);
+  ASSERT_NO_FATAL_FAILURE(DecryptAndExpectToFail(kFrame0IvDataChanged,
+                                                 frame.encrypted_data_size,
+                                                 frame.plain_text,
+                                                 frame.plain_text_size,
+                                                 frame.key_id,
+                                                 frame.key_id_size));
+}
+
+TEST_F(AesDecryptorTest, DataCheckFailure) {
+  const WebmEncryptedData& frame = kEncryptedFrames[0];
+  GenerateKeyRequest(frame.key_id, frame.key_id_size);
+  AddKeyAndExpectToSucceed(frame.key_id, frame.key_id_size,
+                           frame.key, frame.key_size);
+  ASSERT_NO_FATAL_FAILURE(DecryptAndExpectToFail(kFrame0FrameDataChanged,
+                                                 frame.encrypted_data_size,
+                                                 frame.plain_text,
+                                                 frame.plain_text_size,
+                                                 frame.key_id,
+                                                 frame.key_id_size));
 }
 
-}  // media
+}  // namespace media