Commit Graph

1057 Commits

Author SHA1 Message Date
Kyle Alexander
4d84216089 DO NOT MERGE ANYWHERE Update license tests to use Widevine license service am: 99941b86b6 -s ours am: e525aad042 -s ours am: b58de75756 -s ours
am: 12c6b681e5  -s ours

* commit '12c6b681e54493ab27388dee09b0925abdc2cd40':
  DO NOT MERGE ANYWHERE Update license tests to use Widevine license service
2015-12-18 20:44:32 +00:00
Kyle Alexander
12c6b681e5 DO NOT MERGE ANYWHERE Update license tests to use Widevine license service am: 99941b86b6 -s ours am: e525aad042 -s ours
am: b58de75756  -s ours

* commit 'b58de757563fca92eb1e610abb345beab44c62de':
  DO NOT MERGE ANYWHERE Update license tests to use Widevine license service
2015-12-18 20:42:43 +00:00
Kyle Alexander
b58de75756 DO NOT MERGE ANYWHERE Update license tests to use Widevine license service am: 99941b86b6 -s ours
am: e525aad042  -s ours

* commit 'e525aad0429d7c3af4e700c59974212d99473d98':
  DO NOT MERGE ANYWHERE Update license tests to use Widevine license service
2015-12-18 20:40:32 +00:00
Kyle Alexander
e525aad042 DO NOT MERGE ANYWHERE Update license tests to use Widevine license service
am: 99941b86b6  -s ours

* commit '99941b86b6c413a21d7850423a1d83105aa0e471':
  DO NOT MERGE ANYWHERE Update license tests to use Widevine license service
2015-12-18 20:38:36 +00:00
Kyle Alexander
99941b86b6 DO NOT MERGE ANYWHERE Update license tests to use Widevine license service
Based from Widevine cl:
https://widevine-internal-review.googlesource.com/#/c/16322/

Bug: 26046529
Change-Id: Ib8a4fd1588de35a02973bca1914a298a62a71f7c
2015-12-15 17:46:18 +00:00
Edwin Wong
3b3b609173 resolve merge conflicts of fea63b4062 to jb-mr1-dev. am: f7c043f32d am: 27133e7a03 am: 655574d968 am: 94dab9e905 am: ee415b7b68 am: 1afb1066cc am: 2253f6c392 am: 10b2b36a1e
am: de6d223b82

* commit 'de6d223b82af5c5643cfc9f11745a830fd067b57':
  Update Widevine Classic Library to 601_AndroidOS_J.7809 **** DO NOT MERGE ****
2015-10-20 04:28:23 +00:00
Edwin Wong
4c2eb98d09 resolve merge conflicts of c0b8030851 to jb-mr1.1-dev. am: f78b0e780e am: 9617db4d71 am: 5754438dc1 am: d5a1d5d58d am: 2ee45a97b0 am: ac1854b989
am: fc1240bdc2

* commit 'fc1240bdc2008ce28aca3f1f2f2c13ed1a8bab4c':
  Update Widevine Classic Library to 4.5.0.10109 **** DO NOT MERGE ****
2015-10-20 04:26:43 +00:00
Edwin Wong
de6d223b82 resolve merge conflicts of fea63b4062 to jb-mr1-dev. am: f7c043f32d am: 27133e7a03 am: 655574d968 am: 94dab9e905 am: ee415b7b68 am: 1afb1066cc am: 2253f6c392
am: 10b2b36a1e

* commit '10b2b36a1eba2bd8d1de0a6dadb0fb6df3be4c01':
  Update Widevine Classic Library to 601_AndroidOS_J.7809 **** DO NOT MERGE ****
2015-10-20 04:26:42 +00:00
Edwin Wong
10b2b36a1e resolve merge conflicts of fea63b4062 to jb-mr1-dev. am: f7c043f32d am: 27133e7a03 am: 655574d968 am: 94dab9e905 am: ee415b7b68 am: 1afb1066cc
am: 2253f6c392

* commit '2253f6c392de69b9f0d10ed92170f96c2169085b':
  Update Widevine Classic Library to 601_AndroidOS_J.7809 **** DO NOT MERGE ****
