Commit Graph

1240 Commits

Author SHA1 Message Date
Edwin Wong
0b6b0372c0 am f6dd49f0: am 9ba13504: am cf4cd549: am 1c68225d: am 50bfcfdb: am e8fbb466: am 8daed73e: am 4f962df0: am c1dee5d8: am 35ebeec7: am f6ffee47: Fixed intermittent failure in GTS test.
* commit 'f6dd49f04a81cde7d4e241c15f8b2b2328bf9d9e':
  Fixed intermittent failure in GTS test.
2014-06-11 22:51:28 +00:00
Edwin Wong
f6dd49f04a am 9ba13504: am cf4cd549: am 1c68225d: am 50bfcfdb: am e8fbb466: am 8daed73e: am 4f962df0: am c1dee5d8: am 35ebeec7: am f6ffee47: Fixed intermittent failure in GTS test.
* commit '9ba13504396cc6a98e610894df8efb1f4fdc208f':
  Fixed intermittent failure in GTS test.
2014-06-11 22:45:09 +00:00
Edwin Wong
9ba1350439 am cf4cd549: am 1c68225d: am 50bfcfdb: am e8fbb466: am 8daed73e: am 4f962df0: am c1dee5d8: am 35ebeec7: am f6ffee47: Fixed intermittent failure in GTS test.
* commit 'cf4cd54924ee8b157b97f24696613d9edbe26570':
  Fixed intermittent failure in GTS test.
2014-06-11 22:40:34 +00:00
Edwin Wong
cf4cd54924 am 1c68225d: am 50bfcfdb: am e8fbb466: am 8daed73e: am 4f962df0: am c1dee5d8: am 35ebeec7: am f6ffee47: Fixed intermittent failure in GTS test.
* commit '1c68225dac88b0fe75b11a651613dc776f471ea8':
  Fixed intermittent failure in GTS test.
2014-06-11 22:35:46 +00:00
Edwin Wong
1c68225dac am 50bfcfdb: am e8fbb466: am 8daed73e: am 4f962df0: am c1dee5d8: am 35ebeec7: am f6ffee47: Fixed intermittent failure in GTS test.
* commit '50bfcfdbf8218fe878d5c135a27879d8977c5092':
  Fixed intermittent failure in GTS test.
2014-06-11 22:25:08 +00:00
Edwin Wong
50bfcfdbf8 am e8fbb466: am 8daed73e: am 4f962df0: am c1dee5d8: am 35ebeec7: am f6ffee47: Fixed intermittent failure in GTS test.
* commit 'e8fbb466028620f216f6ae698835a0af848f888a':
  Fixed intermittent failure in GTS test.
2014-06-11 22:21:20 +00:00
Edwin Wong
e8fbb46602 am 8daed73e: am 4f962df0: am c1dee5d8: am 35ebeec7: am f6ffee47: Fixed intermittent failure in GTS test.
* commit '8daed73ef7305c95abd28cd27c5bd13b3ae8b936':
  Fixed intermittent failure in GTS test.
2014-06-11 22:19:12 +00:00
Edwin Wong
8daed73ef7 am 4f962df0: am c1dee5d8: am 35ebeec7: am f6ffee47: Fixed intermittent failure in GTS test.
* commit '4f962df0b93564d3dbf62855279e2ea2ac4f1191':
  Fixed intermittent failure in GTS test.
2014-06-11 22:15:56 +00:00
Edwin Wong
4f962df0b9 am c1dee5d8: am 35ebeec7: am f6ffee47: Fixed intermittent failure in GTS test.
* commit 'c1dee5d84735b41dfd92f956418b833e1842a2be':
  Fixed intermittent failure in GTS test.
2014-06-11 22:12:24 +00:00
Edwin Wong
c1dee5d847 am 35ebeec7: am f6ffee47: Fixed intermittent failure in GTS test.
* commit '35ebeec71f3f0d0b763f1ef8cf3b98bae2aeee2e':
  Fixed intermittent failure in GTS test.
