Add client information to release and renewal messages

[ Merge of go/wvgerrit/14240 ] Client information is reported in release and renewal messages based on flag in the license. License proto has been updated to match server updates. There are two caveats * Client IDs will be reported unencrypted when usage reports are requested. * Release requests that enable privacy mode (encrypted client IDs) but do not specify a service certificate are not supported. b/19247020 Change-Id: I95e709922122370f310936fbad3d312262128e49
2015-05-04 11:39:57 -07:00
parent 2229e51c18
commit 20fc54e384
14 changed files with 1252 additions and 524 deletions
--- a/libwvdrmengine/cdm/core/test/config_test_env.cpp
+++ b/libwvdrmengine/cdm/core/test/config_test_env.cpp
@@ -5,7 +5,8 @@
 namespace {
 const std::string kWidevineKeySystem = "com.widevine.alpha";

-// Content Protection license server data
+// Content Protection license server (UAT) data
+// For staging server replace url with http://wv-staging-proxy.appspot.com/proxy
 const std::string kCpLicenseServer = "http://widevine-proxy.appspot.com/proxy";
 const std::string kCpClientAuth = "";
 const std::string kCpKeyId =
--- a/libwvdrmengine/cdm/core/test/device_files_unittest.cpp
+++ b/libwvdrmengine/cdm/core/test/device_files_unittest.cpp
@@ -130,6 +130,7 @@ struct LicenseInfo {
  std::string key_release_url;
  int64_t playback_start_time;
  int64_t last_playback_time;
+  std::string app_parameters;
  std::string file_data;
 };

@@ -236,7 +237,7 @@ LicenseInfo license_test_data[] = {
         "0112001A16200342120A106B63746C0000000000ECDCBE0000000020DBDF"
         "A68F051A20182F029E35047A3841FA176C74E5B387350E8D58DEA6878FF0"
         "BEA6CABACA1C2C"),
-     "https://test.google.com/license/GetCencLicense", 0x0, 0x0,
+     "https://test.google.com/license/GetCencLicense", 0x0, 0x0, "",
     wvcdm::a2bs_hex(
         "0AA8150802100122A1150801121408011210303132333435363738394142434445461"
         "A9D0E080112950C0AD70B080112EF090AB002080212103E560EC5335E346F591BC4D0"
@@ -417,8 +418,9 @@ LicenseInfo license_test_data[] = {
         "A68F051A20BDA6A56F7CBFD0942198F87C23A34AA5CBD64AFEB134277774"
         "CCF8E789D815DD"),
     "https://test.google.com/license/GetCencLicense", 0x12345678, 0x12348765,
+     "Name1 Value1",
     wvcdm::a2bs_hex(
-         "0AB0150802100122A9150802121408011210303132333435363738394142434445461"
+         "0AC1150802100122BA150802121408011210303132333435363738394142434445461"
         "A9D0E080112950C0AD70B080112EF090AB002080212103E560EC5335E346F591BC4D0"
         "7A7D507618A5D3A68F05228E023082010A0282010100A947904B8DBD55FB685FDB302"
         "5574517CCCC74EE4FEAF6629D5179A52FF85CE7409528EFFA0E5DFC3DE9A34BA5F08B"
@@ -497,8 +499,8 @@ LicenseInfo license_test_data[] = {
         "106B63746C00000000CA3A6A75000000002083E5A68F051A20BDA6A56F7CBFD094219"
         "8F87C23A34AA5CBD64AFEB134277774CCF8E789D815DD3A2E68747470733A2F2F7465"
         "73742E676F6F676C652E636F6D2F6C6963656E73652F47657443656E634C6963656E7"
-         "36540F8ACD1910148E58ED291011220C47DDCB3FA0DF569B95DD9F46F83608632C93E"
-         "E0EA5C9360D7D537730D028EC6")},
+         "36540F8ACD1910148E58ED29101520F0A054E616D6531120656616C7565311220BE69"
+         "AAB25B481BCAF57B741518D9F9DB8E3A7A6911D10C53D4F4649D78393C65")},

    // license 2
    {"ksidE8C37662C88DC673", DeviceFiles::kLicenseStateReleasing,
@@ -597,9 +599,9 @@ LicenseInfo license_test_data[] = {
         "A68F051A2041EF0A9267D613D17AA90E1D1DA5BE091860E5E296D41D6D0F"
         "75E73660C279B3"),
     "https://test.google.com/license/GetCencLicense", 0x0123456789abcdef,
-     0x123456789abfedc,
+     0x123456789abfedc, "Name1 Value1 Name2 Param2",
     wvcdm::a2bs_hex(
-         "0AB8150802100122B1150802121408011210303132333435363738394142434445461"
+         "0AE7150802100122E0150802121408011210303132333435363738394142434445461"
         "A9D0E080112950C0AD70B080112EF090AB002080212103E560EC5335E346F591BC4D0"
         "7A7D507618A5D3A68F05228E023082010A0282010100A947904B8DBD55FB685FDB302"
         "5574517CCCC74EE4FEAF6629D5179A52FF85CE7409528EFFA0E5DFC3DE9A34BA5F08B"
@@ -678,8 +680,10 @@ LicenseInfo license_test_data[] = {
         "106B63746C000000001FF4944E000000002082E7A68F051A2041EF0A9267D613D17AA"
         "90E1D1DA5BE091860E5E296D41D6D0F75E73660C279B33A2E68747470733A2F2F7465"
         "73742E676F6F676C652E636F6D2F6C6963656E73652F47657443656E634C6963656E7"
-         "36540EF9BAFCDF8ACD1910148DCFDAFCDF8ACD1910112201486F63DAF90694D3C63C8"
-         "EA8D2B68A7592252154A193D4DF8CEA95635EA0543")}};
+         "36540EF9BAFCDF8ACD1910148DCFDAFCDF8ACD1910152150A054E616D6531120C5661"
+         "6C756531204E616D653252160A0C4E616D653220506172616D321206506172616D321"
+         "2203653BA57F16FE28D66D9F7A76128B7AD7F33680815FF70A3684617DE1FBB0F9"
+         "F")}};

 // Sample license data and related data for storage and use for offline
 // playback. The license data and URLs in this test are not real.
