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

3777 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
ac2dadef0e Merge "Reject partial clear subsamples when keys are not loaded" into rvc-dev am: 3560247878 am: eba182293d am: e53740a0c4 
Change-Id: I03e00b968e99196bd53bd875fad98990ea9adfb5
 2020-03-28 19:31:15 +00:00
Rahul Frias
ce55664f89 Merge "Reject partial clear subsamples when keys are not loaded" into rvc-dev am: 3560247878 am: c79babac4c am: 93bb315c8e 
Change-Id: I514b0ec18e4b124dc8979826ed25730821e391d8
 2020-03-28 19:31:08 +00:00
Rahul Frias
4b28c9b871 Merge "Reject partial clear subsamples when keys are not loaded" into rvc-dev am: 3560247878 am: c79babac4c am: bb38d223f8 
Change-Id: I96a8df06aa5c94e7ada10ffe860202a748aeb1a6
 2020-03-28 19:31:06 +00:00
Rahul Frias
bb38d223f8 Merge "Reject partial clear subsamples when keys are not loaded" into rvc-dev am: 3560247878 am: c79babac4c 
Change-Id: I1e826fc634e3517898c10caa61624cc905242608
 2020-03-28 19:09:26 +00:00
Rahul Frias
e53740a0c4 Merge "Reject partial clear subsamples when keys are not loaded" into rvc-dev am: 3560247878 am: eba182293d 
Change-Id: I917f52263e70e03ea958c789b2f366fc29e19608
 2020-03-28 19:09:26 +00:00
Rahul Frias
93bb315c8e Merge "Reject partial clear subsamples when keys are not loaded" into rvc-dev am: 3560247878 am: c79babac4c 
Change-Id: Icfa7b9cf7c3714f86e3de812f386512f2be9a312
 2020-03-28 19:09:14 +00:00
Rahul Frias
eba182293d Merge "Reject partial clear subsamples when keys are not loaded" into rvc-dev am: 3560247878 
Change-Id: I8af7288266e5ad5ec82685ea7b467e8ef35a29cb
 2020-03-28 18:43:07 +00:00
Rahul Frias
c79babac4c Merge "Reject partial clear subsamples when keys are not loaded" into rvc-dev am: 3560247878 
Change-Id: I1a0ebfba3f4648e44dc3f28870076c6a6e0f1cc2
 2020-03-28 18:42:55 +00:00
Rahul Frias
3560247878 Merge "Reject partial clear subsamples when keys are not loaded" into rvc-dev 2020-03-28 18:24:15 +00:00
Rahul Frias
734aea940b Reject partial clear subsamples when keys are not loaded 
[ Merge of http://go/wvgerrit/96514 ]

The combined decryption call feature was introduced in android R.
In earlier releases, subsamples were passed one at a time for
decryption within the plugin. A decryption request that consists
entirely of clear data should be passed on to OEMCrypto even if
no keys are loaded.

A sample might consist of subsamples of clear and protected data.
In legacy mode, this proved to be an issue for OEMCrypto if the clear
subsamples were passed on but the protected ones were rejected (b/110251447).

For legacy mode and in the absence of keys being loaded, the subsample will
be passed to OEMCrypto only if the clear lead/frame is in a single subsample
and not broken up across multiple subsamples.

Bug: 150316417
Test: WV android unit/integration tests
Change-Id: Iff8ae8f58530cb9c5d31ce388742443ae807c16f
 2020-03-27 15:07:29 -07:00
John W. Bruce
1f08e4dcf1 Update OEMCrypto Version Compatibility Document 
(This is a merge of http://go/wvgerrit/96723.)

This syncs the document with the current version in Google Docs. Changes
since the last version:

* Specified that the Cobalt table only applies to First-Party Platforms
* Filled in gaps in Cobalt table
* Updated the Android R entry to reflect that some devices will stay on
  v15
* Added further details on the contents of various OEMCrypto v16
  versions
* Corrected Cobalt versions erroneously marked as Supported
* Updated copyright statement for 2020
* Reworded the header on the CE CDM section
* Corrected which CE CDM versions used OEMCrypto v8
* Put a section heading on the first table in the document to clarify
  that it is not a table of contents nor a document version history

Bug: 151455443
Test: Verified PDF visually
Change-Id: I0a15f79a58a94cda178018373852582abb6c1463
 2020-03-27 13:41:59 -07:00
Fred Gylys-Colwell
c5dcb0dbca Add unit test for preloaded license am: ca404aae6f am: ab82b4b78f am: f2c24373a6 am: e3f5c1ae3f 
Change-Id: Ibf9ab418251b97b2bb15d69d7fc7c37949d14804
 2020-03-27 19:47:01 +00:00
Fred Gylys-Colwell
6e12c64da2 Add unit test for preloaded license am: ca404aae6f am: 6bd4b47612 am: 64e528dc99 
Change-Id: I080c5f4fab3947d4e910e9e2472dac389c9a54fb
 2020-03-27 19:36:08 +00:00
Fred Gylys-Colwell
3cdcf12c20 Add unit test for preloaded license am: ca404aae6f am: ab82b4b78f am: d8ea3672c4 
Change-Id: Icf7f0036654ae5609bbe3c653fc8447c265567b0
 2020-03-27 19:34:53 +00:00
Fred Gylys-Colwell
e3f5c1ae3f Add unit test for preloaded license am: ca404aae6f am: ab82b4b78f am: f2c24373a6 
Change-Id: I092fdbd44330551134a6bb98511858cc9cbef0dc
 2020-03-27 19:31:36 +00:00
Fred Gylys-Colwell
64e528dc99 Add unit test for preloaded license am: ca404aae6f am: 6bd4b47612 
Change-Id: I0ce97c01bceaa48a5ea8fce2870f8c072eca3fbe
 2020-03-27 19:21:28 +00:00
Fred Gylys-Colwell
f2c24373a6 Add unit test for preloaded license am: ca404aae6f am: ab82b4b78f 
Change-Id: Icfcfda4c1410426ba3364907594a513052b04455
 2020-03-27 19:21:27 +00:00
Fred Gylys-Colwell
d8ea3672c4 Add unit test for preloaded license am: ca404aae6f am: ab82b4b78f 
Change-Id: I650eec69db450862ca645b1cab0f55c20926a635
 2020-03-27 19:21:04 +00:00