widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
745 Commits 2 Branches 0 Tags
6b51eee87cc00bd020d2179c40e1a3004d36b88c
Commit Graph

745 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Tinker
6b51eee87c am 7db580d6: am dd672f0c: Merge "Use renewal URL in license tests" into klp-dev 
* commit '7db580d6b9a96fff5567a6fc5d5db460872b76c2':
  Use renewal URL in license tests
 2013-11-06 09:46:52 -08:00
Jeff Tinker
6308988a4a am cbcd885e: am 30469021: Merge "Search for keys in shared sessions only when content is encrypted" into klp-dev 
* commit 'cbcd885e7cd0d7a34bd2128bdf8033b0751b3e97':
  Search for keys in shared sessions only when content is encrypted
 2013-11-06 09:46:52 -08:00
Jeff Tinker
7db580d6b9 am dd672f0c: Merge "Use renewal URL in license tests" into klp-dev 
* commit 'dd672f0c68cd72dd957d0cbfe15207afccbd98e6':
  Use renewal URL in license tests
 2013-11-06 09:24:58 -08:00
Jeff Tinker
cbcd885e7c am 30469021: Merge "Search for keys in shared sessions only when content is encrypted" into klp-dev 
* commit '30469021715ae8747801cc7622deb1d2d608e78c':
  Search for keys in shared sessions only when content is encrypted
 2013-11-06 09:24:58 -08:00
Jeff Tinker
dd672f0c68 Merge "Use renewal URL in license tests" into klp-dev 2013-11-06 17:24:07 +00:00
Jeff Tinker
3046902171 Merge "Search for keys in shared sessions only when content is encrypted" into klp-dev 2013-11-06 17:22:33 +00:00
Jeff Tinker
30ae166370 am 5d8a218d: am 84e83f4a: Merge "Move OEMCrypto_Initialize earlier" into klp-dev 
* commit '5d8a218d3acad61f0168f4fe26b0ea2d094c66fb':
  Move OEMCrypto_Initialize earlier
 2013-10-31 15:51:54 -07:00
Jeff Tinker
5d8a218d3a am 84e83f4a: Merge "Move OEMCrypto_Initialize earlier" into klp-dev 
* commit '84e83f4a33d5a20b128bc201af2f6e9d6146947e':
  Move OEMCrypto_Initialize earlier
 2013-10-31 15:44:48 -07:00
Jeff Tinker
84e83f4a33 Merge "Move OEMCrypto_Initialize earlier" into klp-dev 2013-10-31 22:40:43 +00:00
Jeff Tinker
85ae0abcaf am 48b1acac: am 49e593d1: Stop policy timer before invoking session destructor 
* commit '48b1acac38b6c79baeb221247fa68a1a3cbe0ab6':
  Stop policy timer before invoking session destructor
 2013-10-30 11:14:17 -07:00
Jeff Tinker
48b1acac38 am 49e593d1: Stop policy timer before invoking session destructor 
* commit '49e593d12702a3ffd671402e585dc271cc72d65b':
  Stop policy timer before invoking session destructor
 2013-10-30 11:10:54 -07:00
Jeff Tinker
acb47e0f9a Move OEMCrypto_Initialize earlier 
Some OEMCrypto calls are happening before OEMCrypto_Initialize.
This change moves initialization earlier so it occurs before
any other calls to OEMCrypto.

bug: 10582250
Change-Id: Ic8992e8f0738dbfeb10074a4e1543bb9931a49d5
 2013-10-28 15:53:52 -07:00
