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

Unified Diff: media/cdm/aes_decryptor_unittest.cc

Issue 798583003: Encrypted Media: Check "alg":"A128KW" in AesDecryptor. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix AesDecryptorTest. Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/cdm/aes_decryptor.cc ('k') | media/cdm/json_web_key.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/cdm/aes_decryptor_unittest.cc
diff --git a/media/cdm/aes_decryptor_unittest.cc b/media/cdm/aes_decryptor_unittest.cc
index dc0b4db8ec2e827b5c84f26e35a51148963e3c6f..6af82d719ffb44a7c991ac56fbc18c37a23089b1 100644
--- a/media/cdm/aes_decryptor_unittest.cc
+++ b/media/cdm/aes_decryptor_unittest.cc
@@ -55,6 +55,7 @@ const char kKeyAsJWK[] =
" \"keys\": ["
" {"
" \"kty\": \"oct\","
+ " \"alg\": \"A128KW\","
" \"kid\": \"AAECAw\","
" \"k\": \"BAUGBwgJCgsMDQ4PEBESEw\""
" }"
@@ -68,6 +69,7 @@ const char kKeyAlternateAsJWK[] =
" \"keys\": ["
" {"
" \"kty\": \"oct\","
+ " \"alg\": \"A128KW\","
" \"kid\": \"AAECAw\","
" \"k\": \"FBUWFxgZGhscHR4fICEiIw\""
" }"
@@ -79,6 +81,7 @@ const char kWrongKeyAsJWK[] =
" \"keys\": ["
" {"
" \"kty\": \"oct\","
+ " \"alg\": \"A128KW\","
" \"kid\": \"AAECAw\","
" \"k\": \"7u7u7u7u7u7u7u7u7u7u7g\""
" }"
@@ -90,6 +93,7 @@ const char kWrongSizedKeyAsJWK[] =
" \"keys\": ["
" {"
" \"kty\": \"oct\","
+ " \"alg\": \"A128KW\","
" \"kid\": \"AAECAw\","
" \"k\": \"AAECAw\""
" }"
@@ -136,6 +140,7 @@ const char kKey2AsJWK[] =
" \"keys\": ["
" {"
" \"kty\": \"oct\","
+ " \"alg\": \"A128KW\","
" \"kid\": \"AAECAwQFBgcICQoLDA0ODxAREhM\","
" \"k\": \"FBUWFxgZGhscHR4fICEiIw\""
" }"
@@ -713,6 +718,7 @@ TEST_F(AesDecryptorTest, JWKKey) {
const std::string kJwkSimple =
"{"
" \"kty\": \"oct\","
+ " \"alg\": \"A128KW\","
" \"kid\": \"AAECAwQFBgcICQoLDA0ODxAREhM\","
" \"k\": \"FBUWFxgZGhscHR4fICEiIw\""
"}";
@@ -724,11 +730,13 @@ TEST_F(AesDecryptorTest, JWKKey) {
" \"keys\": ["
" {"
" \"kty\": \"oct\","
+ " \"alg\": \"A128KW\","
" \"kid\": \"AAECAwQFBgcICQoLDA0ODxAREhM\","
" \"k\": \"FBUWFxgZGhscHR4fICEiIw\""
" },"
" {"
" \"kty\": \"oct\","
+ " \"alg\": \"A128KW\","
" \"kid\": \"JCUmJygpKissLS4vMA\","
" \"k\":\"MTIzNDU2Nzg5Ojs8PT4/QA\""
" }"
@@ -773,6 +781,7 @@ TEST_F(AesDecryptorTest, JWKKey) {
" \"keys\": ["
" {"
" \"kty\": \"oct\","
+ " \"alg\": \"A128KW\","
" \"kid\": \"AAECAw\","
" \"k\": \"BAUGBwgJCgsMDQ4PEBESEw==\""
" }"
@@ -786,6 +795,7 @@ TEST_F(AesDecryptorTest, JWKKey) {
" \"keys\": ["
" {"
" \"kty\": \"oct\","
+ " \"alg\": \"A128KW\","
" \"kid\": \"AAECAw==\","
" \"k\": \"BAUGBwgJCgsMDQ4PEBESEw\""
" }"
@@ -799,6 +809,7 @@ TEST_F(AesDecryptorTest, JWKKey) {
" \"keys\": ["
" {"
" \"kty\": \"oct\","
+ " \"alg\": \"A128KW\","
" \"kid\": \"!@#$%^&*()\","
" \"k\": \"BAUGBwgJCgsMDQ4PEBESEw\""
" }"
@@ -814,6 +825,7 @@ TEST_F(AesDecryptorTest, JWKKey) {
" \"keys\": ["
" {"
" \"kty\": \"oct\","
+ " \"alg\": \"A128KW\","
" \"kid\": \"Kiss\","
" \"k\": \"BAUGBwgJCgsMDQ4PEBESEw\""
" }"
@@ -827,6 +839,7 @@ TEST_F(AesDecryptorTest, JWKKey) {
" \"keys\": ["
" {"
" \"kty\": \"oct\","
+ " \"alg\": \"A128KW\","
" \"kid\": \"\","
" \"k\": \"BAUGBwgJCgsMDQ4PEBESEw\""
" }"
« no previous file with comments | « media/cdm/aes_decryptor.cc ('k') | media/cdm/json_web_key.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698