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

3897 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
09121feb52 Merge "CryptoSession: Propagate err from GetSystemIdInternal in Open" into rvc-dev am: 4fe638a779 am: 5775aff942 am: d251cea528 am: b196554f90 
Change-Id: Ie324f4fc78d93efef42889cffdc98f9dfd34dc27
 2020-04-02 00:34:58 +00:00
TreeHugger Robot
b196554f90 Merge "CryptoSession: Propagate err from GetSystemIdInternal in Open" into rvc-dev am: 4fe638a779 am: 5775aff942 am: d251cea528 
Change-Id: I00bde3e8d7d7eb520c36ef6348be2a9a24c7918c
 2020-04-02 00:08:05 +00:00
TreeHugger Robot
d251cea528 Merge "CryptoSession: Propagate err from GetSystemIdInternal in Open" into rvc-dev am: 4fe638a779 am: 5775aff942 
Change-Id: I9cfa9df6c3a2d733449ab329c32021d767f4a2f4
 2020-04-01 23:40:54 +00:00
TreeHugger Robot
5775aff942 Merge "CryptoSession: Propagate err from GetSystemIdInternal in Open" into rvc-dev am: 4fe638a779 
Change-Id: I01fda2def9771a40c1e4c5b2bfcac2b92401f574
 2020-04-01 23:19:25 +00:00
TreeHugger Robot
4fe638a779 Merge "CryptoSession: Propagate err from GetSystemIdInternal in Open" into rvc-dev 2020-04-01 22:52:21 +00:00
Robert Shih
07f40d1bed CryptoSession: Propagate err from GetSystemIdInternal in Open 
Merge of http://go/wvgerrit/96509

Bug: 151231204
Test: GtsMediaTestCases
Change-Id: Ib29691fcea1c9d5fcfa981caf3e5bdab00cbb0bf
 2020-04-01 07:01:24 +00:00
TreeHugger Robot
b4477c75ed Merge "CryptoSession: handle 0-length buffer in DecryptSample" into rvc-dev am: e59339ed6d am: 94108cdbe8 am: 4d3ebc6b87 am: 615054059a am: 2b39f18160 
Change-Id: I24a8f291125c8adca3a13032afa156b10b54a2a7
 2020-04-01 06:20:47 +00:00
TreeHugger Robot
2b39f18160 Merge "CryptoSession: handle 0-length buffer in DecryptSample" into rvc-dev am: e59339ed6d am: 94108cdbe8 am: 4d3ebc6b87 am: 615054059a 
Change-Id: I723579fe1b5725534485e7b849e29bdc5068a825
 2020-04-01 06:15:51 +00:00
TreeHugger Robot
078051f27c Merge "CryptoSession: handle 0-length buffer in DecryptSample" into rvc-dev am: e59339ed6d am: f8175bda83 am: 6b53b2f4ba am: 6f5c2b9b56 
Change-Id: I96da2f284dc829ade6b36f7b863dc03bbdde0984
 2020-04-01 06:15:36 +00:00
TreeHugger Robot
a9ada96c6e Merge "CryptoSession: handle 0-length buffer in DecryptSample" into rvc-dev am: e59339ed6d am: 94108cdbe8 am: 08eb9a7fae am: 29b6a916c9 
Change-Id: I912abc7d15b847fc116d15b9ff919db557a4d7c0
 2020-04-01 06:15:15 +00:00
TreeHugger Robot
6f5c2b9b56 Merge "CryptoSession: handle 0-length buffer in DecryptSample" into rvc-dev am: e59339ed6d am: f8175bda83 am: 6b53b2f4ba 
Change-Id: I2e3c66b88e43d696793ec417b2bf673a090a67ff
 2020-04-01 05:57:24 +00:00
TreeHugger Robot
29b6a916c9 Merge "CryptoSession: handle 0-length buffer in DecryptSample" into rvc-dev am: e59339ed6d am: 94108cdbe8 am: 08eb9a7fae 
Change-Id: I0a4e38b9ff8b755059fd7feeb85ab39cafe4717d
 2020-04-01 05:57:16 +00:00
TreeHugger Robot
615054059a Merge "CryptoSession: handle 0-length buffer in DecryptSample" into rvc-dev am: e59339ed6d am: 94108cdbe8 am: 4d3ebc6b87 
Change-Id: I5a34bf4824a7eb8b382c9eba314de0d393736c8e
 2020-04-01 05:57:06 +00:00