2014-06-11 22:08:36 +00:00
Edwin Wong
35ebeec71f am f6ffee47: Fixed intermittent failure in GTS test.
* commit 'f6ffee472c33b85d21c820862c398406e1c964b5':
  Fixed intermittent failure in GTS test.
2014-06-11 22:05:25 +00:00
Edwin Wong
f6ffee472c Fixed intermittent failure in GTS test.
Need to clear mEncKey in constructor, otherwise, decrypted data is wrong.

bug: 15540382
Change-Id: I0e2d4d6edd8a5800fa2a36e9f258782edc493e13
2014-06-11 11:39:28 -07:00
Jeff Tinker
83e860f3aa Merge "Fix offline test failures" into lmp-preview-dev 2014-06-02 17:23:24 +00:00
Jeff Tinker
0c4784d591 Merge "Fix AUPT: Native crash in /system/bin/mediaserver" into lmp-preview-dev 2014-06-02 17:21:39 +00:00
Jeff Tinker
4af7ac78a3 Fix offline test failures
GPlay offline tests were failing due to additional query parameters that were
introduced with b12789275. Additional changes caused offline failures,
as the content pointed to by the test vectors was HD only and did not
allow for offline playback.

This addresses the problem by switching request license tests to point to UAT.
UAT is now the default license server destination for request license tests.
Test vectors for GPlay will be added back as a secondary option when they
are available.

b/13909635

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

Change-Id: I5e5a2b477b6d591747123e8eeb3cd00b7f762090
2014-06-02 17:04:20 +00:00
Jeff Tinker
aefd8f323a Merge "Pack structure OEMCrypto_PST_Report" into lmp-preview-dev 2014-05-31 00:13:03 +00:00
Jeff Tinker
8611de4ead Fix AUPT: Native crash in /system/bin/mediaserver
Protect against invalid memcpy to NULL

bug: 15163357
Change-Id: Ifab17714473f45cb714a0ee765638733b3236ec8
2014-05-30 17:06:13 -07:00
Jeff Tinker
9a3b641752 Merge "Deprecate provisioning test URI" into lmp-preview-dev 2014-05-31 00:04:01 +00:00
Fred Gylys-Colwell
6f3e866882 Pack structure OEMCrypto_PST_Report
Because the OEMCrypto_PST_Report is sent as a signed block to the
server, it needs to be a fixed, platform independent, size.  This CL
adds the packed attribute to the structure, which reduces its size
from 56 bytes to 48 bytes.

Copy of widevine change:
https://widevine-internal-review.googlesource.com/#/c/10321/

Library Versions:
libwvdrmengine/level3/x86/libwvlevel3.a  Level3 Library May 30 2014 15:40:50
libwvdrmengine/level3/arm/libwvlevel3.a  Level3 Library May 30 2014 15:39:04

bug: 15184821
Change-Id: I54db2c3bbc4e20ee0c19c33d6fd56f86f432e110
2014-05-30 15:47:16 -07:00
Jeff Tinker
1035bb32e0 Deprecate provisioning test URI
Certificate provisioning requests will be made to the production server
since the other URI is being deprecated.

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

b/15145406

Change-Id: If0cbcaa66fc871568507ee56656c04f8341fcdcf
2014-05-30 15:18:23 -07:00
Jeff Tinker
2bab114f59 Fix cast v2 authentication unit test
Merge of https://widevine-internal-review.googlesource.com/#/c/10309 from the widevine cdm repo.

bug: 15341137

Change-Id: I188d7d7a3861dcbec1950dfbe8dd9504a60899bf
2014-05-30 15:45:40 +00:00
Jeff Tinker
52683d3e28 Merge "Fix multilib issues" 2014-05-22 01:31:48 +00:00
Edwin Wong
8c73bde53f Add password to prevent vendors from editing CENC pdfs.
What can the user do with the security setting:
 - open and view the doc
 - print the doc
 - no copying of content
 - can add comment, filling in forms and signing existing signature fields
 (no forms or signature fields in the doc),this option is bundled together
 (it is nice to allow the user to add notes to the doc)

