Commit Graph

753 Commits

Author SHA1 Message Date
Jeff Tinker
78d44c3792 am 68e1e7c5: Merge "Generate a unique license request ID" into klp-dev
* commit '68e1e7c5784b8c189ff59c06517c7b5ae103631e':
  Generate a unique license request ID
2013-12-12 10:19:31 -08:00
Jeff Tinker
68e1e7c578 Merge "Generate a unique license request ID" into klp-dev 2013-12-12 18:17:34 +00:00
Madan Ankapura
15c2973b43 am 3567597a: Merge "Add x86 Builds for Widevine Classic 4.5.0.10113 - DO NOT MERGE" into klp-dev
* commit '3567597ada615fe8e914732284212e1e6a2569f3':
  Add x86 Builds for Widevine Classic 4.5.0.10113 - DO NOT MERGE
2013-12-06 19:19:11 -08:00
Madan Ankapura
3567597ada Merge "Add x86 Builds for Widevine Classic 4.5.0.10113 - DO NOT MERGE" into klp-dev 2013-12-07 02:33:12 +00:00
Rahul Frias
1b22c80568 Generate a unique license request ID
The request ID was set to a fixed value, which caused license requests
to be rejected by the YT server with TOO_MANY_STREAMS_PER_VIDEO

The request ID is now a combination of a randomly generated value and
a rolling index. This is based off a fix by gmorgan@ on the eureka
branch #98fa6e5e.

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

b/12018697

Change-Id: I6c05fea885d46aea53a07235c3e5ac65a6971eaf
2013-12-06 12:26:55 -08:00
John "Juce" Bruce
33a223dcf1 Add x86 Builds for Widevine Classic 4.5.0.10113 - DO NOT MERGE
Adds L1 x86 build of Widevine Classic that has been verified by partners.

Change-Id: Id85fea0e0311d06f0875a4aaedebaa9b00d17efa
2013-12-03 19:03:47 -08:00
Fred Gylys-Colwell
5905e530c9 am c53e0c77: Correct SelectKey return value when no keys loaded
* commit 'c53e0c778c172ac3dc411726649a2e7de17b3d82':
  Correct SelectKey return value when no keys loaded
2013-11-20 18:32:58 -08:00
Fred Gylys-Colwell
c53e0c778c Correct SelectKey return value when no keys loaded
Previously, Level 3 SelectKey returned no error when called before
any keys were loaded.  After this CL, it will return
OEMCrypto_ERROR_NO_CONTENT_KEY.

Library version:
arm  - Level3 Library Nov 20 2013 18:09:31
mips - Level3 Library Nov 20 2013 17:58:56
x86  - Level3 Library Nov 20 2013 18:13:01

bug: 11769839
Change-Id: I1b3f057e3ae9f2f174cae91f6849080345f02003
2013-11-20 18:18:43 -08:00
Jeff Tinker
4028bba8a7 am 113d4d07: Add end-to-end generic encrypt/decrypt/sign/verify tests
* commit '113d4d0755dc47348db40ad5d9f73f13355f86c4':
  Add end-to-end generic encrypt/decrypt/sign/verify tests
2013-11-13 09:52:05 -08:00
Jeff Tinker
113d4d0755 Add end-to-end generic encrypt/decrypt/sign/verify tests
bug: 11534771

Merge of https://widevine-internal-review.googlesource.com/#/c/8291/
from the Widevine CDM repo.

Change-Id: I76110013838f91c8009fe710586226c96de890be
2013-11-12 14:19:58 -08:00
Jeff Tinker
40311d0c6c am 357e6c41: Merge "Haystack and Obfuscated OEMCrypto Level 3" into klp-dev
* commit '357e6c419c55a492c8f79845664af68c9b4e7127':
  Haystack and Obfuscated OEMCrypto Level 3
2013-11-07 17:57:45 -08:00
Jeff Tinker
357e6c419c Merge "Haystack and Obfuscated OEMCrypto Level 3" into klp-dev 2013-11-08 01:54:44 +00:00
Jeff Tinker
48742bba5b am 8e5bc02e: Merge "Allow license renewals after expiry" into klp-dev
* commit '8e5bc02e51304ff6d093fbe1b06678e7fd2261bb':
  Allow license renewals after expiry