Rahul Frias
64c3cb986a Use renewal URL in license tests 
After a change to the GPlay license server, it no longer accepts heartbeats
at the license server URL ( https://jmt17.google.com/video-dev/license/ ).
The CDM correctly reports https://jmt17.google.com/video-dev/heartbeat/
as the renewal URL but the current test code ignores the reported URL.
The license server then rejects the request and send back an empty
license response.

This causes WvCdmRequestLicenseTest.StreamingLicenseRenewal
and WvCdmRequestLicenseTest.StreamingLicenseRenewal to fail. Request
license tests have been modified to respect the renewal URL.

Merge of https://widevine-internal-review.googlesource.com/#/c/8188
from the widevine cdm repo

b/11290339

Change-Id: I1dcf8277edce99633086fb3db8ffeb7a32a5500d
 2013-10-25 13:15:56 -07:00
Rahul Frias
252a07316a Search for keys in shared sessions only when content is encrypted 
Also return NEED_KEY rather than KEY_ERROR if keys are not found.

Merge of https://widevine-internal-review.googlesource.com/#/c/8250
from the widevine cdm repo.

b/11375092

Change-Id: Ibc629e8b4018f43f5f9528258563a2af79bdfb4b
 2013-10-25 13:09:40 -07:00
Jeff Tinker
49e593d127 Stop policy timer before invoking session destructor 
The CDM session was being destroyed before the policy timer was stopped
and before the session was removed from a list of active sessions. This
allowed race conditions, where the policy timer would try to evaluate
policy for a closed session. This led to segfaults.
b/11338324

Merge of https://widevine-internal-review.googlesource.com/#/c/8240/1
from the widevine cdm repo.

Change-Id: Ib159ccfdb763a47da573f5c06c0793c2c63886c4
 2013-10-25 10:50:02 -07:00
Colin Cross
b9197a9ee6 am 022f09fe: am 6fc2ee33: set LOCAL_MODULE_OWNER for libwvdrmengine.so 
* commit '022f09fe9abe1ec2e374bcbc448acae0c7b3e1a7':
  set LOCAL_MODULE_OWNER for libwvdrmengine.so
 2013-10-24 13:32:55 -07:00
Colin Cross
022f09fe9a am 6fc2ee33: set LOCAL_MODULE_OWNER for libwvdrmengine.so 
* commit '6fc2ee33c3882e86eedba2004ddae150b6d0a09b':
  set LOCAL_MODULE_OWNER for libwvdrmengine.so
 2013-10-24 13:28:59 -07:00
Colin Cross
6fc2ee33c3 set LOCAL_MODULE_OWNER for libwvdrmengine.so 
Change-Id: I10d63ef381a612a0177ce5a3ddd24f44b6ae05a0
 2013-10-24 12:40:19 -07:00
Rahul Frias
43bda9deb5 am d5522d90: am e385ff3a: Do not close CDM session on removeKeys 
* commit 'd5522d903e35f14c66cf355cc30d681ef6e5ede6':
  Do not close CDM session on removeKeys
 2013-10-14 10:48:38 -07:00
Rahul Frias
d5522d903e am e385ff3a: Do not close CDM session on removeKeys 
* commit 'e385ff3a7fb52e66cc1d0e63a207dbf2f32f2362':
  Do not close CDM session on removeKeys
 2013-10-11 15:09:20 -07:00
Rahul Frias
e385ff3a7f Do not close CDM session on removeKeys 
A change was introduced between jb-mr2 and klp-dev that closed
the CDM session when the removeKeys mediaDrm APIs was called.
This was introduced because there is no way of unloading keys from
an OEMCrypto session.

This caused problems for Netflix, as an exception occurred when they
tried to close a session after calling removeKeys.

Reverting to jb-mr2 behaviour for now. b/11188818 has been opened to
track a longer term resolution.

b/11185042

Change-Id: I03bc736d2bc5bdabc86cfb7b75ae8bcbc03ffc7c
 2013-10-11 14:42:37 -07:00
Jeff Tinker
81b43b3055 am 6141ac4b: am 9b1d8119: Merge "Allows sharing of keys between sessions" into klp-dev 
* commit '6141ac4bc6983b140c1f29171552e1f2aa11dea0':
  Allows sharing of keys between sessions
 2013-10-11 10:07:30 -07:00
Jeff Tinker
6141ac4bc6 am 9b1d8119: Merge "Allows sharing of keys between sessions" into klp-dev 
* commit '9b1d8119e5e0c6496d2e84eb5ac9bc1d12fe983c':
  Allows sharing of keys between sessions
 2013-10-11 10:04:28 -07:00
Jeff Tinker
9b1d8119e5 Merge "Allows sharing of keys between sessions" into klp-dev 2013-10-11 17:02:00 +00:00
Rahul Frias
a0d55ac77a am b2cea8cd: am a74980b2: Address key selection and decryption concurrency issues 
* commit 'b2cea8cdd388997d7dc09cc2e5682ab041f7bf74':
  Address key selection and decryption concurrency issues
 2013-10-11 08:48:27 -07:00
Rahul Frias
b2cea8cdd3 am a74980b2: Address key selection and decryption concurrency issues 
* commit 'a74980b2f1b91727e39e3e558b3bec6a1ad8337b':
  Address key selection and decryption concurrency issues
 2013-10-11 08:43:11 -07:00
Rahul Frias
56bd5d5d82 Allows sharing of keys between sessions 
This change allows the app to specify that keys may be shared by sessions.
The app enables this by setting the session sharing properties in DRM Plugin.
Keys are shared only amoungst the specified group of sessions.

Merged from widevine CDM repo
 * https://widevine-internal-review.googlesource.com/#/c/8019/
 * https://widevine-internal-review.googlesource.com/#/c/8021/

Bug: 11013707
Change-Id: I52db41a53138b4fc563ebc6d38a623f23f7cdfb5
 2013-10-10 23:23:39 -07:00
Rahul Frias
a74980b2f1 Address key selection and decryption concurrency issues 
Decryption calls though multiple threads may result in race conditions
between the setting of the key and the actual call to decryption.
This results in OEMCrypto errors when the buffer type used in
decryption did not match the key selected. This is addressed by
having the the two calls be in the same critical section.

b/11009857

Change-Id: I74f1a0689ca17114f3cdd029022013b05c415acd
 2013-10-02 15:44:39 -07:00
Fred Gylys-Colwell
391c8abf65 am 5a4134e8: am 67c794ba: Add unit test for empty mac key 
* commit '5a4134e85231bccaa3dcf2bffae1d1d5eb2e0501':
  Add unit test for empty mac key
 2013-10-02 14:38:13 -07:00
Fred Gylys-Colwell
5a4134e852 am 67c794ba: Add unit test for empty mac key 
* commit '67c794bac351d0c15e00b5aca12cf3408e9bfe19':
  Add unit test for empty mac key
 2013-10-02 14:30:48 -07:00
John "Juce" Bruce
cdd277d863 am cfce154d: (-s ours) am fc0c408c: (-s ours) am 5a2e3f41: (-s ours) am 1e0e3e3a: (-s ours) am 470fb26f: am 071f6998: DO NOT MERGE - Update Widevine Classic on JB-MR1.1 to 4.5.0.10107 
* commit 'cfce154ddd07c5b2e2e390612b91f6a81c1c84b8':
  DO NOT MERGE - Update Widevine Classic on JB-MR1.1 to 4.5.0.10107
 2013-10-02 09:57:19 -07:00
Fred Gylys-Colwell
67c794bac3 Add unit test for empty mac key 
Merge of change https://widevine-internal-review.googlesource.com/7950.

In the OEMCrypto library, it is valid to call LoadKeys with an empty
mac key.  The library should not update the mac and enc keys and
should not throw an error.

Since we have seen this behavior in several implementations, a unit
test should be added that verifies the correct behavior.

bug: 11032674
Change-Id: I011ba39c8abc47547226a722143e92dac3f63dc5
 2013-10-01 19:02:16 -07:00
John "Juce" Bruce
cfce154ddd am fc0c408c: (-s ours) am 5a2e3f41: (-s ours) am 1e0e3e3a: (-s ours) am 470fb26f: am 071f6998: DO NOT MERGE - Update Widevine Classic on JB-MR1.1 to 4.5.0.10107 
* commit 'fc0c408c8d76bad5729aa84d3b608a61c26617d1':
  DO NOT MERGE - Update Widevine Classic on JB-MR1.1 to 4.5.0.10107
 2013-10-01 15:46:34 -07:00
John "Juce" Bruce
fc0c408c8d am 5a2e3f41: (-s ours) am 1e0e3e3a: (-s ours) am 470fb26f: am 071f6998: DO NOT MERGE - Update Widevine Classic on JB-MR1.1 to 4.5.0.10107 
* commit '5a2e3f41369239f6e614c30bef2fe2c116e464b0':
  DO NOT MERGE - Update Widevine Classic on JB-MR1.1 to 4.5.0.10107
 2013-10-01 15:43:07 -07:00
John "Juce" Bruce
5a2e3f4136 am 1e0e3e3a: (-s ours) am 470fb26f: am 071f6998: DO NOT MERGE - Update Widevine Classic on JB-MR1.1 to 4.5.0.10107 
* commit '1e0e3e3a9f220077a4bd61a8b34ad52d66773d1a':
  DO NOT MERGE - Update Widevine Classic on JB-MR1.1 to 4.5.0.10107
 2013-10-01 15:23:13 -07:00
John "Juce" Bruce
1e0e3e3a9f am 470fb26f: am 071f6998: DO NOT MERGE - Update Widevine Classic on JB-MR1.1 to 4.5.0.10107 
* commit '470fb26f7201e0f3161e5f0aea95743ad5d4aa11':
  DO NOT MERGE - Update Widevine Classic on JB-MR1.1 to 4.5.0.10107
 2013-10-01 15:19:32 -07:00
John "Juce" Bruce
470fb26f72 am 071f6998: DO NOT MERGE - Update Widevine Classic on JB-MR1.1 to 4.5.0.10107 
* commit '071f6998928ff2dbc0c5c3393f4ea9f0e6205ce9':
  DO NOT MERGE - Update Widevine Classic on JB-MR1.1 to 4.5.0.10107
 2013-10-01 15:17:45 -07:00
John "Juce" Bruce
071f699892 DO NOT MERGE - Update Widevine Classic on JB-MR1.1 to 4.5.0.10107 
This updates the Widevine Classic libraries to version 4.5.0.10107.
This version backports the bugfix for the IPv6 issue from JB-MR2.
Also, the Widevine build system has been updated to support all six
flavors. (2 security levels x 3 instruction sets)

This change adds x86 L1 binaries and MIPS L3 binaries, as these have
been validated by partners.

Bug: 10246711
Change-Id: Ic0cf32ffd82fc8dacced84cecdee059afa1049ca
 2013-10-01 15:12:21 -07:00
Jeff Tinker
a041a25e4d am c28be299: Avoid multiple loads of Device RSA private key 
* commit 'c28be299dc6579f29eb6c3872699232cc14bcf8c':
  Avoid multiple loads of Device RSA private key
 2013-09-20 11:21:51 -07:00
Jeff Tinker
c28be299dc Avoid multiple loads of Device RSA private key 
Molly reports OEMCrypto errors when Device RSA private key is
loaded a second time in the same session. This occurs in privacy
mode when a service certificate is request and later a key request is
generated.

bug: 10815492

Merge of https://widevine-internal-review.googlesource.com/#/c/7823/
from Widevine cdm repo

Change-Id: I98999fb0e77597109b68c379eaaa4838d3f6dde4
 2013-09-19 17:23:58 -07:00
Fred Gylys-Colwell
0460731eed am 4fbb9286: (-s ours) am 7ac83679: (-s ours) am e80df9e5: (-s ours) am fc913138: am 0b56285a: Update JBMR1 Widevine Libraries to 4.5.0.10095 (DO NOT MERGE) 
* commit '4fbb9286284acd5f0d330c79ce493ac616e5ca0c':
  Update JBMR1 Widevine Libraries to 4.5.0.10095 (DO NOT MERGE)
 2013-09-12 12:02:35 -07:00
Fred Gylys-Colwell
4fbb928628 am 7ac83679: (-s ours) am e80df9e5: (-s ours) am fc913138: am 0b56285a: Update JBMR1 Widevine Libraries to 4.5.0.10095 (DO NOT MERGE) 
* commit '7ac83679de4f8931d01bbd53697a2b8daf04051b':
  Update JBMR1 Widevine Libraries to 4.5.0.10095 (DO NOT MERGE)
 2013-09-12 11:58:45 -07:00
Fred Gylys-Colwell
7ac83679de am e80df9e5: (-s ours) am fc913138: am 0b56285a: Update JBMR1 Widevine Libraries to 4.5.0.10095 (DO NOT MERGE) 
* commit 'e80df9e55555d34385bfab29d40fd5f07ade16fd':
  Update JBMR1 Widevine Libraries to 4.5.0.10095 (DO NOT MERGE)
 2013-09-12 11:49:10 -07:00
Fred Gylys-Colwell
e80df9e555 am fc913138: am 0b56285a: Update JBMR1 Widevine Libraries to 4.5.0.10095 (DO NOT MERGE) 
* commit 'fc913138ac362253fc559a9d414dc4d46c4d154f':
  Update JBMR1 Widevine Libraries to 4.5.0.10095 (DO NOT MERGE)
 2013-09-12 11:16:14 -07:00
Fred Gylys-Colwell
fc913138ac am 0b56285a: Update JBMR1 Widevine Libraries to 4.5.0.10095 (DO NOT MERGE) 
* commit '0b56285a624338a87f7759f73faa0cda44b42cfa':
  Update JBMR1 Widevine Libraries to 4.5.0.10095 (DO NOT MERGE)
 2013-09-12 11:12:59 -07:00
John "Juce" Bruce
0dc5e24416 am 74e786cc: (-s ours) am 67a83a22: (-s ours) DO NOT MERGE - Update Widevine Classic to 4.5.0.10107 
* commit '74e786ccaf042d3ea3b0358e12aee4f1cb5a2b7f':
  DO NOT MERGE - Update Widevine Classic to 4.5.0.10107
 2013-09-12 10:13:26 -07:00
John "Juce" Bruce
74e786ccaf am 67a83a22: (-s ours) DO NOT MERGE - Update Widevine Classic to 4.5.0.10107 
* commit '67a83a22f77dca06f9f60f17111c0d8e1d737a87':
  DO NOT MERGE - Update Widevine Classic to 4.5.0.10107
 2013-09-12 10:08:58 -07:00
Kenny Root
069b9b5efe Use canonical UniquePtr.h file 
Change-Id: I2beb5107cd8842fa2f1fa8e8b482783e79bb05cb
 2013-09-11 23:33:25 -07:00
Kenny Root
c9e3cb4c00 Use canonical UniquePtr.h header 
Change-Id: Ic3ae70021a83128fcb57f8835f3ba66081ff2ed3
 2013-09-11 15:06:07 -07:00
Fred Gylys-Colwell
d475d0282a Added locking to session table in oemcrypto_adapter_dynamic. 
This change the merge from the android tree of:
https://widevine-internal-review.googlesource.com/7353

bug: 10447846

Change-Id: I0a2496fc6f225e0f3b23731c24087ddc6068c9cc
 2013-09-04 11:06:37 -07:00