Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(386)

Issue 10810026: Add support for encrypted WebM files as defined in the RFC. (Closed)

Created:
8 years, 5 months ago by fgalligan1
Modified:
8 years, 5 months ago
CC:
chromium-reviews, feature-media-reviews_chromium.org, jshin+watch_chromium.org, strobe_
Visibility:
Public.

Description

Add support for encrypted WebM files as defined in the RFC. The WebM parser now reads the HMAC and IV from every encrypted Block and stores that information in the DecryptorConfig object. Added two new elements ContentEncAESSettings and AESSettingsCipherMode used by encrypted WebM files. This is a new code review of https://chromiumcodereview.appspot.com/10535029/ patch set 17 after patch set 16 was reverted. BUG=119845 TEST=media_unittests Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=147654

Patch Set 1 #

Patch Set 2 : Rebase to master. #

Total comments: 1
Unified diffs Side-by-side diffs Delta from patch set Stats (+723 lines, -120 lines) Patch
M media/base/decrypt_config.h View 1 chunk +35 lines, -4 lines 0 comments Download
M media/base/decrypt_config.cc View 1 chunk +17 lines, -3 lines 0 comments Download
M media/crypto/aes_decryptor.h View 3 chunks +43 lines, -3 lines 0 comments Download
M media/crypto/aes_decryptor.cc View 8 chunks +162 lines, -24 lines 1 comment Download
M media/crypto/aes_decryptor_unittest.cc View 4 chunks +297 lines, -71 lines 0 comments Download
M media/filters/ffmpeg_video_decoder_unittest.cc View 1 6 chunks +57 lines, -6 lines 0 comments Download
M media/filters/pipeline_integration_test.cc View 4 chunks +11 lines, -5 lines 0 comments Download
M media/webm/webm_cluster_parser.h View 1 chunk +4 lines, -0 lines 0 comments Download
M media/webm/webm_cluster_parser.cc View 2 chunks +40 lines, -3 lines 0 comments Download
M media/webm/webm_constants.h View 3 chunks +7 lines, -0 lines 0 comments Download
M media/webm/webm_content_encodings.h View 3 chunks +9 lines, -0 lines 0 comments Download
M media/webm/webm_content_encodings.cc View 1 chunk +2 lines, -1 line 0 comments Download
M media/webm/webm_content_encodings_client.cc View 3 chunks +29 lines, -0 lines 0 comments Download
M media/webm/webm_parser.cc View 4 chunks +9 lines, -0 lines 0 comments Download
M media/webm/webm_stream_parser.cc View 1 chunk +1 line, -0 lines 0 comments Download

Messages

Total messages: 5 (0 generated)
xhwang
LGTM FYI, the MockDecryptor CL is in the commit queue. If it's landed first, you ...
8 years, 5 months ago (2012-07-20 00:52:16 UTC) #1
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/fgalligan@chromium.org/10810026/8001
8 years, 5 months ago (2012-07-20 13:38:57 UTC) #2
commit-bot: I haz the power
Change committed as 147654
8 years, 5 months ago (2012-07-20 14:54:12 UTC) #3
Ryan Sleevi
Crypto drive-by https://chromiumcodereview.appspot.com/10810026/diff/8001/media/crypto/aes_decryptor.cc File media/crypto/aes_decryptor.cc (right): https://chromiumcodereview.appspot.com/10810026/diff/8001/media/crypto/aes_decryptor.cc#newcode81 media/crypto/aes_decryptor.cc:81: input.GetDecryptConfig()->checksum_size()) != 0) Note: crypto::HMAC specifically exposes ...
8 years, 5 months ago (2012-07-23 21:50:58 UTC) #4
fgalligan
8 years, 5 months ago (2012-07-24 05:35:00 UTC) #5
Thanks.

I have a CL that uses VerifyTruncated().
https://chromiumcodereview.appspot.com/10800091


On Mon, Jul 23, 2012 at 2:50 PM, <rsleevi@chromium.org> wrote:

> Crypto drive-by
>
>
> https://chromiumcodereview.**appspot.com/10810026/diff/**
>
8001/media/crypto/aes_**decryptor.cc<https://chromiumcodereview.appspot.com/10810026/diff/8001/media/crypto/aes_decryptor.cc>
> File media/crypto/aes_decryptor.cc (right):
>
> https://chromiumcodereview.**appspot.com/10810026/diff/**
>
8001/media/crypto/aes_**decryptor.cc#newcode81<https://chromiumcodereview.appspot.com/10810026/diff/8001/media/crypto/aes_decryptor.cc#newcode81>
> media/crypto/aes_decryptor.cc:**81:
> input.GetDecryptConfig()->**checksum_size()) != 0)
> Note: crypto::HMAC specifically exposes a Verify method to avoid timing
> issues with memcmp that may leak keying material.
>
>
https://chromiumcodereview.**appspot.com/10810026/<https://chromiumcodereview...
>

Powered by Google App Engine
This is Rietveld 408576698