@@ -782,7 +786,7 @@ LicenseInfo license_update_test_data[] = {
         "B68F051A2000351030900858FCFD6977B67803ADFD1280AA661E6B0BD30B"
         "08B2C467355129"),
     "https://test.google.com/license/GetCencLicense", 0x0123456789abcdef,
-     0x123456789abfedc,
+     0x123456789abfedc, "Name1 Value1 Name2 Value2 Name3 Value3",
     wvcdm::a2bs_hex(
         "0AB8150802100122B1150801121408011210303132333435363738394142434445461"
         "A9D0E080112950C0AD70B080112EF090AB002080212103E560EC5335E346F591BC4D0"
@@ -867,7 +871,7 @@ LicenseInfo license_update_test_data[] = {
         "126C3222C2E584A50D08EFA75BC4FC091E7034E1DD")},
    // license being released. all fields are identical except for license
    // state and hashed file data
-    {"", DeviceFiles::kLicenseStateReleasing, "", "", "", "", "", "", 0, 0,
+    {"", DeviceFiles::kLicenseStateReleasing, "", "", "", "", "", "", 0, 0, "",
     wvcdm::a2bs_hex(
         "0AB8150802100122B1150802121408011210303132333435363738394142434445461"
         "A9D0E080112950C0AD70B080112EF090AB002080212103E560EC5335E346F591BC4D0"
@@ -951,6 +955,190 @@ LicenseInfo license_update_test_data[] = {
         "36540EF9BAFCDF8ACD1910148DCFDAFCDF8ACD1910112203D8933A735A22FE27AA956"
         "802B597529E8FFCB91A5F3CBBB3CE0C38E4AF3DC88")}};

+// Application parameters were added to the License message. This data
+// is used to verify that a License saved without application parameters can
+// be read out correctly by an updated version of the CDM.
+LicenseInfo license_app_parameters_backwards_compatibility_test_data = {
+
+    "ksid54C57C966E23CEF5", DeviceFiles::kLicenseStateActive,
+    wvcdm::a2bs_hex("0801121030313233343536373839414243444546"),
+    wvcdm::a2bs_hex(
+        "080112950C0AD70B080112EF090AB002080212103E560EC5335E346F591B"
+        "C4D07A7D507618A5D3A68F05228E023082010A0282010100A947904B8DBD"
+        "55FB685FDB3025574517CCCC74EE4FEAF6629D5179A52FF85CE7409528EF"
+        "FA0E5DFC3DE9A34BA5F08BE349553C319A9FB274905A8770ADC9CA4A2CBC"
+        "D8E556A1587FA18BFD4D286C644A6904F19EAAFBDFADD3B371B306D0B289"
+        "F459B491C814B5AD1F747610E990A60248A7DA5152F1CCFC047EF4230013"
+        "1F9C4758F4D9F30579393B860AAD9AD2EE43D721D6DB9F5800EF188386B9"
+        "4825AE05A883AC976D6970DF43EA6C83B86CE6D0F540207725B9890FCCEC"
+        "83A49027872DAFD2740B7748E9C3B1752D6F12859CED07E8882969B433EC"
+        "66F17FFC29AC6FDBEA79230B0FAED5D94CF6B829A420BBE3270323941776"
+        "EE60DD6BFD660BDDCA870203010001288001300112800250D1F8B1ECF849"
+        "B60FF93E37C4DEEF09E6FFB10BCFC996A4A24B7AA96928835ED5A72E1584"
+        "6D0A14015733239BD8B6E6D5E5D229B08394CE1E0692C159C44337CA7CAF"
+        "88476449B068D9D2FADED8EB1BC0F4B8F0FCAF293E8690E7403209534180"
+        "3408A0E8279E545945EE97838FDE7812F7171C3CC4F5ECF9418BBF1D336C"
+        "E58F4CBB1B44D4ADE6BF3364BAE7EC093281846E569E13E7719014030A60"
+        "59044FE7BBFF3E8F5723AEDD54DC6E0D041B309D7700B55575690E95CE60"
+        "85D0914F991C5F45E98CBB9C45BA33F47FD0862EBCC7EEBA8E60643C86E8"
+        "5476B18AEF8DE871571A75681A75F75028A5B58751C09A5296AAE99CEDCD"
+        "9785E9E2103240D40A1AB6050AB002080112102CE5CCF42200D6B5BCCF33"
+        "D7CC2D9C7018EAD1B88D05228E023082010A0282010100BE1B661EEC4700"
+        "DF4B0C83292D02AE029B8A224DD3048125049F74E30E1257FC2BE8D9CFAF"
+        "0BFFCACAF7305351771C78FA451F13AF5EEBFB360941A4396A805833730D"
+        "C6E534C62408B7C5076FC22568021C59ED34F98487196DA32078DAFCA37C"
+        "7CFB8E79612FA384963DF2167D5E87305D7BC92D621C10160672C27B9A69"
+        "1B1534F60D78C5893E40C5FF8A3F9DF8898612E9A5CCB56F4A0CC2A61A7A"
+        "EB04A9DCC015D9BC37DEF2AB9EAA9AAFD838869081D9249755F129BB0DBE"
+        "CA3B894975A65A36FD005CE77CD407E925D3172E33122A11D327968A08F8"
+        "E771FAEB2540EB52D17C4906405F47C31F60F0AF6C78AF53291B236E692B"
+        "506A2AF92AF43E3A81020301000128800130011280033A08A60418E5C81B"
+        "8D71A5C0A28C26999FF4FA992E14107CA8A9E6A2B36259834000FE35DCD8"
+        "14426F9C5D332418ED94C9C0C992217B1B6DC01C99085A3C3956C8267B87"
+        "73BABCF3F2C841C67D830F9DBC780DD68BF4E2FE424C6A54123BE4B2A1F7"
+        "E1F4DB58AB1164DAE9CF75C3392284A44B8CDB85D837E86C6B908243987E"
+        "552C8693878C9A1B7BEA3759783036F1595C406D6CBBA7F8642A9B3B244D"
+        "AA1F00531D0B908ADE4B533FD9FAFA21D0FB0C033D2AD5DDF24C60F4FAC3"
+        "0820758877F2E1A78EB44E9336DCFAFDF572BB22A84A5DEFDF2EB87B61DE"
+        "26EE9C4CEAA646A2AFDB2BB953845E6D7FE6F79A9501D1C379C96961316B"
+        "5D2A66F38C222091AF74141B6CAF93507485A5D8F82808025451824F00C8"
+        "B6A0CD5803F6564584138C8B18BC679B442D837307B5CC90B1FD1FD32288"
+        "B4A5D18D2D80E5E6A7A9EFD255B8B363038BCC67AF534EAEE4A5903E304E"
+        "ED4990BB5BE735DB027A6DE35329D321EC051B956C55A5B11674017517FC"
+        "C3C7FF7397C13A7B7087A1F6AEC7F6761A130A0C636F6D70616E795F6E61"
+        "6D6512034C47451A150A0A6D6F64656C5F6E616D6512074E657875732034"
+        "1A200A116172636869746563747572655F6E616D65120B61726D65616269"
+        "2D7637611A130A0B6465766963655F6E616D6512046D616B6F1A150A0C70"
+        "726F647563745F6E616D6512056F6363616D1A440A0A6275696C645F696E"
+        "666F1236676F6F676C652F6F6363616D2F6D616B6F3A342E332F4A425F4D"
+        "52322F3731343239313A7573657264656275672F6465762D6B6579731A21"
+        "0A096465766963655F696412144C474D4332303132313030353030363339"
+        "32373812250A230A14080112103031323334353637383941424344454610"
+        "021A09393837363534333231180120002A0C333934303739343733370000"
+        "30151A8002734FBDED946EB74A1B61811C4C4A491214F6BEA125A80F0141"
+        "65B28AA97AD0AF60E4D129EB7F424AD659F24E5EED4B702BEE328E38B72C"
+        "A6F38CD0ECFD2E6D7B98147744C9B8A9610B3BDFE17675FF7D584C5BF680"
+        "64B0FE513FC322C9148795E4C2F2443C3024F5C1F29E6FEFB6D77005DAB2"
+        "2CD2B63131908DE4D88795BB931CEA38452CC568BE25032245E372F07A12"
+        "97F51748C7EA02F2C88360AFE7ABBC71DCDD5366126258E5AFA27C2A20B3"
+        "39FA1E7AE925B494B361F6F7116F20BE8EE6E446146027F4FD4300F4A0B0"
+        "A3361EE34925F338D0AACF20AE919B4BAE81C1D57A8D2B8FA38732A57697"
+        "C316C180717C182A971C94E4AC4C7DF8F161CB8CC1"),
+    wvcdm::a2bs_hex(
+        "080212CC020A190A0939383736353433323112084B9F26DAB8B06E112002"
+        "2800124108011801301E4239687474703A2F2F6B69723033666370673137"
+        "342E7769646576696E652E6E65742F7769646576696E652F6367692D6269"
+        "6E2F64726D2E6367691A6612102531DFD6CCEA511D00F8C0172F1189AA1A"
+        "5057FF9D9DBD5A205B1DEB075E4A90467C1E074CDE6071BFF831AD590BD5"
+        "D117614F33CE2C3CE1824FC0D54B36ECEAE58DF5C8F9347C2FEED17A3327"
+        "E8F52B8ECA6313A1FA6A042EB9525DD328113C05F920011A7E0A10303132"
+        "3334353637383941424344454612106D23622142B58F6D1EDD33AF3ECD2C"
+        "7E1A20884EE13BEA9DECDDBF68B532131C82B11CEC4D23C7FA9F3EF4C5EE"
+        "172E7C9736200242340A2050BFE71BB1BA683E35E0B49BB33048E5103FBB"
+        "B9C3E1CD6EBCDA7DD485DBAF431210D69D6F14C95CB6CFDB998E50D00F4D"
+        "A020DBDFA68F051A20AE5D6895E70F86F42F5FE3C58A505A865D05AB94B1"
+        "ABAA6CC59C3322F61C458D228002331F2BE95B5C796E0921CC27A7295501"
+        "DA10044E5CA36C0E2866FF068EA3515A6786BD5D60D74D80C6BA8BE6AAD0"
+        "85AF967909A143171E9CDDE36EA528402867CD04FB6F97A150CDE55F9B81"
+        "9F4104BEF48E4280D76645569E10AEF524D34D865B5B9E3EBC66C45EEBBE"
+        "16AB04493E7AEC4F99E7A99F3FC08FA431BECCC1978A079FA4801DB75E13"
+        "29A9921604E6F80CB148AA2DD5C8348057E9F4FC2AEA57EA4D215D0A8D48"
+        "6294860DFB4F4C42D57D9542B76179E179DD4AA23F9F7B2AE432B39E4CE8"
+        "F156E84877DDA781AAAAFC797FF75AFE2019ADC3A2E419BF0253C705BD47"
+        "97A96866AC4C059AD8F2E9C6B617C60C6ADCDB894C25F0C7D29252F52FD5"),
+    wvcdm::a2bs_hex(
+        "08011231121D1A1B0A190A0939383736353433323112084B9F26DAB8B06E"
+        "112002280018022A0C31353532333030360000000030151A20C30375683C"
+        "4D2033E05DCC95DDFB278CFB5125A021C3C043A16ACC933A768A27"),
+    wvcdm::a2bs_hex(
+        "0802123B0A190A0939383736353433323112084B9F26DAB8B06E11200228"
+        "0112001A16200342120A106B63746C0000000000ECDCBE0000000020DBDF"
+        "A68F051A20182F029E35047A3841FA176C74E5B387350E8D58DEA6878FF0"
+        "BEA6CABACA1C2C"),
+    "https://test.google.com/license/GetCencLicense", 0x0, 0x0, "",
+    wvcdm::a2bs_hex(
+        "0AA8150802100122A1150801121408011210303132333435363738394142434445461"
+        "A9D0E080112950C0AD70B080112EF090AB002080212103E560EC5335E346F591BC4D0"
+        "7A7D507618A5D3A68F05228E023082010A0282010100A947904B8DBD55FB685FDB302"
+        "5574517CCCC74EE4FEAF6629D5179A52FF85CE7409528EFFA0E5DFC3DE9A34BA5F08B"
+        "E349553C319A9FB274905A8770ADC9CA4A2CBCD8E556A1587FA18BFD4D286C644A690"
+        "4F19EAAFBDFADD3B371B306D0B289F459B491C814B5AD1F747610E990A60248A7DA51"
+        "52F1CCFC047EF42300131F9C4758F4D9F30579393B860AAD9AD2EE43D721D6DB9F580"
+        "0EF188386B94825AE05A883AC976D6970DF43EA6C83B86CE6D0F540207725B9890FCC"
+        "EC83A49027872DAFD2740B7748E9C3B1752D6F12859CED07E8882969B433EC66F17FF"
+        "C29AC6FDBEA79230B0FAED5D94CF6B829A420BBE3270323941776EE60DD6BFD660BDD"
+        "CA870203010001288001300112800250D1F8B1ECF849B60FF93E37C4DEEF09E6FFB10"
+        "BCFC996A4A24B7AA96928835ED5A72E15846D0A14015733239BD8B6E6D5E5D229B083"
+        "94CE1E0692C159C44337CA7CAF88476449B068D9D2FADED8EB1BC0F4B8F0FCAF293E8"
+        "690E74032095341803408A0E8279E545945EE97838FDE7812F7171C3CC4F5ECF9418B"
+        "BF1D336CE58F4CBB1B44D4ADE6BF3364BAE7EC093281846E569E13E7719014030A605"
+        "9044FE7BBFF3E8F5723AEDD54DC6E0D041B309D7700B55575690E95CE6085D0914F99"
+        "1C5F45E98CBB9C45BA33F47FD0862EBCC7EEBA8E60643C86E85476B18AEF8DE871571"
+        "A75681A75F75028A5B58751C09A5296AAE99CEDCD9785E9E2103240D40A1AB6050AB0"
+        "02080112102CE5CCF42200D6B5BCCF33D7CC2D9C7018EAD1B88D05228E023082010A0"
+        "282010100BE1B661EEC4700DF4B0C83292D02AE029B8A224DD3048125049F74E30E12"
+        "57FC2BE8D9CFAF0BFFCACAF7305351771C78FA451F13AF5EEBFB360941A4396A80583"
+        "3730DC6E534C62408B7C5076FC22568021C59ED34F98487196DA32078DAFCA37C7CFB"
+        "8E79612FA384963DF2167D5E87305D7BC92D621C10160672C27B9A691B1534F60D78C"
+        "5893E40C5FF8A3F9DF8898612E9A5CCB56F4A0CC2A61A7AEB04A9DCC015D9BC37DEF2"
+        "AB9EAA9AAFD838869081D9249755F129BB0DBECA3B894975A65A36FD005CE77CD407E"
+        "925D3172E33122A11D327968A08F8E771FAEB2540EB52D17C4906405F47C31F60F0AF"
+        "6C78AF53291B236E692B506A2AF92AF43E3A81020301000128800130011280033A08A"
+        "60418E5C81B8D71A5C0A28C26999FF4FA992E14107CA8A9E6A2B36259834000FE35DC"
+        "D814426F9C5D332418ED94C9C0C992217B1B6DC01C99085A3C3956C8267B8773BABCF"
+        "3F2C841C67D830F9DBC780DD68BF4E2FE424C6A54123BE4B2A1F7E1F4DB58AB1164DA"
+        "E9CF75C3392284A44B8CDB85D837E86C6B908243987E552C8693878C9A1B7BEA37597"
+        "83036F1595C406D6CBBA7F8642A9B3B244DAA1F00531D0B908ADE4B533FD9FAFA21D0"
+        "FB0C033D2AD5DDF24C60F4FAC30820758877F2E1A78EB44E9336DCFAFDF572BB22A84"
+        "A5DEFDF2EB87B61DE26EE9C4CEAA646A2AFDB2BB953845E6D7FE6F79A9501D1C379C9"
+        "6961316B5D2A66F38C222091AF74141B6CAF93507485A5D8F82808025451824F00C8B"
+        "6A0CD5803F6564584138C8B18BC679B442D837307B5CC90B1FD1FD32288B4A5D18D2D"
+        "80E5E6A7A9EFD255B8B363038BCC67AF534EAEE4A5903E304EED4990BB5BE735DB027"
+        "A6DE35329D321EC051B956C55A5B11674017517FCC3C7FF7397C13A7B7087A1F6AEC7"
+        "F6761A130A0C636F6D70616E795F6E616D6512034C47451A150A0A6D6F64656C5F6E6"
+        "16D6512074E6578757320341A200A116172636869746563747572655F6E616D65120B"
+        "61726D656162692D7637611A130A0B6465766963655F6E616D6512046D616B6F1A150"
+        "A0C70726F647563745F6E616D6512056F6363616D1A440A0A6275696C645F696E666F"
+        "1236676F6F676C652F6F6363616D2F6D616B6F3A342E332F4A425F4D52322F3731343"
+        "239313A7573657264656275672F6465762D6B6579731A210A096465766963655F6964"
+        "12144C474D433230313231303035303036333932373812250A230A140801121030313"
+        "23334353637383941424344454610021A09393837363534333231180120002A0C3339"
+        "3430373934373337000030151A8002734FBDED946EB74A1B61811C4C4A491214F6BEA"
+        "125A80F014165B28AA97AD0AF60E4D129EB7F424AD659F24E5EED4B702BEE328E38B7"
+        "2CA6F38CD0ECFD2E6D7B98147744C9B8A9610B3BDFE17675FF7D584C5BF68064B0FE5"
+        "13FC322C9148795E4C2F2443C3024F5C1F29E6FEFB6D77005DAB22CD2B63131908DE4"
+        "D88795BB931CEA38452CC568BE25032245E372F07A1297F51748C7EA02F2C88360AFE"
+        "7ABBC71DCDD5366126258E5AFA27C2A20B339FA1E7AE925B494B361F6F7116F20BE8E"
+        "E6E446146027F4FD4300F4A0B0A3361EE34925F338D0AACF20AE919B4BAE81C1D57A8"
+        "D2B8FA38732A57697C316C180717C182A971C94E4AC4C7DF8F161CB8CC122F6040802"
+        "12CC020A190A0939383736353433323112084B9F26DAB8B06E1120022800124108011"
+        "801301E4239687474703A2F2F6B69723033666370673137342E7769646576696E652E"
+        "6E65742F7769646576696E652F6367692D62696E2F64726D2E6367691A6612102531D"
+        "FD6CCEA511D00F8C0172F1189AA1A5057FF9D9DBD5A205B1DEB075E4A90467C1E074C"
+        "DE6071BFF831AD590BD5D117614F33CE2C3CE1824FC0D54B36ECEAE58DF5C8F9347C2"
+        "FEED17A3327E8F52B8ECA6313A1FA6A042EB9525DD328113C05F920011A7E0A103031"
+        "323334353637383941424344454612106D23622142B58F6D1EDD33AF3ECD2C7E1A208"
+        "84EE13BEA9DECDDBF68B532131C82B11CEC4D23C7FA9F3EF4C5EE172E7C9736200242"
+        "340A2050BFE71BB1BA683E35E0B49BB33048E5103FBBB9C3E1CD6EBCDA7DD485DBAF4"
+        "31210D69D6F14C95CB6CFDB998E50D00F4DA020DBDFA68F051A20AE5D6895E70F86F4"
+        "2F5FE3C58A505A865D05AB94B1ABAA6CC59C3322F61C458D228002331F2BE95B5C796"
+        "E0921CC27A7295501DA10044E5CA36C0E2866FF068EA3515A6786BD5D60D74D80C6BA"
+        "8BE6AAD085AF967909A143171E9CDDE36EA528402867CD04FB6F97A150CDE55F9B819"
+        "F4104BEF48E4280D76645569E10AEF524D34D865B5B9E3EBC66C45EEBBE16AB04493E"
+        "7AEC4F99E7A99F3FC08FA431BECCC1978A079FA4801DB75E1329A9921604E6F80CB14"
+        "8AA2DD5C8348057E9F4FC2AEA57EA4D215D0A8D486294860DFB4F4C42D57D9542B761"
+        "79E179DD4AA23F9F7B2AE432B39E4CE8F156E84877DDA781AAAAFC797FF75AFE2019A"
+        "DC3A2E419BF0253C705BD4797A96866AC4C059AD8F2E9C6B617C60C6ADCDB894C25F0"
+        "C7D29252F52FD52A5708011231121D1A1B0A190A0939383736353433323112084B9F2"
+        "6DAB8B06E112002280018022A0C31353532333030360000000030151A20C30375683C"
+        "4D2033E05DCC95DDFB278CFB5125A021C3C043A16ACC933A768A2732610802123B0A1"
+        "90A0939383736353433323112084B9F26DAB8B06E112002280112001A16200342120A"
+        "106B63746C0000000000ECDCBE0000000020DBDFA68F051A20182F029E35047A3841F"
+        "A176C74E5B387350E8D58DEA6878FF0BEA6CABACA1C2C3A2E68747470733A2F2F7465"
+        "73742E676F6F676C652E636F6D2F6C6963656E73652F47657443656E634C6963656E7"
+        "365400048001220CD0599C2B85D9F2D573AC7893CE77CB5A10B326828BA8C89047505"
+        "A8C9B606AC")};
+
 struct UsageInfo {
  std::string provider_session_token;
  std::string license_request;
@@ -1276,6 +1464,25 @@ class DeviceFilesTest : public ::testing::Test {
           data.key_release_url.size() + 2 * sizeof(int64_t);
  }

+  CdmAppParameterMap GetAppParameters(std::string str) {
+    CdmAppParameterMap app_parameters;
+    size_t start_pos = 0;
+    size_t len = str.length();
+    bool more = true;
+    while (start_pos < len) {
+      size_t name_end_pos = str.find(' ', start_pos);
+      if (name_end_pos == std::string::npos) return app_parameters;
+      if (name_end_pos + 1 >= len) return app_parameters;
+      size_t value_end_pos = str.find(' ', name_end_pos + 1);
+      app_parameters[str.substr(start_pos, name_end_pos)] =
+          str.substr(name_end_pos + 1, value_end_pos);
+      if (value_end_pos == std::string::npos || value_end_pos + 1 >= len)
+        return app_parameters;
+      start_pos = value_end_pos + 1;
+    }
+    return app_parameters;
+  }
+
  std::string device_base_path_;
 };

@@ -1284,8 +1491,7 @@ class DeviceFilesStoreTest : public DeviceFilesTest,

 struct CertStorageVariant {
  CertStorageVariant(bool dir_exists_value, const std::string& origin_value)
-      : dir_exists(dir_exists_value),
-        origin(origin_value) {}
+      : dir_exists(dir_exists_value), origin(origin_value) {}

  const bool dir_exists;
  const std::string origin;
@@ -1344,6 +1550,32 @@ MATCHER_P6(Contains, str1, str2, str3, str4, str5, str6, "") {
          data.find(str6) != std::string::npos);
 }

+MATCHER_P7(Contains, str1, str2, str3, str4, str5, str6, map7, "") {
+  // Estimating the length of data. We can have gmock provide length
+  // as well as pointer to data but that will introduce a dependency on tr1
+  size_t map7_len = 0;
+  CdmAppParameterMap::const_iterator itr = map7.begin();
+  for (itr = map7.begin(); itr != map7.end(); ++itr) {
+    map7_len += itr->first.length();
+    map7_len += itr->second.length();
+  }
+  std::string data(arg, str1.size() + str2.size() + str3.size() + str4.size() +
+                            str5.size() + str6.size() + map7_len +
+                            kProtobufEstimatedOverhead);
+  bool map7_entries_present = true;
+  for (itr = map7.begin(); itr != map7.end(); ++itr) {
+    map7_entries_present = map7_entries_present &&
+                           data.find(itr->first) != std::string::npos &&
+                           data.find(itr->second) != std::string::npos;
+  }
+  return (data.find(str1) != std::string::npos &&
+          data.find(str2) != std::string::npos &&
+          data.find(str3) != std::string::npos &&
+          data.find(str4) != std::string::npos &&
+          data.find(str5) != std::string::npos &&
+          data.find(str6) != std::string::npos && map7_entries_present);
+}
+
 TEST_P(DeviceCertificateStoreTest, StoreCertificate) {
  MockFile file;
  CertStorageVariant params = GetParam();
@@ -1379,8 +1611,8 @@ TEST_P(DeviceCertificateStoreTest, StoreCertificate) {

 INSTANTIATE_TEST_CASE_P(
    StoreCertificate, DeviceCertificateStoreTest,
-    ::testing::Values(CertStorageVariant(true,  EMPTY_ORIGIN),
-                      CertStorageVariant(true,  kTestOrigin),
+    ::testing::Values(CertStorageVariant(true, EMPTY_ORIGIN),
+                      CertStorageVariant(true, kTestOrigin),
                      CertStorageVariant(false, EMPTY_ORIGIN),
                      CertStorageVariant(false, kTestOrigin)));

@@ -1402,15 +1634,15 @@ TEST_P(DeviceCertificateTest, ReadCertificate) {
                      Return(data.size())));
  EXPECT_CALL(file, Close()).Times(1);
  EXPECT_CALL(file, Write(_, _)).Times(0);
+  EXPECT_CALL(file, List(_, NotNull())).WillOnce(Return(false));

  DeviceFiles device_files;
  EXPECT_TRUE(device_files.Init(kSecurityLevelL1));
  device_files.SetTestFile(&file);

  std::string certificate, wrapped_private_key;
-  ASSERT_TRUE(
-      device_files.RetrieveCertificate(origin, &certificate,
-                                       &wrapped_private_key));
+  ASSERT_TRUE(device_files.RetrieveCertificate(origin, &certificate,
+                                               &wrapped_private_key));
  EXPECT_EQ(kTestCertificate, b2a_hex(certificate));
  EXPECT_EQ(kTestWrappedPrivateKey, b2a_hex(wrapped_private_key));
 }
@@ -1492,6 +1724,9 @@ TEST_P(DeviceFilesStoreTest, StoreLicense) {
        .WillOnce(Return(true));
  }

+  CdmAppParameterMap app_parameters =
+      GetAppParameters(license_test_data[license_num].app_parameters);
+
  EXPECT_CALL(file, Open(StrEq(license_path),
                         AllOf(IsCreateFileFlagSet(), IsBinaryFileFlagSet())))
      .WillOnce(Return(true));
@@ -1501,7 +1736,8 @@ TEST_P(DeviceFilesStoreTest, StoreLicense) {
                           license_test_data[license_num].key_response,
                           license_test_data[license_num].key_renewal_request,
                           license_test_data[license_num].key_renewal_response,
-                           license_test_data[license_num].key_release_url),
+                           license_test_data[license_num].key_release_url,
+                           app_parameters),
                  Gt(GetLicenseDataSize(license_test_data[license_num]))))
      .WillOnce(ReturnArg<1>());
  EXPECT_CALL(file, Close()).Times(1);