TreeHugger Robot
6b53b2f4ba Merge "CryptoSession: handle 0-length buffer in DecryptSample" into rvc-dev am: e59339ed6d am: f8175bda83 
Change-Id: I6fb21dee970930702e83f11e8e8a6f4da0bea921
 2020-04-01 05:44:35 +00:00
TreeHugger Robot
4d3ebc6b87 Merge "CryptoSession: handle 0-length buffer in DecryptSample" into rvc-dev am: e59339ed6d am: 94108cdbe8 
Change-Id: I1ad7226acc3d63a19d7178450499972eeffd7c40
 2020-04-01 05:44:29 +00:00
TreeHugger Robot
08eb9a7fae Merge "CryptoSession: handle 0-length buffer in DecryptSample" into rvc-dev am: e59339ed6d am: 94108cdbe8 
Change-Id: Ie6186c8d4a98c65b4eab47b329c72eceebd25b2a
 2020-04-01 05:44:04 +00:00
TreeHugger Robot
f8175bda83 Merge "CryptoSession: handle 0-length buffer in DecryptSample" into rvc-dev am: e59339ed6d 
Change-Id: Ib7a0a1c7f1ad11f80482efa0bf87259d5d7d5207
 2020-04-01 05:32:06 +00:00
TreeHugger Robot
94108cdbe8 Merge "CryptoSession: handle 0-length buffer in DecryptSample" into rvc-dev am: e59339ed6d 
Change-Id: Ie427ca27c16376f1202e3a43b58a50f19ecc0d94
 2020-04-01 05:32:01 +00:00
TreeHugger Robot
e59339ed6d Merge "CryptoSession: handle 0-length buffer in DecryptSample" into rvc-dev 2020-04-01 05:12:53 +00:00
Robert Shih
dc9809f7c3 CryptoSession: handle 0-length buffer in DecryptSample 
In `Combine Decrypt Calls to OEMCrypto`,
OEMCrypto_ERROR_BUFFER_TOO_LARGE is used as the default error code to
signal fallback to legacy decrypt (sending subsamples separately).
The error code would not be updated if no calls to OEMCrypto were
made (e.g. 0-length buffers).

This change resets error code to OEMCrypto_SUCCESS after fall back to
legacy decrypt. Consequently, buffers that do no require OEMCrypto
calls would return OEMCrypto_SUCCESS.

Merge of http://go/wvgerrit/96743

Bug: 150188155
Test: GtsMediaTestCases
Test: DashTest#testWidevineH264AdaptiveWithRendererDisabling
Change-Id: Ib23803c51f16bc809bda5c2720e628e81f1df1dc
 2020-04-01 02:47:13 +00:00
John Bruce
67f74b9755 Merge "Update OEMCrypto Version Compatibility Document" into rvc-dev am: c113df815d am: d57c09b29b am: 630141b5fc am: 158f1f8c48 
Change-Id: If1b0cccfe41927207e028d23e0829c8f3cc4d0b6
 2020-03-30 21:23:36 +00:00
John Bruce
158f1f8c48 Merge "Update OEMCrypto Version Compatibility Document" into rvc-dev am: c113df815d am: d57c09b29b am: 630141b5fc 
Change-Id: I0131a1c967fb3c53288a71f6987b93ad5c412c1d
 2020-03-30 19:34:59 +00:00
John Bruce
57d9848eee Merge "Update OEMCrypto Version Compatibility Document" into rvc-dev am: c113df815d am: d57c09b29b am: 6ae7e5e14a am: 0faf2b48f0 am: f867569b57 
Change-Id: Id7a58c01c68898c30d484b0750a9d4f7e6e6e343
 2020-03-30 19:26:30 +00:00
John Bruce
7248a4a0cb Merge "Update OEMCrypto Version Compatibility Document" into rvc-dev am: c113df815d am: 5f09de89ae am: bbd4f33386 am: 34a282635a 
Change-Id: Iac1b6ddc1b0a826e6aaef46c6379ab9b77c3c486
 2020-03-30 19:24:05 +00:00
John Bruce
f867569b57 Merge "Update OEMCrypto Version Compatibility Document" into rvc-dev am: c113df815d am: d57c09b29b am: 6ae7e5e14a am: 0faf2b48f0 
Change-Id: I17977a0755c137f8afdd6bcff8306ad4b1f49067
 2020-03-30 19:09:36 +00:00
