widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,572 Commits 2 Branches 0 Tags
781c9537b06e39a7f4eaf32e1f2b9e83f4a02d1d
Commit Graph

3572 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
781c9537b0 Merge "Expect Provisioning ID length of upto 64 bytes" into rvc-dev am: f14dea8b89 am: ea491da7fc am: 24e95938dc am: 2052cdf1a9 
Change-Id: I8c7bdafee8a89f2771b19be38546aeb85d51698f
 2020-03-12 22:21:32 +00:00
Automerger Merge Worker
ba0952dfe4 Merge "Expect Provisioning ID length of upto 64 bytes" into rvc-dev am: f14dea8b89 am: 77aeff11fc am: f9e7986e2d 
Change-Id: I5b59a1587c02c8a46c4c1bb4fd3334735079d53c
 2020-03-12 22:01:44 +00:00
Automerger Merge Worker
2052cdf1a9 Merge "Expect Provisioning ID length of upto 64 bytes" into rvc-dev am: f14dea8b89 am: ea491da7fc am: 24e95938dc 
Change-Id: I298bb7b1c2584090f148a186ca9e57a8c521388b
 2020-03-12 22:00:11 +00:00
Automerger Merge Worker
d06bb307b5 Merge "Expect Provisioning ID length of upto 64 bytes" into rvc-dev am: f14dea8b89 am: ea491da7fc am: 567e26b25c 
Change-Id: I84e132ac0cc2447b895d3db0fbc42c697b169571
 2020-03-12 21:59:02 +00:00
Automerger Merge Worker
f9e7986e2d Merge "Expect Provisioning ID length of upto 64 bytes" into rvc-dev am: f14dea8b89 am: 77aeff11fc 
Change-Id: Ic63d9bdbe0455dc48b256e10b60e5a4c2cecec48
 2020-03-12 21:49:47 +00:00
Automerger Merge Worker
24e95938dc Merge "Expect Provisioning ID length of upto 64 bytes" into rvc-dev am: f14dea8b89 am: ea491da7fc 
Change-Id: I671b88ee699b239e84caba8b2410eb8b8fefcf6c
 2020-03-12 21:49:47 +00:00
Automerger Merge Worker
567e26b25c Merge "Expect Provisioning ID length of upto 64 bytes" into rvc-dev am: f14dea8b89 am: ea491da7fc 
Change-Id: Ia613b64fbf4afa639282f56dc72b38e576a4484b
 2020-03-12 21:49:22 +00:00
Automerger Merge Worker
77aeff11fc Merge "Expect Provisioning ID length of upto 64 bytes" into rvc-dev am: f14dea8b89 
Change-Id: I5b33480bfd1a7f1c03166bc3d7001e1e8460851b
 2020-03-12 21:39:07 +00:00
Automerger Merge Worker
ea491da7fc Merge "Expect Provisioning ID length of upto 64 bytes" into rvc-dev am: f14dea8b89 
Change-Id: Ia2e3f84ff661869eae138057447d2ac35251eb64
 2020-03-12 21:39:00 +00:00
