Commit Graph

1073 Commits

Author SHA1 Message Date
John "Juce" Bruce
1d7fb7cdf8 Merge "Add OS Version to Properties" into lmp-mr1-dev
automerge: 039b984

* commit '039b984a752f96038db15922181c7a9ff9736694':
  Add OS Version to Properties
2014-11-07 20:35:46 +00:00
John "Juce" Bruce
039b984a75 Merge "Add OS Version to Properties" into lmp-mr1-dev 2014-11-07 20:04:55 +00:00
John "Juce" Bruce
31f87bc19e Add OS Version to Properties
(This is a merge of http://go/wvgerrit/11613 from the Widevine CDM
repo.)

Adds a property for the OS version, implements it on Android, and
adds it to the license request property bag so that Netflix may
use it to discern the supported capabilities of the CDM.

Bug: 18230738
Change-Id: If5174a108093855314f3e0102b83691e20bb247b
2014-11-07 11:47:51 -08:00
Fred Gylys-Colwell
f9b4b25f46 Merge "Adjust PreventNonceFlood tests" into lmp-mr1-dev
automerge: def3c4d

* commit 'def3c4d5b8aa7739bf8d686399f5e49e84a2ffa0':
  Adjust PreventNonceFlood tests
2014-11-07 19:43:25 +00:00
Fred Gylys-Colwell
def3c4d5b8 Merge "Adjust PreventNonceFlood tests" into lmp-mr1-dev 2014-11-07 19:27:22 +00:00
Edwin Wong
e9091b30db am 59da4188: Remove corrupted license file from storage.
* commit '59da4188833cf281043a08deb788e59cca23b153':
  Remove corrupted license file from storage.
2014-11-07 15:29:28 +00:00
Fred Gylys-Colwell
2ca704e5c0 Adjust PreventNonceFlood tests
The OEMCrypto library should prevent too many nonces from occuring in
a row. Previously, we tested that GenerateNonce generated an error if
there were too many nonce requests.

This CL makes it possible for OEMCrypto to delay the return from
GenerateNonce if there are too many requests.  This is an equally
valid solution to the nonce flood attack.

This is a unit test change only.  No production code is affected.

This is a merge from the widevine repository of:
https://widevine-internal-review.googlesource.com/#/c/11604/

bug: 17630253
Change-Id: Ie97f712d70230cd8e7ea7089da0aa18039673bb4
2014-11-06 22:12:51 -08:00
Alvin Huang
791d35e726 am fb651077: Try to fix the build break caused by WVMExtractorImpl.cpp
* commit 'fb651077bae9ac717e32470ec7db0dc69997efc5':
  Try to fix the build break caused by WVMExtractorImpl.cpp
2014-11-07 04:13:04 +00:00
Edwin Wong
59da418883 Remove corrupted license file from storage.
(This is a port of http://go/wvgerrit/11614 from the
 Widevine repo.)

CDM does not recover if a license file has invalid size
or the hash is incorrect. Remove the corrupted license
file in such cases.

bug: 18002606

Change-Id: I46dec853ce6b2e7c7430297d50df5d30488cde3b
2014-11-06 17:07:48 -08:00
Alvin Huang
fb651077ba Try to fix the build break caused by WVMExtractorImpl.cpp
Merge of https://partner-android-review.googlesource.com/#/c/186263

bug: 18279011

Change-Id: I6d4482827b17ea671a4bd73ab79486583a83fcbf
2014-11-06 21:59:37 +00:00
Jeff Tinker
de11df88dc am 960718a6: Merge "Wire Up Max-Res Plumbing" into lmp-mr1-dev
* commit '960718a673aeda9ead3b68e2722799c8b6fa6b7d':
  Wire Up Max-Res Plumbing
2014-11-06 02:48:17 +00:00
Jeff Tinker
33d0f6b534 am 418887a5: Merge "Add Max-Res Decode Engine to CDM Core" into lmp-mr1-dev
* commit '418887a5e72861c837bc3c579c3ea49ff838e49d':
  Add Max-Res Decode Engine to CDM Core
2014-11-06 02:48:16 +00:00
Fred Gylys-Colwell
35f9c18003 am 20191d99: Allow Secure Stops to be queried and deleted by application ID
* commit '20191d996c1aace4544e0b59466e3a0321e6b980':
  Allow Secure Stops to be queried and deleted by application ID
2014-11-06 02:48:14 +00:00
Jeff Tinker
960718a673 Merge "Wire Up Max-Res Plumbing" into lmp-mr1-dev 2014-11-06 02:36:01 +00:00
Jeff Tinker
418887a5e7 Merge "Add Max-Res Decode Engine to CDM Core" into lmp-mr1-dev 2014-11-06 02:35:56 +00:00
Fred Gylys-Colwell
20191d996c Allow Secure Stops to be queried and deleted by application ID
This CL changes the WVDrmPlugin so that an application can segregate
its secure stops from those of other applications by setting an
application ID.

This CL is a merge of the following Widevine CLs:
https://widevine-internal-review.googlesource.com/#/c/11565/
Add getSecureStop by ssid

https://widevine-internal-review.googlesource.com/#/c/11572
Add getSecureStop by SSID and releaseAllSecureStops by app id.

https://widevine-internal-review.googlesource.com/#/c/11564/
Store Usage Info by App Id (device_file stubs)