John Bruce
630141b5fc Merge "Update OEMCrypto Version Compatibility Document" into rvc-dev am: c113df815d am: d57c09b29b 
Change-Id: Id972921cfb3c458c8611631e3f5375b7a0066e0a
 2020-03-30 19:09:24 +00:00
John Bruce
34a282635a Merge "Update OEMCrypto Version Compatibility Document" into rvc-dev am: c113df815d am: 5f09de89ae am: bbd4f33386 
Change-Id: I68e44ebe51d3a5afd73303f2e225a0b813f01f50
 2020-03-30 18:57:28 +00:00
John Bruce
0faf2b48f0 Merge "Update OEMCrypto Version Compatibility Document" into rvc-dev am: c113df815d am: d57c09b29b am: 6ae7e5e14a 
Change-Id: Iab845ff16e0b2dd02cc3ba9904a35e8907e55cfa
 2020-03-30 18:56:26 +00:00
John Bruce
bbd4f33386 Merge "Update OEMCrypto Version Compatibility Document" into rvc-dev am: c113df815d am: 5f09de89ae 
Change-Id: I73ca6457a6b8aa132e47a5479751f3616f92c3b0
 2020-03-30 18:15:28 +00:00
John Bruce
6ae7e5e14a Merge "Update OEMCrypto Version Compatibility Document" into rvc-dev am: c113df815d am: d57c09b29b 
Change-Id: I097e489a6858ca3ed9a62f8cd3b2a6b05f8ec54d
 2020-03-30 18:14:31 +00:00
John Bruce
d57c09b29b Merge "Update OEMCrypto Version Compatibility Document" into rvc-dev am: c113df815d 
Change-Id: I4e1f3e8ff3e11e7d06defad929bf08ef828b23eb
 2020-03-30 18:00:26 +00:00
John Bruce
5f09de89ae Merge "Update OEMCrypto Version Compatibility Document" into rvc-dev am: c113df815d 
Change-Id: Ifcfe2508123bca879c457082090133751bceae6a
 2020-03-30 17:59:52 +00:00
John Bruce
c113df815d Merge "Update OEMCrypto Version Compatibility Document" into rvc-dev 2020-03-30 17:46:33 +00:00
Fred Gylys-Colwell
e203d3eedd Replace OEMCrypto_LoadDeviceRSAKey with OEMCrypto_LoadDRMPrivateKey am: 56b836bda3 am: bb42e9bd41 am: fc1326554e am: 2c93b9fefd am: 4acedcb708 
Change-Id: I9a1568a724d4334e289c344db04234051b6ca716
 2020-03-29 20:17:54 +00:00
Fred Gylys-Colwell
4acedcb708 Replace OEMCrypto_LoadDeviceRSAKey with OEMCrypto_LoadDRMPrivateKey am: 56b836bda3 am: bb42e9bd41 am: fc1326554e am: 2c93b9fefd 
Change-Id: Id413144b39ddd5f2d8791eca14fc090d6cc74b49
 2020-03-29 20:13:35 +00:00
Fred Gylys-Colwell
1f8f8b958b Replace OEMCrypto_LoadDeviceRSAKey with OEMCrypto_LoadDRMPrivateKey am: 56b836bda3 am: 4af6f0cf42 am: c78affbc28 am: eaa14012ea 
Change-Id: I796e95f803d6de04437103ab4d073a33d9e71c13
 2020-03-29 20:13:28 +00:00
Fred Gylys-Colwell
efb0452042 Replace OEMCrypto_LoadDeviceRSAKey with OEMCrypto_LoadDRMPrivateKey am: 56b836bda3 am: bb42e9bd41 am: 6b56c1c5ec am: b3657d0a6e 
Change-Id: I0dc2f37ce34771592cdd0af4ce905a896a88fccd
 2020-03-29 20:13:22 +00:00
Fred Gylys-Colwell
eaa14012ea Replace OEMCrypto_LoadDeviceRSAKey with OEMCrypto_LoadDRMPrivateKey am: 56b836bda3 am: 4af6f0cf42 am: c78affbc28 
Change-Id: Ic1c1a620680d8cce01c97c63a625a19ca636a823
 2020-03-29 19:56:01 +00:00