@@ -1520,7 +1756,7 @@ TEST_P(DeviceFilesStoreTest, StoreLicense) {
      license_test_data[license_num].key_renewal_response,
      license_test_data[license_num].key_release_url,
      license_test_data[license_num].playback_start_time,
-      license_test_data[license_num].last_playback_time));
+      license_test_data[license_num].last_playback_time, app_parameters));
 }

 INSTANTIATE_TEST_CASE_P(StoreLicense, DeviceFilesStoreTest, ::testing::Bool());
@@ -1537,6 +1773,9 @@ TEST_F(DeviceFilesTest, StoreLicenses) {
                               license_test_data[i].key_set_id +
                               DeviceFiles::GetLicenseFileNameExtension();

+    CdmAppParameterMap app_parameters =
+        GetAppParameters(license_test_data[i].app_parameters);
+
    EXPECT_CALL(file, Open(StrEq(license_path),
                           AllOf(IsCreateFileFlagSet(), IsBinaryFileFlagSet())))
        .WillOnce(Return(true));
@@ -1546,7 +1785,8 @@ TEST_F(DeviceFilesTest, StoreLicenses) {
                                     license_test_data[i].key_response,
                                     license_test_data[i].key_renewal_request,
                                     license_test_data[i].key_renewal_response,
-                                     license_test_data[i].key_release_url),
+                                     license_test_data[i].key_release_url,
+                                     app_parameters),
                            Gt(GetLicenseDataSize(license_test_data[i]))))
        .WillOnce(ReturnArg<1>());
  }