https://widevine-internal-review.googlesource.com/#/c/11563/
Add application id to StoreUsageInfo.

https://widevine-internal-review.googlesource.com/#/c/11561/
Added Application ID to PropertySet for secure stop.

bug: 18053197
bug: 18076411
Change-Id: I5444baf67ba1b960dee2dc958bced8de82ab70a3
2014-11-05 17:39:44 -08:00
John "Juce" Bruce
e4252f3861 Wire Up Max-Res Plumbing
(This is a port of http://go/wvgerrit/11556 from the Widevine CDM
repo.)

This wires up the new method on the crypto interface with the core
code that handles the max-res decode.

Bug: 16034599
Change-Id: Id2ea5635bf732eabf1fd33712ff8bab6cf1a1745
2014-11-04 11:55:27 -08:00
John "Juce" Bruce
12821d5968 Add Max-Res Decode Engine to CDM Core
(This is a port of http://go/wvgerrit/11555 from the Widevine CDM
repo.)

Bug: 16034599
Change-Id: Ie69afac7d89e27623adbc84d2baebccf1d1ba6e6
2014-11-04 11:55:23 -08:00
Jeff Tinker
a52bf2233c Ensure crypto gets terminated on error.
automerge: b3650a9

* commit 'b3650a9661a7c1cac1c876f70a040d8a6f523657':
  Ensure crypto gets terminated on error.
2014-10-18 03:30:37 +00: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
ce78a7f64a Protect Session ID List With a Lock
automerge: 3da4f9d

* commit '3da4f9d7d502aa544542c3f469b57faa8c23c49b':
  Protect Session ID List With a Lock
2014-10-16 19:28:45 +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
1edf1c172c Flush instruction cache for arm in haystack code
automerge: 95658e7

* commit '95658e73b2baf391e0033b407e1b8c4925171faa':
  Flush instruction cache for arm in haystack code
2014-10-05 15:51:55 +00:00
Jeff Tinker
e104128121 Eliminate delay in MediaDrm.closeSession for widevine CDM
automerge: 16abc11

* commit '16abc110bbb1e44ecbf605ea5eb96cbb1229c5e7':
  Eliminate delay in MediaDrm.closeSession for widevine CDM
2014-10-05 05:02:13 +00:00
Jeff Tinker
9e83c8b749 Merge "Report WOULD_BLOCK if buffer is non-empty instead of ERROR_IO" into lmp-dev
automerge: 30e4ba6

* commit '30e4ba61bd8be252ce1f1ab72b5875cbbaa75305':
  Report WOULD_BLOCK if buffer is non-empty instead of ERROR_IO
2014-10-05 03:15:06 +00:00
Lajos Molnar
570417ded5 Dequeue new input buffer once old on is queued
automerge: 63aa037

* commit '63aa037b036b4234b99f34506ae9b246c3651c0a':
  Dequeue new input buffer once old on is queued
2014-10-05 03:12:35 +00: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
31a53185da am 138160dd: Update license request url to new signed Widevine UAT proxy.
* commit '138160ddea41b6123aa4beea27d7de41a320c6b9':
  Update license request url to new signed Widevine UAT proxy.
2014-09-18 22:37:40 +00:00
Edwin Wong
42f368d033 am 7bf1daa4: Update Widevine classic integration guide.
* commit '7bf1daa432acd062cd40a4c2232e6bc456c676b1':
  Update Widevine classic integration guide.
2014-09-18 22:37:37 +00: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
49450b8f52 am 887dcfef: Revert workaround for WVv9 netflix license issue on fugu and molly
* commit '887dcfef6be049aba661a1ffdccbda84bf02a47c':
  Revert workaround for WVv9 netflix license issue on fugu and molly
2014-09-08 21:16:01 +00: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
ef8f1f21c6 am 457998d6: Correctly handle missing entry in DeactivateUsageEntry
* commit '457998d677f23cd46c0549abfde89abcd51d8d1b':
  Correctly handle missing entry in DeactivateUsageEntry
2014-09-05 23:04:28 +00:00
Fred Gylys-Colwell
1995a8bce9 am 72b47e57: Clarify Documentation
* commit '72b47e5789db7a54e375dfb3bd4ba16f347f1624':
  Clarify Documentation
2014-09-05 22:15:08 +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
04d36ea71f am 29b228a1: Merge "Corrections for license release on fallback to L3" into lmp-dev
* commit '29b228a10bf50a8546004154716cd81d513e7f82':
  Corrections for license release on fallback to L3
2014-09-04 18:58:09 +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
9bf29faddd am c6723c56: Remove Widevine Classic MediaCodec mode from application.
* commit 'c6723c564a16f6e948fd06d23e86cfdbfdb2d319':
  Remove Widevine Classic MediaCodec mode from application.
2014-09-04 03:38:33 +00: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
da75841efa am eb4b7cdc: Merge "Catch null pst in OEMCrypto" into lmp-dev
* commit 'eb4b7cdc473ef8fe00f246c4e56f5ab8af0f2f1b':
  Catch null pst in OEMCrypto
2014-09-04 00:15:59 +00:00
Edwin Wong
6d573f40bc am 96721d71: Update Widevine Classic Library to 4.5.0.10127.
* commit '96721d7145a4b38beee9fa6028534b452829f04f':
  Update Widevine Classic Library to 4.5.0.10127.
2014-09-04 00:15:58 +00: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