Fred Gylys-Colwell
b3657d0a6e Replace OEMCrypto_LoadDeviceRSAKey with OEMCrypto_LoadDRMPrivateKey am: 56b836bda3 am: bb42e9bd41 am: 6b56c1c5ec 
Change-Id: I05a984258ab5637351a2ef6d48fff3ac7da7b1a9
 2020-03-29 19:55:57 +00:00
Fred Gylys-Colwell
2c93b9fefd Replace OEMCrypto_LoadDeviceRSAKey with OEMCrypto_LoadDRMPrivateKey am: 56b836bda3 am: bb42e9bd41 am: fc1326554e 
Change-Id: I6b578013087d91227155c35812bc21166554fc54
 2020-03-29 19:55:53 +00:00
Fred Gylys-Colwell
c78affbc28 Replace OEMCrypto_LoadDeviceRSAKey with OEMCrypto_LoadDRMPrivateKey am: 56b836bda3 am: 4af6f0cf42 
Change-Id: I938b2cad4c00df41562b0f7ddb327f60961f491e
 2020-03-29 19:46:04 +00:00
Fred Gylys-Colwell
fc1326554e Replace OEMCrypto_LoadDeviceRSAKey with OEMCrypto_LoadDRMPrivateKey am: 56b836bda3 am: bb42e9bd41 
Change-Id: I8c35f3c05793844ce4bf24cde418936f31cc6d04
 2020-03-29 19:46:03 +00:00
Fred Gylys-Colwell
6b56c1c5ec Replace OEMCrypto_LoadDeviceRSAKey with OEMCrypto_LoadDRMPrivateKey am: 56b836bda3 am: bb42e9bd41 
Change-Id: I4099a6dcd2aed17b2132ac0fad22b0268098d22d
 2020-03-29 19:45:51 +00:00
Fred Gylys-Colwell
4af6f0cf42 Replace OEMCrypto_LoadDeviceRSAKey with OEMCrypto_LoadDRMPrivateKey am: 56b836bda3 
Change-Id: Ia80b1cb34f01e6d85461eb2fef7f22abe219e6b4
 2020-03-29 19:30:57 +00:00
Fred Gylys-Colwell
bb42e9bd41 Replace OEMCrypto_LoadDeviceRSAKey with OEMCrypto_LoadDRMPrivateKey am: 56b836bda3 
Change-Id: I2478269c1165c4dac094b6f79eae77c80b65668e
 2020-03-29 19:30:45 +00:00
Fred Gylys-Colwell
56b836bda3 Replace OEMCrypto_LoadDeviceRSAKey with OEMCrypto_LoadDRMPrivateKey 
Merge from Widevine repo of http://go/wvgerrit/96783

This CL updates the reference code, unit tests, and adapter to use the
new v16 function OEMCrypto_LoadDRMPrivateKey. This is just an API
change to allow ECC support in the future. The reference code does not
yet support ECC certificates, and the CDM code assumes that all
certificates have an RSA key.

Bug: 152558018
Test: unit tests on taimen and w/v16 mod mock.
Change-Id: I0793b416513b81b3d74849f0b58dbdc91f075ac6
 2020-03-29 10:43:54 -07:00
Rahul Frias
f88d610570 Merge "Reject partial clear subsamples when keys are not loaded" into rvc-dev am: 3560247878 am: c79babac4c am: bb38d223f8 am: 4b28c9b871 am: 1aaa864456 
Change-Id: Ib44e7baf058247fcc9cd7b84efad2e82a096d122
 2020-03-28 19:56:04 +00:00
Rahul Frias
1aaa864456 Merge "Reject partial clear subsamples when keys are not loaded" into rvc-dev am: 3560247878 am: c79babac4c am: bb38d223f8 am: 4b28c9b871 
Change-Id: I1242eeb6600bdf8770166111a71f810eb8b8d9b6
 2020-03-28 19:47:31 +00:00
Rahul Frias
ce2a165929 Merge "Reject partial clear subsamples when keys are not loaded" into rvc-dev am: 3560247878 am: eba182293d am: e53740a0c4 am: ac2dadef0e 
Change-Id: Ie9dc79f38087cbf4843d3d031f576dbc9a4c5005
 2020-03-28 19:47:24 +00:00
Rahul Frias
f3889b69e6 Merge "Reject partial clear subsamples when keys are not loaded" into rvc-dev am: 3560247878 am: c79babac4c am: 93bb315c8e am: ce55664f89 
Change-Id: I1df6038bf84ee6191b0d96e21cd55c47cd15b447
 2020-03-28 19:47:16 +00:00