2013-11-07 11:13:19 -08:00
Jeff Tinker
8e5bc02e51 Merge "Allow license renewals after expiry" into klp-dev 2013-11-07 19:09:50 +00:00
Jeff Tinker
98872de379 am 0553f411: Add ExoPlayerDemo.apk to vendor/widevine so partners can access it and use to verify integrations.
* commit '0553f411db17ce24e2376c23deb333042431fbd7':
  Add ExoPlayerDemo.apk to vendor/widevine so partners can access it and use to verify integrations.
2013-11-07 09:46:44 -08:00
Jeff Tinker
0553f411db Add ExoPlayerDemo.apk to vendor/widevine so partners can access
it and use to verify integrations.

bug: 11357407

Change-Id: Ie38cef1dfd2fe685721e7fb4f37e881326321727
2013-11-06 14:28:09 -08:00
John "Juce" Bruce
9461926017 am fd482527: L1 System Lowered to L3 Still Requires Secure Decoders
* commit 'fd482527e4b07c6664bd463785a3ec8ba554a788':
  L1 System Lowered to L3 Still Requires Secure Decoders
2013-11-06 13:58:56 -08:00
John "Juce" Bruce
fd482527e4 L1 System Lowered to L3 Still Requires Secure Decoders
Merge of https://widevine-internal-review.googlesource.com/#/c/8263
from the Widevine repo.

Changes the behavior of requiresSecureDecoderComponent() to query the
session for whether a lowered security level has been requested
before querying the system to see what its default security level is.

As part of this, we added a new QuerySessionStatus() method to the
CDM that gets status info on a session-specific level, such as the
effective security level of a session.

Bug: 11428937
Change-Id: I5549a2fdd400cc87f567d27fcf74c473451093d6
2013-11-06 19:31:24 +00:00
Jeff Tinker
a3d689d983 am 0a9f0b1d: Merge "Upgrade Widevine Classic to 4.5.0.10113 - DO NOT MERGE" into klp-dev
* commit '0a9f0b1dd86d23e8f24bd31077cb52b7a74d4dd6':
  Upgrade Widevine Classic to 4.5.0.10113 - DO NOT MERGE
2013-11-06 10:05:27 -08:00
Jeff Tinker
0a9f0b1dd8 Merge "Upgrade Widevine Classic to 4.5.0.10113 - DO NOT MERGE" into klp-dev 2013-11-06 18:00:53 +00: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
Rahul Frias
774a078f1d Allow license renewals after expiry
Licenses could be renewed uptil the point of expiry. After that point
we expected that the session would have to be closed and a new one
opened with a new license loaded. Clank requested that we support
renewal of sessions past expiry.

In addition, the error returned on decryption, if OEMCrypto
determines that the KCB duration has expired, is NEED_KEY rather than
KEY_ERROR.

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

b/11390539

Change-Id: I023320f3f25514cd07b368701a92100429ce1c04
2013-11-05 16:40:17 -08:00
Fred Gylys-Colwell
becb1bf0be Haystack and Obfuscated OEMCrypto Level 3
This CL contains working versions of the haystack tools and the
OEMCrypto Level 3 library for android ARM, MIPS and x86.

The version number of the level 3 library is:
android/level3/arm/libwvlevel3.a  Level3 Library Nov  4 2013 18:39:06
android/level3/mips/libwvlevel3.a Level3 Library Nov  4 2013 18:42:29
android/level3/x86/libwvlevel3.a  Level3 Library Nov  4 2013 18:41:07

bug: 9374954 MediaDrm haystack based L3 code hardening implementation.
Change-Id: Ifef13900a11e83e4257723d3c6fc7107550882a8
2013-11-05 10:32:11 -08:00
John "Juce" Bruce
84b79eccb6 Upgrade Widevine Classic to 4.5.0.10113 - DO NOT MERGE
Contains the following, BC-Triaged fixes:

Bug: 8767242
Media player error -1010 on playback

Bug: 8342523
Android Media player is able to play WVM content if license is
already acquired

Change-Id: I3ee7863a5bf214fb8c4e4aefdd05f5062d568617
2013-11-04 12:03:41 -08: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
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
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
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
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
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
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
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