2015-10-20 04:24:53 +00:00
Edwin Wong
fc1240bdc2 resolve merge conflicts of c0b8030851 to jb-mr1.1-dev. am: f78b0e780e am: 9617db4d71 am: 5754438dc1 am: d5a1d5d58d am: 2ee45a97b0
am: ac1854b989

* commit 'ac1854b9899a099d83dd2f2eecd7e0cc5ae285be':
  Update Widevine Classic Library to 4.5.0.10109 **** DO NOT MERGE ****
2015-10-20 04:24:53 +00:00
Edwin Wong
2253f6c392 resolve merge conflicts of fea63b4062 to jb-mr1-dev. am: f7c043f32d am: 27133e7a03 am: 655574d968 am: 94dab9e905 am: ee415b7b68
am: 1afb1066cc

* commit '1afb1066cca307559d2b67e6b8fad28ad335f3ff':
  Update Widevine Classic Library to 601_AndroidOS_J.7809 **** DO NOT MERGE ****
2015-10-20 04:23:06 +00:00
Edwin Wong
ac1854b989 resolve merge conflicts of c0b8030851 to jb-mr1.1-dev. am: f78b0e780e am: 9617db4d71 am: 5754438dc1 am: d5a1d5d58d
am: 2ee45a97b0

* commit '2ee45a97b06ba41ffc663b69ecb6b22547577258':
  Update Widevine Classic Library to 4.5.0.10109 **** DO NOT MERGE ****
2015-10-20 04:23:06 +00:00
Edwin Wong
2ee45a97b0 resolve merge conflicts of c0b8030851 to jb-mr1.1-dev. am: f78b0e780e am: 9617db4d71 am: 5754438dc1
am: d5a1d5d58d

* commit 'd5a1d5d58deaf2a226ec6981db5b3be79dc6e2e6':
  Update Widevine Classic Library to 4.5.0.10109 **** DO NOT MERGE ****
2015-10-20 04:21:24 +00:00
Edwin Wong
1afb1066cc resolve merge conflicts of fea63b4062 to jb-mr1-dev. am: f7c043f32d am: 27133e7a03 am: 655574d968 am: 94dab9e905
am: ee415b7b68

* commit 'ee415b7b681e36e157be49e437797153887347bb':
  Update Widevine Classic Library to 601_AndroidOS_J.7809 **** DO NOT MERGE ****
2015-10-20 04:14:58 +00:00
Edwin Wong
d5a1d5d58d resolve merge conflicts of c0b8030851 to jb-mr1.1-dev. am: f78b0e780e am: 9617db4d71
am: 5754438dc1

* commit '5754438dc1ce01849b9faa910dec7a32b5b8e086':
  Update Widevine Classic Library to 4.5.0.10109 **** DO NOT MERGE ****
2015-10-20 04:13:17 +00:00
Edwin Wong
ee415b7b68 resolve merge conflicts of fea63b4062 to jb-mr1-dev. am: f7c043f32d am: 27133e7a03 am: 655574d968
am: 94dab9e905

* commit '94dab9e9051905b268eec5aede093482f0d5bc95':
  Update Widevine Classic Library to 601_AndroidOS_J.7809 **** DO NOT MERGE ****
2015-10-20 04:13:17 +00:00
Edwin Wong
5754438dc1 resolve merge conflicts of c0b8030851 to jb-mr1.1-dev. am: f78b0e780e
am: 9617db4d71

* commit '9617db4d71ed795f0733c4e02d56d625b576f158':
  Update Widevine Classic Library to 4.5.0.10109 **** DO NOT MERGE ****
2015-10-20 04:11:35 +00:00
Edwin Wong
94dab9e905 resolve merge conflicts of fea63b4062 to jb-mr1-dev. am: f7c043f32d am: 27133e7a03
am: 655574d968

* commit '655574d96893b9a920253efb2f3a9a0bf6052593':
  Update Widevine Classic Library to 601_AndroidOS_J.7809 **** DO NOT MERGE ****
2015-10-20 04:11:35 +00:00
Edwin Wong
655574d968 resolve merge conflicts of fea63b4062 to jb-mr1-dev. am: f7c043f32d
am: 27133e7a03