bug: 14294953
Change-Id: I8690ccd16daffbd62549c1e4e137880b196c12d4
2014-05-21 17:47:22 -07:00
Jeff Tinker
6f35b0b86c Fix multilib issues
Change-Id: I069c8681d2b25221e8767db9437dbfded5618283
2014-05-21 22:25:02 +00:00
Jeff Tinker
99c76b901e Build cast v2 mediadrm signer library as non-static
Change-Id: I5e4401d06480c2122a2f353e789a78933b6882c3
related-to: 13988104
2014-05-21 18:18:32 +00:00
Rahul Frias
e56e58fbf5 Enable usage reporting
[ Merge from Widevine CDM repo of
  https://widevine-internal-review.googlesource.com/#/c/10171/ and
  https://widevine-internal-review.googlesource.com/#/c/10172/ ]

Updated license_protocol.proto from constituent protos in google3

These changes make use of OEMCrypto v9 changes to support usage reporting.
Usage reporting may be enabled for streaming (by means of secure stops) and
offline playback by a provider session token specified in the license.

Changes include periodically updating usage information for relevant
sessions and reporting and releasing usage information as needed.

The CDM has removed all references to Secure Stops. This change
updates the Android API implementation to comply.

b/11987015

Change-Id: Ibb6f2ced4ef20ee349ca1ae6412ce686b2b5d085
2014-05-18 21:07:12 -07:00
Fred Gylys-Colwell
d68e1f8307 Usage Table for Level 3 OEMCrypto
This is a copy of the widevine CL.
https://widevine-internal-review.googlesource.com/#/c/10174/

This CL adds the OEMCrypto v9 functionality to the level 3 haystack
version of OEMCrypto.  Mostly, this is to support usage tables.

The code is feature complete, but the timing tests are a little flakey
-- I'm not sure if the problem is in the code or if the test has too
tight a tolerance.

Also, the storage of the generation number needs to be made more
secure.

Change-Id: I73fecf8934b6a46785f1f8b6f40b40ffe39b88de
2014-05-18 19:44:28 -07:00
Jeff Tinker
93bf77ed6d Merge "Pack structure OEMCrypto_PST_Report" 2014-05-19 02:26:09 +00:00
Jeff Tinker
8aec8fe0bd Merge "Clean comments, namespace, and variable names" 2014-05-19 02:25:54 +00:00
Fred Gylys-Colwell
6bac5bc50d Clean comments, namespace, and variable names
This CL removes TODOs and email addresses from comments, unifies some
namespaces and cleans a few variable names.  It is a copy of multiple
CLs on the widevine side.

Change-Id: I1bb649096476a5001a56d746427399de6a88ff69
2014-05-16 15:53:12 -07:00
Fred Gylys-Colwell
4b83f96adf Pack structure OEMCrypto_PST_Report
This change is copied from the widevine CL:
https://widevine-internal-review.googlesource.com/#/c/10163/

Because the OEMCrypto_PST_Report is sent as a signed block to the
server, it needs to be a fixed, platform independent, size.  This CL
adds the packed attribute to the structure, which reduces its size
from 56 bytes to 47 bytes.

Change-Id: I2bae058b7eb0ac54ba9fad355f3d85ddc2cd4a58
2014-05-16 13:16:51 -07:00
Fred Gylys-Colwell
86e73deb4c Make test URLs more external
This CL changes several test URLs so that they do not reference
internal test servers.

Copied from many CLs on the widevine side.

Change-Id: Ia0e6d6faa19e1841bacaf3b90043aca3a12aaf8a
2014-05-16 13:14:22 -07:00
Fred Gylys-Colwell
1dfd204f22 Merge "Correct test vector in base64 test" 2014-05-16 19:25:08 +00:00
John "Juce" Bruce
1de68fb7c2 Merge "Remove Unused OEMCrypto Wrapper Methods" 2014-05-16 18:00:22 +00:00
John "Juce" Bruce
5a1bf27fd3 Upgrade Integration Test to Use Latest EME Spec
(This is a merge of
https://widevine-internal-review.googlesource.com/#/c/10140/
from the Widevine CDM repo.)

Updates the integration test from using "video/avc" to "cenc".

Bug: 13731637
Change-Id: Idfa0eabb6eb359a3d08008952bff495bea164cc7
2014-05-14 20:12:08 -07:00
John "Juce" Bruce
d6c98f1290 Remove Unused OEMCrypto Wrapper Methods
(This is a merge of
https://widevine-internal-review.googlesource.com/#/c/10141/
from the Widevine CDM repo.)

Over the course of revising the CAST support, the need for the
MediaDrm to call open and close session was removed. However, the
methods to do that were not. This removes the unused code.

Change-Id: I577f5314b6b20f36c308ac6753f1084ff3c707d9
2014-05-14 16:03:26 -07:00
Fred Gylys-Colwell
b0694bef17 Correct test vector in base64 test
This is a copy of
https://widevine-internal-review.googlesource.com/#/c/10050

The non-encoded base64 test vectors were modifed for the source
release, but the encoded test vectors were not updated to match.  This
CL updates the encoded test vectors to match.

Change-Id: I95ed881007e80da2d464f303eacf55cda38b586d
2014-05-07 13:06:30 -07:00
Fred Gylys-Colwell
7f9bff5ef5 Correct message size in call to OEMCrypto_RewrapDeviceRSAKey
This is a copy of https://widevine-internal-review.googlesource.com/#/c/10040/

The message size was wrong on several OEMCrypto_RewrapDeviceRSAKey
unit tests.  The function was supposed to fail in these tests.
However, a vendor found that they were failing with a different error
code because the buffer size was incorrect.  Now the function should
fail with the correct error code, and the test should pass for the
vendor.

Change-Id: Iea27b489f9bc386241d9add4f99ccb50560dfef6
2014-05-06 17:54:18 -07:00
Colin Cross
ad27688791 cryptoPlugin: only build libwvdecryptcommon for 32-bit
WVCryptoPlugin::decrypt stores a pointer in a uint32, so it cannot
be built for 64-bit until the api is changed.  Force it to only
build for 32-bit for now.

Also set -Wno-unused-parameter to silence unnecessary warnings
so I can see the build error.

Change-Id: I7cc13cc1d8a06b17468fab6f3b28886f9af02e24
2014-05-05 18:48:18 -07:00
John "Juce" Bruce
e924571282 Fix Crash When Renewing Licenses
The changes to support the newest EME spec did not account for an
empty init data.

(This is a merge of
https://widevine-internal-review.googlesource.com/#/c/9991/
from the Widevine CDM repo.)

Bug: 14410226
Change-Id: Ieb818751fa49e92068014d64767c563da2050431
2014-04-29 14:38:39 -07:00
Edwin Wong
e17c61edb1 am ebce9a58: am 7eb1a295: am 77fcf29b: am 35c8fc94: am 15d45e0c: am 8ca56c3f: am 01403eff: am c9c20cc6: am 62d84540: am 1825fda8: am 96449440: Add Widevine Classic Security Integration Guide docs to /vendor/widevine/proprietary/docs.
* commit 'ebce9a58de23c0883fb4f5d02bc4c699d697e87a':
  Add Widevine Classic Security Integration Guide docs to /vendor/widevine/proprietary/docs.
2014-04-25 18:37:20 +00:00
Edwin Wong
ebce9a58de am 7eb1a295: am 77fcf29b: am 35c8fc94: am 15d45e0c: am 8ca56c3f: am 01403eff: am c9c20cc6: am 62d84540: am 1825fda8: am 96449440: Add Widevine Classic Security Integration Guide docs to /vendor/widevine/proprietary/docs.
* commit '7eb1a295106c98308ee57f9006f768d280b56578':
  Add Widevine Classic Security Integration Guide docs to /vendor/widevine/proprietary/docs.
2014-04-25 18:30:20 +00:00
Edwin Wong
7eb1a29510 am 77fcf29b: am 35c8fc94: am 15d45e0c: am 8ca56c3f: am 01403eff: am c9c20cc6: am 62d84540: am 1825fda8: am 96449440: Add Widevine Classic Security Integration Guide docs to /vendor/widevine/proprietary/docs.
* commit '77fcf29b157da9c26d2a9cec14e01eca214d544f':
  Add Widevine Classic Security Integration Guide docs to /vendor/widevine/proprietary/docs.
2014-04-25 18:26:19 +00:00
Edwin Wong
77fcf29b15 am 35c8fc94: am 15d45e0c: am 8ca56c3f: am 01403eff: am c9c20cc6: am 62d84540: am 1825fda8: am 96449440: Add Widevine Classic Security Integration Guide docs to /vendor/widevine/proprietary/docs.
* commit '35c8fc94708ea1a476014035b66d372051d509db':
  Add Widevine Classic Security Integration Guide docs to /vendor/widevine/proprietary/docs.
2014-04-25 18:23:11 +00:00
Edwin Wong
35c8fc9470 am 15d45e0c: am 8ca56c3f: am 01403eff: am c9c20cc6: am 62d84540: am 1825fda8: am 96449440: Add Widevine Classic Security Integration Guide docs to /vendor/widevine/proprietary/docs.
* commit '15d45e0c77c6bd6f7f6931957b254b01339d69ea':
  Add Widevine Classic Security Integration Guide docs to /vendor/widevine/proprietary/docs.
2014-04-25 18:13:18 +00:00
Edwin Wong
15d45e0c77 am 8ca56c3f: am 01403eff: am c9c20cc6: am 62d84540: am 1825fda8: am 96449440: Add Widevine Classic Security Integration Guide docs to /vendor/widevine/proprietary/docs.
* commit '8ca56c3f12f4aaa145288b0838b23fa6c2d7c6fb':
  Add Widevine Classic Security Integration Guide docs to /vendor/widevine/proprietary/docs.
2014-04-25 18:11:02 +00:00
Edwin Wong
8ca56c3f12 am 01403eff: am c9c20cc6: am 62d84540: am 1825fda8: am 96449440: Add Widevine Classic Security Integration Guide docs to /vendor/widevine/proprietary/docs.
* commit '01403eff12109f2388d85971b5c17b67bd0c4925':
  Add Widevine Classic Security Integration Guide docs to /vendor/widevine/proprietary/docs.
2014-04-25 18:08:40 +00:00
Edwin Wong
01403eff12 am c9c20cc6: am 62d84540: am 1825fda8: am 96449440: Add Widevine Classic Security Integration Guide docs to /vendor/widevine/proprietary/docs.
* commit 'c9c20cc64803bf885746b3c9ebe6b8f19bff9bfd':
  Add Widevine Classic Security Integration Guide docs to /vendor/widevine/proprietary/docs.
2014-04-25 18:05:17 +00:00
Edwin Wong
c9c20cc648 am 62d84540: am 1825fda8: am 96449440: Add Widevine Classic Security Integration Guide docs to /vendor/widevine/proprietary/docs.
* commit '62d845404c0b5cfb5bb0e0e3f4fcd12970a5ba72':
  Add Widevine Classic Security Integration Guide docs to /vendor/widevine/proprietary/docs.
2014-04-25 18:01:34 +00:00
Edwin Wong
62d845404c am 1825fda8: am 96449440: Add Widevine Classic Security Integration Guide docs to /vendor/widevine/proprietary/docs.
* commit '1825fda8fda9c5037cacc175f3d2ef1579fd7cb0':
  Add Widevine Classic Security Integration Guide docs to /vendor/widevine/proprietary/docs.
2014-04-25 17:59:32 +00:00