@@ -1557,6 +1797,9 @@ TEST_F(DeviceFilesTest, StoreLicenses) {
  EXPECT_TRUE(device_files.Init(kSecurityLevelL1));
  device_files.SetTestFile(&file);
  for (size_t i = 0; i < kNumberOfLicenses; i++) {
+    CdmAppParameterMap app_parameters =
+        GetAppParameters(license_test_data[i].app_parameters);
+
    EXPECT_TRUE(device_files.StoreLicense(
        license_test_data[i].key_set_id, license_test_data[i].license_state,
        license_test_data[i].pssh_data, license_test_data[i].key_request,
@@ -1565,7 +1808,7 @@ TEST_F(DeviceFilesTest, StoreLicenses) {
        license_test_data[i].key_renewal_response,
        license_test_data[i].key_release_url,
        license_test_data[i].playback_start_time,
-        license_test_data[i].last_playback_time));
+        license_test_data[i].last_playback_time, app_parameters));
  }
 }

@@ -1603,6 +1846,7 @@ TEST_F(DeviceFilesTest, RetrieveLicenses) {
  CdmKeyResponse key_renewal_response;
  int64_t playback_start_time, last_playback_time;
  std::string release_server_url;
+  CdmAppParameterMap app_parameters;

  for (size_t i = 0; i < kNumberOfLicenses; i++) {
    DeviceFiles::LicenseState license_state;
@@ -1610,7 +1854,7 @@ TEST_F(DeviceFilesTest, RetrieveLicenses) {
        license_test_data[i].key_set_id, &license_state, &pssh_data,
        &key_request, &key_response, &key_renewal_request,
        &key_renewal_response, &release_server_url, &playback_start_time,
-        &last_playback_time));
+        &last_playback_time, &app_parameters));
    EXPECT_EQ(license_test_data[i].license_state, license_state);
    EXPECT_EQ(license_test_data[i].pssh_data, pssh_data);
    EXPECT_EQ(license_test_data[i].key_request, key_request);