* commit '27133e7a032140cbe2d2eb492a18e1f4c8af67cd':
  Update Widevine Classic Library to 601_AndroidOS_J.7809 **** DO NOT MERGE ****
2015-10-20 04:08:24 +00:00
Edwin Wong
9617db4d71 resolve merge conflicts of c0b8030851 to jb-mr1.1-dev.
am: f78b0e780e

* commit 'f78b0e780e470d460d18dd65a576931760629aec':
  Update Widevine Classic Library to 4.5.0.10109 **** DO NOT MERGE ****
2015-10-20 04:08:23 +00:00
Edwin Wong
f78b0e780e resolve merge conflicts of c0b8030851 to jb-mr1.1-dev.
Change-Id: I3a89161de0bf84fc6257338a3e932b90feba3f82
2015-10-19 20:59:36 -07:00
Edwin Wong
27133e7a03 resolve merge conflicts of fea63b4062 to jb-mr1-dev.
am: f7c043f32d

* commit 'f7c043f32da2a8fc7520b6f0cc5c8a39cb1abf18':
  Update Widevine Classic Library to 601_AndroidOS_J.7809 **** DO NOT MERGE ****
2015-10-20 02:59:35 +00:00
Edwin Wong
c0b8030851 resolve merge conflicts of 769288d009 to jb-mr1.1-docs.
Change-Id: I26df84f2907bcd18a2646bec0fbe53d9624e5a9b
2015-10-19 18:32:07 -07:00
Edwin Wong
f7c043f32d resolve merge conflicts of fea63b4062 to jb-mr1-dev.
Change-Id: Ia5dd0316bb057dbc2e185f720d194548d2a370a6
2015-10-19 18:22:48 -07:00
Jeff Tinker
1827f14b68 am c1447241: (-s ours) am 693f0813: am 87922237: DO NOT MERGE Part of fix for libmedia OOB write anywhere
* commit 'c14472413260a6b233282a6ff3acb58b6571ab5c':
  DO NOT MERGE Part of fix for libmedia OOB write anywhere
2015-08-21 16:27:34 +00:00
Jeff Tinker
c144724132 am 693f0813: am 87922237: DO NOT MERGE Part of fix for libmedia OOB write anywhere
* commit '693f0813814b10bfd23bea578fa258255477b207':
  DO NOT MERGE Part of fix for libmedia OOB write anywhere
2015-08-21 15:36:22 +00:00
Jeff Tinker
693f081381 am 87922237: DO NOT MERGE Part of fix for libmedia OOB write anywhere
* commit '87922237de893b92c7b4d252999dd91d04470bd0':
  DO NOT MERGE Part of fix for libmedia OOB write anywhere
2015-08-21 15:28:57 +00:00
Jeff Tinker
e5d4a0be30 DO NOT MERGE Part of fix for libmedia OOB write anywhere
Prevent usage of client provided address on
non-secure devices spoofed as being secure.

b/23223325

merge of go/wvgerrit/15420 from widevine repo

Change-Id: I1d4f3a652b3d5e78fca508f92005cfa8df5ec6db
2015-08-20 21:56:50 +00:00
Jeff Tinker
87922237de DO NOT MERGE Part of fix for libmedia OOB write anywhere
Prevent usage of client provided address on
non-secure devices spoofed as being secure.

b/23223325

merge of go/wvgerrit/15420 from widevine repo

Change-Id: I1d4f3a652b3d5e78fca508f92005cfa8df5ec6db
2015-08-20 14:49:43 -07:00
Fred Gylys-Colwell
1514ae0dfb Terminate Level 1 OEMCrypto on Initialization Error
Cherry pick of the widevine change
https://widevine-internal-review.googlesource.com/#/c/12082/

If the level 1 oemcrypto library loads and initializes, but has the
wrong version or does not have a valid keybox, then the level 3
fallback is used.   However, in those cases, the level 1 was not
terminated properly.  This caused a resource leak on some platforms.

With this CL, in OEMCrypto_Initialize, the level 1 library Terminate
is called if its Initialize was called and the level 1 library will
not be used.

