Update unit tests to use UAT.

Change-Id: Id12eaf7d97c04f153e968c60d67b1237f1a35d21
This commit is contained in:
Joey Parrish
2014-11-07 17:57:25 -08:00
parent ff1fc36560
commit 5318232d46

View File

@@ -29,7 +29,7 @@
using wvcdm::scoped_ptr; using wvcdm::scoped_ptr;
static const int kTestPolicyRenewalDelaySeconds = 60; static const int kTestPolicyRenewalDelaySeconds = 180;
static const int kDelayWaitToForRenewalMessageSeconds = 2; static const int kDelayWaitToForRenewalMessageSeconds = 2;
static const int kHttpOk = 200; static const int kHttpOk = 200;
@@ -482,31 +482,31 @@ class WvCdmApiTest : public testing::Test {
// Key ID of key used to encrypt the test content. // Key ID of key used to encrypt the test content.
// This is used by the secure layer to look up the content key // This is used by the secure layer to look up the content key
data.key_id = wvcdm::a2bs_hex("E02562E04CD55351B14B3D748D36ED8E"); data.key_id = wvcdm::a2bs_hex("371ea35e1a985d75d198a7f41020dc23");
// Dummy encrypted data. // Dummy encrypted data.
data.encrypt_data = wvcdm::a2b_hex( data.encrypt_data = wvcdm::a2b_hex(
"3b2cbde084973539329bd5656da22d20396249bf4a18a51c38c4743360cc9fea" "64ab17b3e3dfab47245c7cce4543d4fc7a26dcf248f19f9b59f3c92601440b36"
"a1c78d53de1bd7e14dc5d256fd20a57178a98b83804258c239acd7aa38f2d7d2" "17c8ed0c96c656549e461f38708cd47a434066f8df28ccc28b79252eee3f9c2d"
"eca614965b3d22049e19e236fc1800e60965d8b36415677bf2f843d50a6943c4" "7f6c68ebe40141fe818fe082ca523c03d69ddaf183a93c022327fedc5582c5ab"
"683c07c114a32f5e5fbc9939c483c3a1b2ecd3d82b554d649798866191724283" "ca9d342b71263a67f9cb2336f12108aaaef464f17177e44e9b0c4e56e61da53c"
"f0ab082eba2da79aaca5c4eaf186f9ee9a0c568f621f705a578f30e4e2ef7b96" "2150b4405cc82d994dfd9bf4087c761956d6688a9705db4cf350381085f383c4"
"5e14cc046ce6dbf272ee5558b098f332333e95fc879dea6c29bf34acdb649650" "9666d4aed135c519c1f0b5cba06e287feea96ea367bf54e7368dcf998276c6e4"
"f08201b9e649960f2493fd7677cc3abf5ae70e5445845c947ba544456b431646" "6497e0c50e20fef74e42cb518fe7f22ef27202428688f86404e8278587017012"
"d95a133bff5f57614dda5e4446cd8837901d074149dadf4b775b5b07bb88ca20"); "c1d65537c6cbd7dde04aae338d68115a9f430afc100ab83cdadf45dca39db685");
data.iv = wvcdm::a2b_hex("4cca615fc013102892f91efee936639b"); data.iv = wvcdm::a2b_hex("f6f4b1e600a5b67813ed2bded913ba9f");
data.block_offset = 0; data.block_offset = 0;
// Expected decrypted data. // Expected decrypted data.
data.decrypt_data = wvcdm::a2b_hex( data.decrypt_data = wvcdm::a2b_hex(
"5a36c0b633b58faf22156d78fdfb608e54a8095788b2b0463ef78d030b4abf82" "217ce9bde99bd91e9733a1a00b9b557ac3a433dc92633546156817fae26b6e1c"
"eff34b8d9b7b6352e7d72de991b599662aa475da355033620152e2356ebfadee" "942ac20a89ff79f4c2f25fba99d6a44618a8c0420b27d54e3da17b77c9d43cca"
"06172be9e1058fa177e223b9fdd191380cff53c3ea810c6fd852a1df4967b799" "595d259a1e4a8b6d7744cd98c5d3f921adc252eb7d8af6b916044b676a574747"
"415179a2276ec388ef763bab89605b9c6952c28dc8d6bf86b03fabbb46b392a3" "8df21fdc42f166880d97a2225cd5c9ea5e7b752f4cf81bbdbe98e542ee10e1c6"
"1dad15be602eeeeabb45070b3e25d6bb0217073b1fc44c9fe848594121fd6a91" "ad868a6ac55c10d564fc23b8acff407daaf4ed2743520e02cda9680d9ea88e91"
"304d605e21f69615e1b57db18312b6b948725724b74e91d8aea7371e99532469" "029359c4cf5906b6ab5bf60fbb3f1a1c7c59acfc7e4fb4ad8e623c04d503a3dd"
"1b358bdee873f1936b63efe83d190a53c2d21754d302d63ff285174023473755" "4884604c8da8a53ce33db9ff8f1c5bb6bb97f37b39906bf41596555c1bcce9ed"
"58b938c2e3ca4c2ce48942da97f9e45797f2c074ac6004734e93784a48af6160"); "08a899cd760ff0899a1170c2f224b9c52997a0785b7fe170805fd3e8b1127659");
cdm::InputBuffer buf; cdm::InputBuffer buf;
@@ -548,41 +548,50 @@ class WvCdmApiTest : public testing::Test {
// Key ID of key used to encrypt the test content. // Key ID of key used to encrypt the test content.
// This is used by the secure layer to look up the content key // This is used by the secure layer to look up the content key
data.key_id = wvcdm::a2bs_hex("E02562E04CD55351B14B3D748D36ED8E"); data.key_id = wvcdm::a2bs_hex("371ea35e1a985d75d198a7f41020dc23");
// Dummy encrypted data. This is a combination of clear and // Dummy encrypted data. This is a combination of clear and
// encrypted data. // encrypted data.
data.encrypt_data = wvcdm::a2b_hex( data.encrypt_data = wvcdm::a2b_hex(
"5a36c0b633b58faf22156d78fdfb608e54a8095788b2b0463ef78d030b4abf82" // subsample 0
"3b2cbde084973539329bd5656da22d20396249bf4a18a51c38c4743360cc9fea" "abcdef"
"a1c78d53de1bd7e14dc5d256fd20a57178a98b83804258c239acd7aa38f2d7d2" "53cc758763904ea5870458e6b23d36db1e6d7f7aaa2f3eeebb5393a7264991e7"
"5a36c0" "ce4f57b198326e1a208a821799b2a29c90567ab57321b06e51fc20dc9bc5fc55"
"eca614965b" "10720a8bb1f5e002c3e50ff70d2d806a9432cad237050d09581f5b0d59b00090"
"58b938c2e3ca4c2ce4" "b3ad69b4087f5a155b17e13c44d33fa007475d207fc4ac2ef3b571ecb9"
"3d22049e19e236fc1800e60965d8b36415677bf2f843d50a6943c4" // subsample 1
"683c07c114a32f5e5fbc9939c483c3a1b2ecd3d82b554d649798866191724283" "0123456789"
"f0ab082eba2da79aaca5c4eaf186f9ee9a0c568f621f705a578f30e4e2ef7b96" "f3c852"
"5e14cc046ce6dbf272ee5558b098f332333e95fc879dea6c29bf34acdb649650" "ce00dc4806f0c6856ae1732e20308096478e1d822d75c2bb768119565d3bd6e6"
"f08201b9e649960f2493fd7677cc3abf5ae70e5445845c947ba544456b431646" "901e36164f4802355ee758fc46ef6cf5f852dd5256c7b1e5f96d29"
"d95a133bff5f57614dda5e4446cd8837901d074149dadf4b775b5b07bb88ca20"); // subsample 2
"deadbeefbaadf00d"
data.iv = wvcdm::a2b_hex("4cca615fc013102892f91efee936639b"); "3b20525d5e"
"78b8e5aa344d5c4e425e67ddf889ea7c4bb1d49af67eba67718b765e0a940402"
"8d306f4ce693ad6dc0a931d507fa14fff4d293d4170280b3e0fca2d628f722e8"
);
data.iv = wvcdm::a2b_hex("6ba18dd40f49da7f64c368e4db43fc88");
data.block_offset = 0; data.block_offset = 0;
// Expected decrypted data. // Expected decrypted data.
data.decrypt_data = wvcdm::a2b_hex( data.decrypt_data = wvcdm::a2b_hex(
"5a36c0b633b58faf22156d78fdfb608e54a8095788b2b0463ef78d030b4abf82" // subsample 0
"5a36c0b633b58faf22156d78fdfb608e54a8095788b2b0463ef78d030b4abf82" "abcdef"
"eff34b8d9b7b6352e7d72de991b599662aa475da355033620152e2356ebfadee" "52e65334501acadf78e2b26460def3ac973771ed7c64001a2e82917342a7eab3"
"5a36c0" "047f5e85449692fae8f677be425a47bdea850df5a3ffff17043afb1f2b437ab2"
"06172be9e1" "b1d5e0784c4ed8f97fc24b8f565e85ed63fb7d1365980d9aea7b8b58f488f83c"
"58b938c2e3ca4c2ce4" "1ce80b6096c60f3b113c988ff185b26e798da8fc6f327e4ff00e4b3fbf"
"058fa177e223b9fdd191380cff53c3ea810c6fd852a1df4967b799" // subsample 1
"415179a2276ec388ef763bab89605b9c6952c28dc8d6bf86b03fabbb46b392a3" "0123456789"
"1dad15be602eeeeabb45070b3e25d6bb0217073b1fc44c9fe848594121fd6a91" "b1ed0a"
"304d605e21f69615e1b57db18312b6b948725724b74e91d8aea7371e99532469" "a054bce40ccb0ebc70b181d1a12055f46ac55e29c7c2473a29d2a366d240ec48"
"1b358bdee873f1936b63efe83d190a53c2d21754d302d63ff285174023473755" "7cede274f012813a877f99159e7062b6a37cfc9327a7bc2195814e"
"58b938c2e3ca4c2ce48942da97f9e45797f2c074ac6004734e93784a48af6160"); // subsample 2
"deadbeefbaadf00d"
"653b818d1d"
"4ab9a9128361d8ca6a9d2766df5c096ee29f4f5204febdf217a94a5b560cd692"
"cc36d3e071df789fdeac2fb7ec6dcd7af94bb1f85c22025b25e702e38212b927"
);
cdm::InputBuffer buf; cdm::InputBuffer buf;
@@ -594,11 +603,9 @@ class WvCdmApiTest : public testing::Test {
buf.iv_size = data.iv.size(); buf.iv_size = data.iv.size();
buf.data_offset = 0; buf.data_offset = 0;
std::vector<cdm::SubsampleEntry> sub; std::vector<cdm::SubsampleEntry> sub;
sub.push_back(cdm::SubsampleEntry(32, 64)); sub.push_back(cdm::SubsampleEntry(3, 125));
sub.push_back(cdm::SubsampleEntry(3, 5)); sub.push_back(cdm::SubsampleEntry(5, 62));
sub.push_back( sub.push_back(cdm::SubsampleEntry(8, 69));
cdm::SubsampleEntry(9,
data.encrypt_data.size() - (32 + 64 + 3 + 5 + 9)));
buf.subsamples = &sub[0]; buf.subsamples = &sub[0];
buf.num_subsamples = sub.size(); buf.num_subsamples = sub.size();
buf.timestamp = 10; buf.timestamp = 10;
@@ -630,40 +637,50 @@ class WvCdmApiTest : public testing::Test {
// Key ID of key used to encrypt the test content. // Key ID of key used to encrypt the test content.
// This is used by the secure layer to look up the content key // This is used by the secure layer to look up the content key
data.key_id = wvcdm::a2bs_hex("E02562E04CD55351B14B3D748D36ED8E"); data.key_id = wvcdm::a2bs_hex("371ea35e1a985d75d198a7f41020dc23");
// Dummy encrypted data. This is a combination of clear and // Dummy encrypted data. This is a combination of clear and
// encrypted data. // encrypted data.
data.encrypt_data = wvcdm::a2b_hex( data.encrypt_data = wvcdm::a2b_hex(
"5a36c0b633b58faf22156d78fdfb608e54a8095788b2b0463ef78d030b4abf82" // subsample 0
"3b2cbde084973539329bd5656da22d20396249bf4a18a51c38c4743360cc9fea" "abcdef"
"a1c78d53de1bd7e14dc5d256fd20a57178a98b83804258c239acd7aa38f2d7d2" "53cc758763904ea5870458e6b23d36db1e6d7f7aaa2f3eeebb5393a7264991e7"
"5a36c0" "ce4f57b198326e1a208a821799b2a29c90567ab57321b06e51fc20dc9bc5fc55"
"eca614965b" "10720a8bb1f5e002c3e50ff70d2d806a9432cad237050d09581f5b0d59b00090"
"58b938c2e3ca4c2ce4" "b3ad69b4087f5a155b17e13c44d33fa007475d207fc4ac2ef3b571ecb9"
"3d22049e19e236fc1800e60965d8b36415677bf2f843d50a6943c4" // subsample 1
"683c07c114a32f5e5fbc9939c483c3a1b2ecd3d82b554d649798866191724283" "0123456789"
"f0ab082eba2da79aaca5c4eaf186f9ee9a0c568f621f705a578f30e4e2ef7b96" "f3c852"
"5e14cc046ce6dbf272ee5558b098f332333e95fc879dea6c29bf34acdb649650" "ce00dc4806f0c6856ae1732e20308096478e1d822d75c2bb768119565d3bd6e6"
"f08201b9e649960f2493fd7677cc3abf5ae70e5445845c947ba544456b431646" "901e36164f4802355ee758fc46ef6cf5f852dd5256c7b1e5f96d29"
"d95a133bff5f57614dda5e4446cd8837901d074149dadf4b775b5b07bb88ca20"); // subsample 2
data.iv = wvcdm::a2b_hex("4cca615fc013102892f91efee936639b"); "deadbeefbaadf00d"
"3b20525d5e"
"78b8e5aa344d5c4e425e67ddf889ea7c4bb1d49af67eba67718b765e0a940402"
"8d306f4ce693ad6dc0a931d507fa14fff4d293d4170280b3e0fca2d628f722e8"
);
data.iv = wvcdm::a2b_hex("6ba18dd40f49da7f64c368e4db43fc88");
data.block_offset = 0; data.block_offset = 0;
// Expected decrypted data. // Expected decrypted data.
data.decrypt_data = wvcdm::a2b_hex( data.decrypt_data = wvcdm::a2b_hex(
"5a36c0b633b58faf22156d78fdfb608e54a8095788b2b0463ef78d030b4abf82" // subsample 0
"5a36c0b633b58faf22156d78fdfb608e54a8095788b2b0463ef78d030b4abf82" "abcdef"
"eff34b8d9b7b6352e7d72de991b599662aa475da355033620152e2356ebfadee" "52e65334501acadf78e2b26460def3ac973771ed7c64001a2e82917342a7eab3"
"5a36c0" "047f5e85449692fae8f677be425a47bdea850df5a3ffff17043afb1f2b437ab2"
"06172be9e1" "b1d5e0784c4ed8f97fc24b8f565e85ed63fb7d1365980d9aea7b8b58f488f83c"
"58b938c2e3ca4c2ce4" "1ce80b6096c60f3b113c988ff185b26e798da8fc6f327e4ff00e4b3fbf"
"058fa177e223b9fdd191380cff53c3ea810c6fd852a1df4967b799" // subsample 1
"415179a2276ec388ef763bab89605b9c6952c28dc8d6bf86b03fabbb46b392a3" "0123456789"
"1dad15be602eeeeabb45070b3e25d6bb0217073b1fc44c9fe848594121fd6a91" "b1ed0a"
"304d605e21f69615e1b57db18312b6b948725724b74e91d8aea7371e99532469" "a054bce40ccb0ebc70b181d1a12055f46ac55e29c7c2473a29d2a366d240ec48"
"1b358bdee873f1936b63efe83d190a53c2d21754d302d63ff285174023473755" "7cede274f012813a877f99159e7062b6a37cfc9327a7bc2195814e"
"58b938c2e3ca4c2ce48942da97f9e45797f2c074ac6004734e93784a48af6160"); // subsample 2
"deadbeefbaadf00d"
"653b818d1d"
"4ab9a9128361d8ca6a9d2766df5c096ee29f4f5204febdf217a94a5b560cd692"
"cc36d3e071df789fdeac2fb7ec6dcd7af94bb1f85c22025b25e702e38212b927"
);
cdm::InputBuffer buf; cdm::InputBuffer buf;
@@ -675,10 +692,9 @@ class WvCdmApiTest : public testing::Test {
buf.iv_size = data.iv.size(); buf.iv_size = data.iv.size();
buf.data_offset = 0; buf.data_offset = 0;
std::vector<cdm::SubsampleEntry> sub; std::vector<cdm::SubsampleEntry> sub;
sub.push_back(cdm::SubsampleEntry(32, 64)); sub.push_back(cdm::SubsampleEntry(3, 125));
sub.push_back(cdm::SubsampleEntry(3, 5)); sub.push_back(cdm::SubsampleEntry(5, 62));
sub.push_back(cdm::SubsampleEntry( sub.push_back(cdm::SubsampleEntry(8, 69));
9, data.encrypt_data.size() - (32 + 64 + 3 + 5 + 9)));
//buf.subsamples = &sub[0]; //buf.subsamples = &sub[0];
//buf.num_subsamples = sub.size(); //buf.num_subsamples = sub.size();
buf.timestamp = 10; buf.timestamp = 10;
@@ -723,31 +739,31 @@ class WvCdmApiTest : public testing::Test {
// Key ID of key used to encrypt the test content. // Key ID of key used to encrypt the test content.
// This is used by the secure layer to look up the content key // This is used by the secure layer to look up the content key
data.key_id = wvcdm::a2bs_hex("E02562E04CD55351B14B3D748D36ED8E"); data.key_id = wvcdm::a2bs_hex("371ea35e1a985d75d198a7f41020dc23");
// Dummy encrypted data. // Dummy encrypted data.
data.encrypt_data = wvcdm::a2b_hex( data.encrypt_data = wvcdm::a2b_hex(
"3b2cbde084973539329bd5656da22d20396249bf4a18a51c38c4743360cc9fea" "64ab17b3e3dfab47245c7cce4543d4fc7a26dcf248f19f9b59f3c92601440b36"
"a1c78d53de1bd7e14dc5d256fd20a57178a98b83804258c239acd7aa38f2d7d2" "17c8ed0c96c656549e461f38708cd47a434066f8df28ccc28b79252eee3f9c2d"
"eca614965b3d22049e19e236fc1800e60965d8b36415677bf2f843d50a6943c4" "7f6c68ebe40141fe818fe082ca523c03d69ddaf183a93c022327fedc5582c5ab"
"683c07c114a32f5e5fbc9939c483c3a1b2ecd3d82b554d649798866191724283" "ca9d342b71263a67f9cb2336f12108aaaef464f17177e44e9b0c4e56e61da53c"
"f0ab082eba2da79aaca5c4eaf186f9ee9a0c568f621f705a578f30e4e2ef7b96" "2150b4405cc82d994dfd9bf4087c761956d6688a9705db4cf350381085f383c4"
"5e14cc046ce6dbf272ee5558b098f332333e95fc879dea6c29bf34acdb649650" "9666d4aed135c519c1f0b5cba06e287feea96ea367bf54e7368dcf998276c6e4"
"f08201b9e649960f2493fd7677cc3abf5ae70e5445845c947ba544456b431646" "6497e0c50e20fef74e42cb518fe7f22ef27202428688f86404e8278587017012"
"d95a133bff5f57614dda5e4446cd8837901d074149dadf4b775b5b07bb88ca20"); "c1d65537c6cbd7dde04aae338d68115a9f430afc100ab83cdadf45dca39db685");
data.iv = wvcdm::a2b_hex("4cca615fc013102892f91efee936639b"); data.iv = wvcdm::a2b_hex("f6f4b1e600a5b67813ed2bded913ba9f");
data.block_offset = 0; data.block_offset = 0;
// Expected decrypted data. // Expected decrypted data.
data.decrypt_data = wvcdm::a2b_hex( data.decrypt_data = wvcdm::a2b_hex(
"5a36c0b633b58faf22156d78fdfb608e54a8095788b2b0463ef78d030b4abf82" "217ce9bde99bd91e9733a1a00b9b557ac3a433dc92633546156817fae26b6e1c"
"eff34b8d9b7b6352e7d72de991b599662aa475da355033620152e2356ebfadee" "942ac20a89ff79f4c2f25fba99d6a44618a8c0420b27d54e3da17b77c9d43cca"
"06172be9e1058fa177e223b9fdd191380cff53c3ea810c6fd852a1df4967b799" "595d259a1e4a8b6d7744cd98c5d3f921adc252eb7d8af6b916044b676a574747"
"415179a2276ec388ef763bab89605b9c6952c28dc8d6bf86b03fabbb46b392a3" "8df21fdc42f166880d97a2225cd5c9ea5e7b752f4cf81bbdbe98e542ee10e1c6"
"1dad15be602eeeeabb45070b3e25d6bb0217073b1fc44c9fe848594121fd6a91" "ad868a6ac55c10d564fc23b8acff407daaf4ed2743520e02cda9680d9ea88e91"
"304d605e21f69615e1b57db18312b6b948725724b74e91d8aea7371e99532469" "029359c4cf5906b6ab5bf60fbb3f1a1c7c59acfc7e4fb4ad8e623c04d503a3dd"
"1b358bdee873f1936b63efe83d190a53c2d21754d302d63ff285174023473755" "4884604c8da8a53ce33db9ff8f1c5bb6bb97f37b39906bf41596555c1bcce9ed"
"58b938c2e3ca4c2ce48942da97f9e45797f2c074ac6004734e93784a48af6160"); "08a899cd760ff0899a1170c2f224b9c52997a0785b7fe170805fd3e8b1127659");
cdm::InputBuffer buf; cdm::InputBuffer buf;
@@ -791,40 +807,50 @@ class WvCdmApiTest : public testing::Test {
// Key ID of key used to encrypt the test content. // Key ID of key used to encrypt the test content.
// This is used by the secure layer to look up the content key // This is used by the secure layer to look up the content key
data.key_id = wvcdm::a2bs_hex("E02562E04CD55351B14B3D748D36ED8E"); data.key_id = wvcdm::a2bs_hex("371ea35e1a985d75d198a7f41020dc23");
// Dummy encrypted data. This is a combination of clear and // Dummy encrypted data. This is a combination of clear and
// encrypted data. // encrypted data.
data.encrypt_data = wvcdm::a2b_hex( data.encrypt_data = wvcdm::a2b_hex(
"5a36c0b633b58faf22156d78fdfb608e54a8095788b2b0463ef78d030b4abf82" // subsample 0
"3b2cbde084973539329bd5656da22d20396249bf4a18a51c38c4743360cc9fea" "abcdef"
"a1c78d53de1bd7e14dc5d256fd20a57178a98b83804258c239acd7aa38f2d7d2" "53cc758763904ea5870458e6b23d36db1e6d7f7aaa2f3eeebb5393a7264991e7"
"5a36c0" "ce4f57b198326e1a208a821799b2a29c90567ab57321b06e51fc20dc9bc5fc55"
"eca614965b" "10720a8bb1f5e002c3e50ff70d2d806a9432cad237050d09581f5b0d59b00090"
"58b938c2e3ca4c2ce4" "b3ad69b4087f5a155b17e13c44d33fa007475d207fc4ac2ef3b571ecb9"
"3d22049e19e236fc1800e60965d8b36415677bf2f843d50a6943c4" // subsample 1
"683c07c114a32f5e5fbc9939c483c3a1b2ecd3d82b554d649798866191724283" "0123456789"
"f0ab082eba2da79aaca5c4eaf186f9ee9a0c568f621f705a578f30e4e2ef7b96" "f3c852"
"5e14cc046ce6dbf272ee5558b098f332333e95fc879dea6c29bf34acdb649650" "ce00dc4806f0c6856ae1732e20308096478e1d822d75c2bb768119565d3bd6e6"
"f08201b9e649960f2493fd7677cc3abf5ae70e5445845c947ba544456b431646" "901e36164f4802355ee758fc46ef6cf5f852dd5256c7b1e5f96d29"
"d95a133bff5f57614dda5e4446cd8837901d074149dadf4b775b5b07bb88ca20"); // subsample 2
data.iv = wvcdm::a2b_hex("4cca615fc013102892f91efee936639b"); "deadbeefbaadf00d"
"3b20525d5e"
"78b8e5aa344d5c4e425e67ddf889ea7c4bb1d49af67eba67718b765e0a940402"
"8d306f4ce693ad6dc0a931d507fa14fff4d293d4170280b3e0fca2d628f722e8"
);
data.iv = wvcdm::a2b_hex("6ba18dd40f49da7f64c368e4db43fc88");
data.block_offset = 0; data.block_offset = 0;
// Expected decrypted data. // Expected decrypted data.
data.decrypt_data = wvcdm::a2b_hex( data.decrypt_data = wvcdm::a2b_hex(
"5a36c0b633b58faf22156d78fdfb608e54a8095788b2b0463ef78d030b4abf82" // subsample 0
"5a36c0b633b58faf22156d78fdfb608e54a8095788b2b0463ef78d030b4abf82" "abcdef"
"eff34b8d9b7b6352e7d72de991b599662aa475da355033620152e2356ebfadee" "52e65334501acadf78e2b26460def3ac973771ed7c64001a2e82917342a7eab3"
"5a36c0" "047f5e85449692fae8f677be425a47bdea850df5a3ffff17043afb1f2b437ab2"
"06172be9e1" "b1d5e0784c4ed8f97fc24b8f565e85ed63fb7d1365980d9aea7b8b58f488f83c"
"58b938c2e3ca4c2ce4" "1ce80b6096c60f3b113c988ff185b26e798da8fc6f327e4ff00e4b3fbf"
"058fa177e223b9fdd191380cff53c3ea810c6fd852a1df4967b799" // subsample 1
"415179a2276ec388ef763bab89605b9c6952c28dc8d6bf86b03fabbb46b392a3" "0123456789"
"1dad15be602eeeeabb45070b3e25d6bb0217073b1fc44c9fe848594121fd6a91" "b1ed0a"
"304d605e21f69615e1b57db18312b6b948725724b74e91d8aea7371e99532469" "a054bce40ccb0ebc70b181d1a12055f46ac55e29c7c2473a29d2a366d240ec48"
"1b358bdee873f1936b63efe83d190a53c2d21754d302d63ff285174023473755" "7cede274f012813a877f99159e7062b6a37cfc9327a7bc2195814e"
"58b938c2e3ca4c2ce48942da97f9e45797f2c074ac6004734e93784a48af6160"); // subsample 2
"deadbeefbaadf00d"
"653b818d1d"
"4ab9a9128361d8ca6a9d2766df5c096ee29f4f5204febdf217a94a5b560cd692"
"cc36d3e071df789fdeac2fb7ec6dcd7af94bb1f85c22025b25e702e38212b927"
);
cdm::InputBuffer buf; cdm::InputBuffer buf;
@@ -836,10 +862,9 @@ class WvCdmApiTest : public testing::Test {
buf.iv_size = data.iv.size(); buf.iv_size = data.iv.size();
buf.data_offset = 0; buf.data_offset = 0;
std::vector<cdm::SubsampleEntry> sub; std::vector<cdm::SubsampleEntry> sub;
sub.push_back(cdm::SubsampleEntry(32, 64)); sub.push_back(cdm::SubsampleEntry(3, 125));
sub.push_back(cdm::SubsampleEntry(3, 5)); sub.push_back(cdm::SubsampleEntry(5, 62));
sub.push_back(cdm::SubsampleEntry( sub.push_back(cdm::SubsampleEntry(8, 69));
9, data.encrypt_data.size() - (32 + 64 + 3 + 5 + 9)));
buf.subsamples = &sub[0]; buf.subsamples = &sub[0];
buf.num_subsamples = sub.size(); buf.num_subsamples = sub.size();
buf.timestamp = 10; buf.timestamp = 10;
@@ -869,39 +894,49 @@ class WvCdmApiTest : public testing::Test {
// Key ID of key used to encrypt the test content. // Key ID of key used to encrypt the test content.
// This is used by the secure layer to look up the content key // This is used by the secure layer to look up the content key
data.key_id = wvcdm::a2bs_hex("E02562E04CD55351B14B3D748D36ED8E"); data.key_id = wvcdm::a2bs_hex("371ea35e1a985d75d198a7f41020dc23");
// Dummy encrypted data. // Dummy encrypted data.
data.encrypt_data = wvcdm::a2b_hex( data.encrypt_data = wvcdm::a2b_hex(
"5a36c0b633b58faf22156d78fdfb608e54a8095788b2b0463ef78d030b4abf82" // subsample 0
"3b2cbde084973539329bd5656da22d20396249bf4a18a51c38c4743360cc9fea" "abcdef"
"a1c78d53de1bd7e14dc5d256fd20a57178a98b83804258c239acd7aa38f2d7d2" "53cc758763904ea5870458e6b23d36db1e6d7f7aaa2f3eeebb5393a7264991e7"
"5a36c0" "ce4f57b198326e1a208a821799b2a29c90567ab57321b06e51fc20dc9bc5fc55"
"eca614965b" "10720a8bb1f5e002c3e50ff70d2d806a9432cad237050d09581f5b0d59b00090"
"58b938c2e3ca4c2ce4" "b3ad69b4087f5a155b17e13c44d33fa007475d207fc4ac2ef3b571ecb9"
"3d22049e19e236fc1800e60965d8b36415677bf2f843d50a6943c4" // subsample 1
"683c07c114a32f5e5fbc9939c483c3a1b2ecd3d82b554d649798866191724283" "0123456789"
"f0ab082eba2da79aaca5c4eaf186f9ee9a0c568f621f705a578f30e4e2ef7b96" "f3c852"
"5e14cc046ce6dbf272ee5558b098f332333e95fc879dea6c29bf34acdb649650" "ce00dc4806f0c6856ae1732e20308096478e1d822d75c2bb768119565d3bd6e6"
"f08201b9e649960f2493fd7677cc3abf5ae70e5445845c947ba544456b431646" "901e36164f4802355ee758fc46ef6cf5f852dd5256c7b1e5f96d29"
"d95a133bff5f57614dda5e4446cd8837901d074149dadf4b775b5b07bb88ca20"); // subsample 2
data.iv = wvcdm::a2b_hex("4cca615fc013102892f91efee936639b"); "deadbeefbaadf00d"
"3b20525d5e"
"78b8e5aa344d5c4e425e67ddf889ea7c4bb1d49af67eba67718b765e0a940402"
"8d306f4ce693ad6dc0a931d507fa14fff4d293d4170280b3e0fca2d628f722e8"
);
data.iv = wvcdm::a2b_hex("6ba18dd40f49da7f64c368e4db43fc88");
data.block_offset = 0; data.block_offset = 0;
// Expected decrypted data. // Expected decrypted data.
data.decrypt_data = wvcdm::a2b_hex( data.decrypt_data = wvcdm::a2b_hex(
"5a36c0b633b58faf22156d78fdfb608e54a8095788b2b0463ef78d030b4abf82" // subsample 0
"5a36c0b633b58faf22156d78fdfb608e54a8095788b2b0463ef78d030b4abf82" "abcdef"
"eff34b8d9b7b6352e7d72de991b599662aa475da355033620152e2356ebfadee" "52e65334501acadf78e2b26460def3ac973771ed7c64001a2e82917342a7eab3"
"5a36c0" "047f5e85449692fae8f677be425a47bdea850df5a3ffff17043afb1f2b437ab2"
"06172be9e1" "b1d5e0784c4ed8f97fc24b8f565e85ed63fb7d1365980d9aea7b8b58f488f83c"
"58b938c2e3ca4c2ce4" "1ce80b6096c60f3b113c988ff185b26e798da8fc6f327e4ff00e4b3fbf"
"058fa177e223b9fdd191380cff53c3ea810c6fd852a1df4967b799" // subsample 1
"415179a2276ec388ef763bab89605b9c6952c28dc8d6bf86b03fabbb46b392a3" "0123456789"
"1dad15be602eeeeabb45070b3e25d6bb0217073b1fc44c9fe848594121fd6a91" "b1ed0a"
"304d605e21f69615e1b57db18312b6b948725724b74e91d8aea7371e99532469" "a054bce40ccb0ebc70b181d1a12055f46ac55e29c7c2473a29d2a366d240ec48"
"1b358bdee873f1936b63efe83d190a53c2d21754d302d63ff285174023473755" "7cede274f012813a877f99159e7062b6a37cfc9327a7bc2195814e"
"58b938c2e3ca4c2ce48942da97f9e45797f2c074ac6004734e93784a48af6160"); // subsample 2
"deadbeefbaadf00d"
"653b818d1d"
"4ab9a9128361d8ca6a9d2766df5c096ee29f4f5204febdf217a94a5b560cd692"
"cc36d3e071df789fdeac2fb7ec6dcd7af94bb1f85c22025b25e702e38212b927"
);
cdm::InputBuffer buf; cdm::InputBuffer buf;
@@ -913,10 +948,9 @@ class WvCdmApiTest : public testing::Test {
buf.iv_size = data.iv.size(); buf.iv_size = data.iv.size();
buf.data_offset = 0; buf.data_offset = 0;
std::vector<cdm::SubsampleEntry> sub; std::vector<cdm::SubsampleEntry> sub;
sub.push_back(cdm::SubsampleEntry(32, 64)); sub.push_back(cdm::SubsampleEntry(3, 125));
sub.push_back(cdm::SubsampleEntry(3, 5)); sub.push_back(cdm::SubsampleEntry(5, 62));
sub.push_back(cdm::SubsampleEntry( sub.push_back(cdm::SubsampleEntry(8, 69));
9, data.encrypt_data.size() - (32 + 64 + 3 + 5 + 9)));
buf.timestamp = 10; buf.timestamp = 10;
cdm::Status status; cdm::Status status;
@@ -1178,7 +1212,7 @@ int main(int argc, char** argv) {
::testing::InitGoogleTest(&argc, argv); ::testing::InitGoogleTest(&argc, argv);
wvcdm::InitLogging(argc, argv); wvcdm::InitLogging(argc, argv);
wvcdm::ConfigTestEnv config(wvcdm::kGooglePlayServer); wvcdm::ConfigTestEnv config(wvcdm::kContentProtectionServer);
g_client_auth.assign(config.client_auth()); g_client_auth.assign(config.client_auth());
g_wrong_key_id.assign(config.wrong_key_id()); g_wrong_key_id.assign(config.wrong_key_id());