@@ -1619,9 +1863,68 @@ TEST_F(DeviceFilesTest, RetrieveLicenses) {
    EXPECT_EQ(license_test_data[i].key_response, key_response);
    EXPECT_EQ(license_test_data[i].playback_start_time, playback_start_time);
    EXPECT_EQ(license_test_data[i].last_playback_time, last_playback_time);
+
+    std::map<std::string, std::string>::iterator itr;
+    for (itr = app_parameters.begin(); itr != app_parameters.end(); ++itr) {
+      EXPECT_NE(std::string::npos,
+                license_test_data[i].app_parameters.find(itr->first));
+      EXPECT_NE(std::string::npos,
+                license_test_data[i].app_parameters.find(itr->second));
+    }
  }
 }

+TEST_F(DeviceFilesTest, AppParametersBackwardCompatibility) {
+  MockFile file;
+  LicenseInfo* test_data =
+      &license_app_parameters_backwards_compatibility_test_data;
+
+  std::string license_path = device_base_path_ + test_data->key_set_id +
+                             DeviceFiles::GetLicenseFileNameExtension();
+
+  size_t size = test_data->file_data.size();
+
+  EXPECT_CALL(file, Exists(StrEq(license_path))).WillOnce(Return(true));
+  EXPECT_CALL(file, FileSize(StrEq(license_path))).WillOnce(Return(size));
+  EXPECT_CALL(file, Open(StrEq(license_path), IsBinaryFileFlagSet()))
+      .WillOnce(Return(true));
+  EXPECT_CALL(file, Read(NotNull(), Eq(size)))
+      .WillOnce(DoAll(SetArrayArgument<0>(test_data->file_data.begin(),
+                                          test_data->file_data.end()),
+                      Return(size)));
+
+  EXPECT_CALL(file, Close()).Times(1);
+  EXPECT_CALL(file, Write(_, _)).Times(0);
+
+  DeviceFiles device_files;
+  EXPECT_TRUE(device_files.Init(kSecurityLevelL1));
+  device_files.SetTestFile(&file);
+  DeviceFiles::LicenseState license_state;
+  CdmInitData pssh_data;
+  CdmKeyMessage key_request;
+  CdmKeyResponse key_response;
+  CdmKeyMessage key_renewal_request;
+  CdmKeyResponse key_renewal_response;
+  int64_t playback_start_time, last_playback_time;
+  std::string release_server_url;
+  CdmAppParameterMap app_parameters;
+
+  EXPECT_TRUE(device_files.RetrieveLicense(
+      test_data->key_set_id, &license_state, &pssh_data, &key_request,
+      &key_response, &key_renewal_request, &key_renewal_response,
+      &release_server_url, &playback_start_time, &last_playback_time,
+      &app_parameters));
+  EXPECT_EQ(test_data->license_state, license_state);
+  EXPECT_EQ(test_data->pssh_data, pssh_data);
+  EXPECT_EQ(test_data->key_request, key_request);
+  EXPECT_EQ(test_data->key_response, key_response);
+  EXPECT_EQ(test_data->key_request, key_request);
+  EXPECT_EQ(test_data->key_response, key_response);
+  EXPECT_EQ(test_data->playback_start_time, playback_start_time);
+  EXPECT_EQ(test_data->last_playback_time, last_playback_time);
+  EXPECT_EQ(0u, app_parameters.size());
+}
+
 TEST_F(DeviceFilesTest, SecurityLevelPathBackwardCompatibility) {
  MockFile file;
  std::vector<std::string> security_dirs;
@@ -1649,14 +1952,13 @@ TEST_F(DeviceFilesTest, SecurityLevelPathBackwardCompatibility) {
  }

  std::string old_path =
-        base_path + DeviceFiles::GetCertificateFileName(EMPTY_ORIGIN);
+      base_path + DeviceFiles::GetCertificateFileName(EMPTY_ORIGIN);
  old_files.push_back(DeviceFiles::GetCertificateFileName(EMPTY_ORIGIN));
  EXPECT_CALL(file, IsRegularFile(StrEq(old_path))).WillOnce(Return(true));
  EXPECT_CALL(file, Remove(StrEq(old_path))).WillOnce(Return(true));
  for (size_t i = 0; i < security_dirs.size(); ++i) {
-    new_path =
-        base_path + security_dirs[i] +
-            DeviceFiles::GetCertificateFileName(EMPTY_ORIGIN);
+    new_path = base_path + security_dirs[i] +
+               DeviceFiles::GetCertificateFileName(EMPTY_ORIGIN);
    EXPECT_CALL(file, Copy(StrEq(old_path), StrEq(new_path)))
        .WillOnce(Return(true));
  }
@@ -1697,9 +1999,8 @@ TEST_F(DeviceFilesTest, SecurityLevelPathBackwardCompatibility) {

  Properties::Init();
  std::string certificate, wrapped_private_key;
-  ASSERT_TRUE(
-      device_files.RetrieveCertificate(EMPTY_ORIGIN, &certificate,
-                                       &wrapped_private_key));
+  ASSERT_TRUE(device_files.RetrieveCertificate(EMPTY_ORIGIN, &certificate,
+                                               &wrapped_private_key));
 }

 TEST_F(DeviceFilesTest, UpdateLicenseState) {
@@ -1738,7 +2039,8 @@ TEST_F(DeviceFilesTest, UpdateLicenseState) {
      license_update_test_data[0].key_renewal_response,
      license_update_test_data[0].key_release_url,
      license_update_test_data[0].playback_start_time,
-      license_update_test_data[0].last_playback_time));
+      license_update_test_data[0].last_playback_time,
+      GetAppParameters(license_test_data[0].app_parameters)));

  EXPECT_TRUE(device_files.StoreLicense(
      license_update_test_data[0].key_set_id,
@@ -1750,7 +2052,8 @@ TEST_F(DeviceFilesTest, UpdateLicenseState) {
      license_update_test_data[0].key_renewal_response,
      license_update_test_data[0].key_release_url,
      license_update_test_data[0].playback_start_time,
-      license_update_test_data[0].last_playback_time));
+      license_update_test_data[0].last_playback_time,
+      GetAppParameters(license_test_data[0].app_parameters)));
 }

 TEST_F(DeviceFilesTest, DeleteLicense) {
@@ -1788,11 +2091,13 @@ TEST_F(DeviceFilesTest, DeleteLicense) {
  CdmKeyResponse key_renewal_response;
  std::string release_server_url;
  int64_t playback_start_time, last_playback_time;
+  CdmAppParameterMap app_parameters;

  EXPECT_TRUE(device_files.RetrieveLicense(
      license_test_data[0].key_set_id, &license_state, &pssh_data, &key_request,
      &key_response, &key_renewal_request, &key_renewal_response,
-      &release_server_url, &playback_start_time, &last_playback_time));
+      &release_server_url, &playback_start_time, &last_playback_time,
+      &app_parameters));
  EXPECT_EQ(license_test_data[0].license_state, license_state);
  EXPECT_EQ(license_test_data[0].pssh_data, pssh_data);
  EXPECT_EQ(license_test_data[0].key_request, key_request);