bug: 18755226
Change-Id: I56e7d3349eeebd94f3fa8c4a1f4b21781cc7428b
(cherry picked from commit 62a9cf3cbe)
2015-01-23 00:08:10 +00:00
Jeff Tinker
1a5103c739 Include WV classic L3 libraries for x86 in Lollipop branches
bug: 18985145
Change-Id: I659c10b33dc79bf44a6da907d168e1ef61df2172
2015-01-14 12:21:51 -08:00
Jeff Tinker
b3650a9661 Ensure crypto gets terminated on error.
Change-Id: If5ade69f98eb4511064b649fa5a8544065753d97
related-to-bug: 17062671
2014-10-18 00:48:54 +00:00
John "Juce" Bruce
3da4f9d7d5 Protect Session ID List With a Lock
(This is a merge of
https://widevine-internal-review.googlesource.com/#/c/11405
from the Widevine CDM Repo.)

AUPT is revealing a crash when destructing WVDrmPlugin due to
multi-threaded contention over the session map. As a fix, we are now
protecting access to the map via a mutex.

Bug: 17761616
Change-Id: Iddeca657effd3c7f3ff35ce334d7979291667cef
2014-10-13 13:40:44 -07:00
Fred Gylys-Colwell
95658e73b2 Flush instruction cache for arm in haystack code
This is a merge of the widevine CL:
https://widevine-internal-review.googlesource.com/11254

On arm64, some devices are having random issues that probaby relate to
a stale instruction cache.  This code change flushes the cache for
pages that are going to be made executable.

b/17400000

Current Library Version:
  arm64:  Level3 Library Sep 25 2014 17:10:03

Change-Id: I3904e96e922654c055a478079aa52c29cbde8b9f
2014-09-30 14:43:22 -07:00
Jeff Tinker
16abc110bb Eliminate delay in MediaDrm.closeSession for widevine CDM
merge of https://widevine-internal-review.googlesource.com/11255
from the widevine cdm repo.

bug: 17657356
Change-Id: Ia228395c412c8d00ef0230f86f4b56469a1e6c69
2014-09-25 18:35:24 -07:00
Jeff Tinker
30e4ba61bd Merge "Report WOULD_BLOCK if buffer is non-empty instead of ERROR_IO" into lmp-dev 2014-09-25 01:51:02 +00:00
Jeff Tinker
e82044e05d Report WOULD_BLOCK if buffer is non-empty instead of ERROR_IO
Bug: 17423087
Change-Id: I4b1c5ead919649be3b820f63a030acac729fb06e
2014-09-25 01:39:29 +00:00
Lajos Molnar
63aa037b03 Dequeue new input buffer once old on is queued
Bug: 17630446
Change-Id: I9ce19849f85eba4c419e0dab8ea03a0675526366
2014-09-24 14:07:11 -07:00
Edwin Wong
138160ddea Update license request url to new signed Widevine UAT proxy.
Bug: 16631113
Change-Id: I442f9c9decd03213912c8c2befcbeccc2a332c53
2014-09-13 01:32:29 +00:00
Edwin Wong
7bf1daa432 Update Widevine classic integration guide.
Update "Deliverables" section.

Bug: 17405306
Change-Id: I0532aeee7b634c0a13b930efe2dbe8c7e264e561
2014-09-11 18:29:53 -07:00
Jeff Tinker
887dcfef6b Revert workaround for WVv9 netflix license issue on fugu and molly
related-to-bug: 17212907

Change-Id: I9a6eed207f8fbdbd621b9ecde2cb99112f02e9fa
2014-09-08 19:32:04 +00:00
Fred Gylys-Colwell
457998d677 Correctly handle missing entry in DeactivateUsageEntry
This is a copy of
https://widevine-internal-review.googlesource.com/#/c/11110/

The level 3 oemcrypto library version of DeactivateUsageEntry now
returns OEMCrypto_ERROR_INVALID_CONTEXT if there is no entry in the
usage table.

Current Library Version:
arm:  Level3 Library Sep  3 2014 18:13:47

b/17373630

Change-Id: Iaeb65b4ad4b2b9f3c6733a2c9c8d96e2be263d09
2014-09-05 14:21:07 -07:00
Fred Gylys-Colwell
72b47e5789 Clarify Documentation
This is a copy of
https://widevine-internal-review.googlesource.com/#/c/11115/