Rahul Frias
f14dea8b89 Merge "Expect Provisioning ID length of upto 64 bytes" into rvc-dev 2020-03-12 21:22:35 +00:00
Rahul Frias
a42273e67f Expect Provisioning ID length of upto 64 bytes 
[ Merge of http://go/wvgerrit/95508 ]

The provisioning ID length will be 32 bytes when the device supports a
keybox or OEM certificates and does not implement |OEMCrypto_GetDeviceId|.
If a device supports OEM Certificates and implements |OEMCrypto_GetDeviceId|
it may be an arbitrary length upto 64 bytes.

Bug: 150393659
Test: WV unit/integration tests
Change-Id: I5e4dbc8f2f9ca326425d0313f4823b72bd6ac7c0
 2020-03-12 12:30:37 -07:00
Automerger Merge Worker
cac740cb19 Merge "Match usage entry to header" into rvc-dev am: 042efc971d am: c43723bb34 am: c1fb910476 am: 57426a0444 
Change-Id: Iff5d0cf985f536940a31d249405c2b8bfdbe1d26
 2020-03-12 18:58:24 +00:00
Automerger Merge Worker
f5970ce6f3 Merge "Match usage entry to header" into rvc-dev am: 042efc971d am: b12241151a am: 3f9184f277 
Change-Id: I40ca6860bfb02c6ac577e08a1979c674cd9fd2bc
 2020-03-12 18:52:16 +00:00
Automerger Merge Worker
5abc607c28 Merge "Match usage entry to header" into rvc-dev am: 042efc971d am: c43723bb34 am: 405538b65a 
Change-Id: I945c359126f979c3bfaa7f889feed91083d3468c
 2020-03-12 18:51:00 +00:00
Automerger Merge Worker
57426a0444 Merge "Match usage entry to header" into rvc-dev am: 042efc971d am: c43723bb34 am: c1fb910476 
Change-Id: I34d32d65686c196405d22c08078dbc486310d289
 2020-03-12 18:47:47 +00:00
Automerger Merge Worker
3f9184f277 Merge "Match usage entry to header" into rvc-dev am: 042efc971d am: b12241151a 
Change-Id: Ibc0b5cbafed6c23cfb96e79fe64b553215f0a28d
 2020-03-12 18:33:09 +00:00
Automerger Merge Worker
c1fb910476 Merge "Match usage entry to header" into rvc-dev am: 042efc971d am: c43723bb34 
Change-Id: I4a986d4c9085c784e2297df70f44e1e4c186a76f
 2020-03-12 18:30:51 +00:00
Automerger Merge Worker
405538b65a Merge "Match usage entry to header" into rvc-dev am: 042efc971d am: c43723bb34 
Change-Id: Ie511482529f2e73b24f9f74d16f796dd3f633bb0
 2020-03-12 18:30:28 +00:00
Automerger Merge Worker
c43723bb34 Merge "Match usage entry to header" into rvc-dev am: 042efc971d 
Change-Id: Idcd0ba1346a045ef0cdb549bad3c5089bcf27173
 2020-03-12 18:13:49 +00:00
Automerger Merge Worker
b12241151a Merge "Match usage entry to header" into rvc-dev am: 042efc971d 
Change-Id: Ibaa51743d7e2dd60e62ceb2dc976f53bda40d14b
 2020-03-12 18:13:43 +00:00
TreeHugger Robot
042efc971d Merge "Match usage entry to header" into rvc-dev 2020-03-12 18:00:06 +00:00
Automerger Merge Worker
8f4420761e L3 oemcrypto: Replace NULL with nullptr am: 5cd0fd7992 am: ace03ffb04 am: 6d086900d0 am: bd352fb549 
Change-Id: Idec6e51026b4396a72e250f16c602b9028a205e6
 2020-03-12 00:04:52 +00:00
Automerger Merge Worker
7b78f69127 L3 oemcrypto: Replace NULL with nullptr am: 5cd0fd7992 am: 93e106639c am: ad09f8de21 
Change-Id: I69e4972b038798b02e3b55dbc948e0834bf5c8c4
 2020-03-11 23:50:20 +00:00
Automerger Merge Worker
5fb9c96d35 L3 oemcrypto: Replace NULL with nullptr am: 5cd0fd7992 am: ace03ffb04 am: 6acc649d33 
Change-Id: I7770af608299d648b3e5322a4ebacd6dc9672a0a
 2020-03-11 23:50:05 +00:00
Automerger Merge Worker
bd352fb549 L3 oemcrypto: Replace NULL with nullptr am: 5cd0fd7992 am: ace03ffb04 am: 6d086900d0 
Change-Id: Id03ace17052f3246ea2fbde15e152118be663771
 2020-03-11 23:49:55 +00:00
Automerger Merge Worker
ad09f8de21 L3 oemcrypto: Replace NULL with nullptr am: 5cd0fd7992 am: 93e106639c 
Change-Id: I1e2c56a682d88c3acbd61e58ad87faa77c00e3a3
 2020-03-11 23:35:42 +00:00
Automerger Merge Worker
6acc649d33 L3 oemcrypto: Replace NULL with nullptr am: 5cd0fd7992 am: ace03ffb04 
Change-Id: I068b8ab7e8fc33dfcbf3c40111dfb0d4d446bb58
 2020-03-11 23:35:32 +00:00
Automerger Merge Worker
6d086900d0 L3 oemcrypto: Replace NULL with nullptr am: 5cd0fd7992 am: ace03ffb04 
Change-Id: I9d1c26d7275dc03d8f157a76286ae655c3602a88
 2020-03-11 23:35:21 +00:00
Automerger Merge Worker
93e106639c L3 oemcrypto: Replace NULL with nullptr am: 5cd0fd7992 
Change-Id: If73c5faa27ee6da1c237c3045291a57638e23453
 2020-03-11 23:23:22 +00:00
Automerger Merge Worker
ace03ffb04 L3 oemcrypto: Replace NULL with nullptr am: 5cd0fd7992 
Change-Id: I71c41ba43edb99f167435c72d02ec97de4948b34
 2020-03-11 23:22:56 +00:00
Cong Lin
5cd0fd7992 L3 oemcrypto: Replace NULL with nullptr 
Merge from Widevine repo of https://widevine-internal-review.git.corp.google.com/c/cdm/+/95206

Only one file is affected in Android repo.

Bug: 149050172
Test: Unit tests
Change-Id: I3251b9997733e59b18c0b5727205067dcc3a963c
 2020-03-10 19:47:36 -07:00
Automerger Merge Worker
f230d9e135 Merge "Update tests for license release" into rvc-dev am: b8570949e4 am: e77b1913c9 am: fe39864311 am: 569ae88a81 
Change-Id: I7001acf3a4881d8038eaa051cdb5895d4fdc922e
 2020-03-10 09:44:39 +00:00
Automerger Merge Worker
1c6aa9c125 Merge "Update tests for license release" into rvc-dev am: b8570949e4 am: ea944065a1 am: 20f35baf2e 
Change-Id: Ie325df8a796b2a506d9210c4f6e5142056bb282f
 2020-03-10 09:29:21 +00:00
Automerger Merge Worker
776622e092 Merge "Update tests for license release" into rvc-dev am: b8570949e4 am: e77b1913c9 am: 3e1ededa8b 
Change-Id: I4e02b4037520a7ba0500b1914f7780c1b705a6f5
 2020-03-10 09:29:12 +00:00
Automerger Merge Worker
569ae88a81 Merge "Update tests for license release" into rvc-dev am: b8570949e4 am: e77b1913c9 am: fe39864311 
Change-Id: I454a99e3da614daad2b2be6fa29360974522e998
 2020-03-10 09:28:48 +00:00
Automerger Merge Worker
fe39864311 Merge "Update tests for license release" into rvc-dev am: b8570949e4 am: e77b1913c9 
Change-Id: Id0f3d0844b25bf282df29637e831f76b58bbfb33
 2020-03-10 09:19:09 +00:00
Automerger Merge Worker
20f35baf2e Merge "Update tests for license release" into rvc-dev am: b8570949e4 am: ea944065a1 
Change-Id: Ia2d7da3accd5db42206801a27d490d7e7fa2a337
 2020-03-10 09:18:59 +00:00
Automerger Merge Worker
3e1ededa8b Merge "Update tests for license release" into rvc-dev am: b8570949e4 am: e77b1913c9 
Change-Id: Ie350a8e49993d37cc8d263633469eb97ec89257a
 2020-03-10 09:18:45 +00:00
Automerger Merge Worker
ea944065a1 Merge "Update tests for license release" into rvc-dev am: b8570949e4 
Change-Id: I625fb36cfe62ff600c9428f10061d397ffb6c68c
 2020-03-10 09:02:22 +00:00
Automerger Merge Worker
e77b1913c9 Merge "Update tests for license release" into rvc-dev am: b8570949e4 
Change-Id: I78abac92ac31ba82904058c3c80ccacf3edbbada
 2020-03-10 09:01:45 +00:00
TreeHugger Robot
b8570949e4 Merge "Update tests for license release" into rvc-dev 2020-03-10 08:49:47 +00:00
Fred Gylys-Colwell
469c17777e Match usage entry to header 
Merge from Widevine repo of http://go/wvgerrit/95463

In the unit tests ReloadUsageTableWithSkew, we load a header that has
a generation number off by 1. This is allowed. However, we then try to
load the current entry, which is newer than the header. Instead, we
should try to load the entry that went with the header.

Bug: 139828114
Test: Ran unit tests
Change-Id: I87261501d8ee2b91a07c2b5dff17fc0ea950244d
 2020-03-09 20:40:15 -07:00
Fred Gylys-Colwell
037918aa49 Update tests for license release 
Merge from Widevine repo of http://go/wvgerrit/95403

This updates the test code CreateDefaultResponse to make sure that
license releases do not have a core message, and that the key control
block is correctly set for renewals.

Also, the unit test OEMCryptoUsageTableTest.TimingTest is changed to
only a license release when the license is inactive. If the license is
still active, then the license is loaded before generating a usage
report.

Test: Ran full unit tests
Bug: 151092673
Change-Id: I7c01fd17f9b66e88ab3c57aa0f3d40740f13507c
 2020-03-09 20:11:23 -07:00
Automerger Merge Worker
5141405908 Merge "Treat the (0,0) Pattern as 'cbcs'" into rvc-dev am: 2356842fd2 am: d8c7168f43 am: 6bc1b455f4 am: f2b5e546d4 
Change-Id: I0653f204ec3570c634928cdbe2ae41319d04de1f
 2020-03-09 22:14:19 +00:00
Automerger Merge Worker
9a036954f6 Merge "Remove ODK from unused makefiles" into rvc-dev am: 7da5b8be92 am: cbfb68abdc am: 6889037bb3 am: a83d57fd11 
Change-Id: I561a71059aea05305c4f7ed93c62fbbf20e412b4
 2020-03-09 22:14:15 +00:00
Automerger Merge Worker
2be73425ec Merge "Cache Max Subsample Size" into rvc-dev am: 0bd6a38096 am: e61f87a18a am: 20745a3aca am: ae45b71093 
Change-Id: Ice9d5f14148431962f59d51d75861be795c54bc5
 2020-03-09 22:14:09 +00:00
Automerger Merge Worker
66eb58015d Merge "Treat the (0,0) Pattern as 'cbcs'" into rvc-dev am: 2356842fd2 am: 2aeaa05b60 am: 211efe559d 
Change-Id: Ib76c9a67245fe956f9b0bc714016bd49884ea48d
 2020-03-09 22:09:20 +00:00
Automerger Merge Worker
99714dee14 Merge "Remove ODK from unused makefiles" into rvc-dev am: 7da5b8be92 am: 35ee931874 am: f14c6f1ea5 
Change-Id: I98d488c5e004ad413fd1735633ca2e12e4201f82
 2020-03-09 22:09:04 +00:00
Automerger Merge Worker
3055598b0b Merge "Treat the (0,0) Pattern as 'cbcs'" into rvc-dev am: 2356842fd2 am: d8c7168f43 am: 3342d9b32a 
Change-Id: Idbae003538dbe18e7254200ce3095a396cda9666
 2020-03-09 22:09:00 +00:00
Automerger Merge Worker
1a67c9aadd Merge "Remove ODK from unused makefiles" into rvc-dev am: 7da5b8be92 am: cbfb68abdc am: 35fd7cd921 
Change-Id: Ic2b9c3fbb31ba2987c8bf2f7ce90d09fa45df8db
 2020-03-09 22:08:55 +00:00