@@ -1801,6 +2106,13 @@ TEST_F(DeviceFilesTest, DeleteLicense) {
  EXPECT_EQ(license_test_data[0].key_response, key_response);
  EXPECT_EQ(license_test_data[0].playback_start_time, playback_start_time);
  EXPECT_EQ(license_test_data[0].last_playback_time, last_playback_time);
+  std::map<std::string, std::string>::iterator itr;
+  for (itr = app_parameters.begin(); itr != app_parameters.end(); ++itr) {
+    EXPECT_NE(license_test_data[0].app_parameters.find(itr->first),
+              std::string::npos);
+    EXPECT_NE(license_test_data[0].app_parameters.find(itr->second),
+              std::string::npos);
+  }

  EXPECT_TRUE(device_files.DeleteLicense(license_test_data[0].key_set_id));
  EXPECT_FALSE(device_files.LicenseExists(license_test_data[0].key_set_id));
@@ -1926,9 +2238,10 @@ TEST_P(DeviceFilesUsageInfoTest, Store) {
    EXPECT_CALL(file, Close()).Times(1);
  }

-  EXPECT_CALL(file, Write(Contains(pst, license_request, license, data.size()),
-                          Gt(pst.size() + license_request.size() +
-                             license.size()))).WillOnce(ReturnArg<1>());
+  EXPECT_CALL(file,
+              Write(Contains(pst, license_request, license, data.size()),
+                    Gt(pst.size() + license_request.size() + license.size())))
+      .WillOnce(ReturnArg<1>());

  DeviceFiles device_files;
  EXPECT_TRUE(device_files.Init(kSecurityLevelL1));
@@ -2034,8 +2347,8 @@ TEST_P(DeviceFilesUsageInfoTest, DeleteAll) {
    // DeleteAllUsageInfoForApp returns a list of all psts that
    // should be deleted by oemcrypto.
    EXPECT_EQ(static_cast<unsigned int>(index), psts.size());
-    for(int i=0; i < index; i++) {
-      EXPECT_EQ(kUsageInfoTestData[i+1].provider_session_token, psts[i]);
+    for (int i = 0; i < index; i++) {
+      EXPECT_EQ(kUsageInfoTestData[i + 1].provider_session_token, psts[i]);
    }
  }
 }