This CL just updates the integration guide.  In particular, the
following clarifiaction is made about usage tables:

The sentence:
  When the session using this key is closed, the entry in the table will
    be marked as inactive.
is replaced by
      After the session using this key is closed, the application will
      request that the entry in the table will be marked as inactive.

This should make it clear that OEMCrypto should not automaically
deactivate usage entries.  This behaviour is already verified by unit
tests.

bug: 17405160

Change-Id: If836c7c76205e6759c1c194a6f31232c52c4f179
2014-09-05 17:44:42 +00:00
Rahul Frias
29b228a10b Merge "Corrections for license release on fallback to L3" into lmp-dev 2014-09-04 18:35:03 +00:00
Rahul Frias
9bc13a07a0 Corrections for license release on fallback to L3
When falling back to L3, release requests were failing. Information
requesting falling back to L3 is passed along when the session is opened.
Licenses however are released using the key set ID and information
requesting fallback to L3(CdmClientPropertySet) at that point is
unavailable. The release was actually attempting to release a license
at the default security level which is incorrect.

In addition, the mac keys were not being setup correctly and the release
message was signed with keys derived from the license request and not the
response.  Both these issues have been addressed and unit tests added
to track release of offline licenses and usage reporting scenarios.

[ Merge of https://widevine-internal-review.googlesource.com/#/c/11062
  from wv cdm repo ]

b/17073910

Change-Id: I5cd95a7dfe58ebae7ae27ece6c92e67755c1d665
2014-09-04 10:29:10 -07:00
Edwin Wong
c6723c564a Remove Widevine Classic MediaCodec mode from application.
bug: 17303948
Change-Id: Ia0db7be1d99f8fab968641cbf57438ee1dd364ab
2014-09-03 18:06:00 -07:00
Fred Gylys-Colwell
eb4b7cdc47 Merge "Catch null pst in OEMCrypto" into lmp-dev 2014-09-03 23:03:03 +00:00
Edwin Wong
96721d7145 Update Widevine Classic Library to 4.5.0.10127.
Add openssl-0.9.8za.
https://widevine-internal-review.googlesource.com/#/c/10828/

Update openssl lib to 0.9.8za.
https://widevine-internal-review.googlesource.com/#/c/10862/

Update Version string to 601_AndroidOS_L.
https://widevine-internal-review.googlesource.com/#/c/10950/

Fix Build On lmp-dev.
https://widevine-internal-review.googlesource.com/#/c/10837/

Translate widevine:// Protocol In getConstrains() and checkRightsStatus().
https://widevine-internal-review.googlesource.com/#/c/10838/

Convert "widevine:" prefix for lm->Register() as well.
https://widevine-internal-review.googlesource.com/#/c/11080/

bug: 9835684
bug: 15932110

Change-Id: I1f996355cf13ffca8d0b6ed464aa7b59b5fe4458
2014-09-03 20:55:34 +00:00
Fred Gylys-Colwell
e51f8ba7a1 Catch null pst in OEMCrypto
This is a copy of
https://widevine-internal-review.googlesource.com/#/c/11030

It is an error for the key control block to have a nonzero replay
control flag and a null pst.  This CL adds unit tests to
oemcrypto_test to verify that oemcrypto checkes this.  A unit test is
also added for verifying that an offline license has a valid nonce the
first time it is loaded.

It also updates the reference implementation (mock) to check that the
pst is not empty when the replay control flag is nonzero.

It also updates the level 3 implementation to check that the pst is
not empty when the replay control flag is nonzero.

This change is compiled into the arm library, but because of
compilation errors, is not included in x86 or mips.

    Current Library Version:
    arm:  Level3 Library Aug 27 2014 18:42:40

bug: 16525204 OEMCrypto unit test for reloading offline license
bug: 16844305 Mock OEMCrypto does not catch null pst
Change-Id: Icdb090e80fc92522c187b26f30e5ba082f26363b
2014-09-03 11:46:10 -07:00
Rahul Frias
7c7f1f5d55 Merge "Address CDM request license unit test failures" into lmp-dev 2014-09-03 18:15:13 +00:00