Rahul Frias
7a933ee48e
Merge of usage reporting and license changes from WV CDM repo
...
* CdmSession unittest and license request time changes
b/15914199
Merge of https://widevine-internal-review.googlesource.com/#/c/10597/
* Specify OEMCrypto API version in client capabilities
b/15388863
Merge of https://widevine-internal-review.googlesource.com/#/c/10616/
* Report start and last play time in license request
b/15995227
Merge of https://widevine-internal-review.googlesource.com/#/c/10617/
* Respect can_play flag
b/15330338
Merge of https://widevine-internal-review.googlesource.com/#/c/10619/
* Restore offline session information
b/16009274
Merge of https://widevine-internal-review.googlesource.com/#/c/10641/
Change-Id: I17fdc309efbc1d44385a86a368df11b1349b29c2
2014-07-02 17:17:38 -07:00
Fred Gylys-Colwell
b5e8b87fed
Merge Changes from CDM repository
...
This CL merges the following changes from the Widevine repository:
Avoid CdmSession reinitialization
https://widevine-internal-review.googlesource.com/#/c/10530/
Fix timer-related unit tests.
https://widevine-internal-review.googlesource.com/#/c/10510/
Correct return statement
bug: 15590802
https://widevine-internal-review.googlesource.com/#/c/10553/
Usage reporting fixes
bug/15388863
https://widevine-internal-review.googlesource.com/#/c/10460/
Make public methods virtual
https://widevine-internal-review.googlesource.com/#/c/10500/
Fix the SetTimer contract in the CDM.
https://widevine-internal-review.googlesource.com/#/c/10493/
Move inline CDM methods, add OVERRIDE.
https://widevine-internal-review.googlesource.com/#/c/10475/
Simplify storage APIs related cleanup.
https://widevine-internal-review.googlesource.com/#/c/10473/
Duration values are not correctly reported when queried
b/15592374
https://widevine-internal-review.googlesource.com/#/c/10437/
Propagate IsKeyValid() through ContentDecryptionModule.
https://widevine-internal-review.googlesource.com/#/c/10483/
Minor clean up in config_test_env.
https://widevine-internal-review.googlesource.com/#/c/10440/
General clean up.
https://widevine-internal-review.googlesource.com/#/c/10441/
Refactor HttpSocket and simplify UrlRequest interface.
https://widevine-internal-review.googlesource.com/#/c/10410/
Install good keybox at end of unit tests
b/15385981
https://widevine-internal-review.googlesource.com/#/c/10374/
Privacy crypto fixes
b/15475012
https://widevine-internal-review.googlesource.com/#/c/10383/
Incorporate header files to resolve build issued based on customers feedback.
https://widevine-internal-review.googlesource.com/#/c/10420/
Support unprovisioning
b/12247651
https://widevine-internal-review.googlesource.com/#/c/10356/
Correct usage of Host::Allocate and Cdm::Decrypt.
https://widevine-internal-review.googlesource.com/#/c/10378/
Fix logging bug, arguments in wrong order.
https://widevine-internal-review.googlesource.com/#/c/10380/
Rename types that look like constants.
https://widevine-internal-review.googlesource.com/#/c/10379/
Fix offline test failures
b/13909635
https://widevine-internal-review.googlesource.com/#/c/10348/
Add -DUNIT_TEST to the unit test makefile for Android
https://widevine-internal-review.googlesource.com/#/c/10375/
Refactor privacy-crypto and add dummy version.
https://widevine-internal-review.googlesource.com/#/c/10353/
Remove References to Apiary
https://widevine-internal-review.googlesource.com/#/c/9924/
Delete oldest entry in usage table when full
bug: 15184824
https://widevine-internal-review.googlesource.com/#/c/10295/
Port DeviceFiles to iOS.
https://widevine-internal-review.googlesource.com/#/c/10355/
Make testing functions in DeviceFiles private.
https://widevine-internal-review.googlesource.com/#/c/10354/
Add RSA encryption to haystack
https://widevine-internal-review.googlesource.com/#/c/10280/
Add string and vector includes to CDM header.
https://widevine-internal-review.googlesource.com/#/c/10352/
First version of oemcrypto logging
https://widevine-internal-review.googlesource.com/#/c/10252/
Update Names of Secure Stop Methods
bug: 11987015
https://widevine-internal-review.googlesource.com/#/c/10152/
Adjust timing on the Usage Table unit test
https://widevine-internal-review.googlesource.com/#/c/10307/
Fix all compiler warnings in CDM source release.
https://widevine-internal-review.googlesource.com/#/c/10293/
Fix memset bug: args in wrong order
https://widevine-internal-review.googlesource.com/#/c/10292/
Partial revert of 'Remove refs to test prov server, Level3 support...'
https://widevine-internal-review.googlesource.com/#/c/10281/
Pack structure OEMCrypto_PST_Report
https://widevine-internal-review.googlesource.com/#/c/10243/
Remove refs to test prov server, Level3 support; remove dead code
https://widevine-internal-review.googlesource.com/#/c/10220/
Partial revert of 'Document data strings; clean up license server parameters.'
https://widevine-internal-review.googlesource.com/#/c/10188/
Document data strings; clean up license server parameters.
https://widevine-internal-review.googlesource.com/#/c/10120/
Fix broken build after partner branch merge.
https://widevine-internal-review.googlesource.com/#/c/10181/
TODO Cleanup - core/src, core/include
https://widevine-internal-review.googlesource.com/#/c/9965/
TODO Cleanup - cdm, chromium, core/test.
https://widevine-internal-review.googlesource.com/#/c/9419/
Remove unneeded properties.
https://widevine-internal-review.googlesource.com/#/c/10162/
Change-Id: If2bb9d743a562a3875bebb91933c0aaadea286b2
2014-06-27 18:59:56 +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
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
dd75655102
Changes from Widevine CDM repo
...
Squashed commit of these CLs from the widevine cdm repo:
Update YT CP server URI to point to the UAT server
https://widevine-internal-review.googlesource.com/#/c/9327/
OEMCrypto Version 9 API
https://widevine-internal-review.googlesource.com/#/c/9142/
Correct Device ID length in OEMCrypto reference version
https://widevine-internal-review.googlesource.com/#/c/8723/
Modify tests to prevent intermittent failures
https://widevine-internal-review.googlesource.com/#/c/8982/
Generate a unique license request ID
https://widevine-internal-review.googlesource.com/#/c/8721/
Re-enable android timer mechanisms
https://widevine-internal-review.googlesource.com/#/c/8833/
Do not close CDM session on removeKeys
https://widevine-internal-review.googlesource.com/#/c/8703/
And numerous changes required by Eureka, Steel, and CTE versions of
Widevine CDM, as highlighted here:
https://widevine-internal-review.googlesource.com/#/c/8596/
https://widevine-internal-review.googlesource.com/#/c/8955/
https://widevine-internal-review.googlesource.com/#/c/8922/
https://widevine-internal-review.googlesource.com/#/c/8890/
https://widevine-internal-review.googlesource.com/#/c/8871/
https://widevine-internal-review.googlesource.com/#/c/8706/
https://widevine-internal-review.googlesource.com/#/c/8425/
Change-Id: Iafd33905227e74eb2132c240b929d2282ab68042
2014-03-17 20:29:51 +00:00
Jeff Tinker
db41502f86
Backward compatibility for licenses and certificates
...
Certificates and offline licenses are stored in security level
specific directories in klp. When devices transition from jb-mr2,
their persistent information has to be ported to these directories.
bug:10366036
Merge of https://widevine-internal-review.googlesource.com/#/c/7310/
from the widevine CDM repo
Change-Id: I70b4a79dc5b69bda7fc3a4b92fdcde7ef8b41836
2013-08-22 09:37:18 -07:00
Rahul Frias
f6c2a60485
Allow Apps to Voluntarily Downgrade to L3 Crypto
...
This merges the following changes from the Widevine CDM repository:
564f4cc Add CdmClientPropertySet to CDM
Adds an interface to the CDM that allows it to query its client for
certain properties. In this case, this includes the ability to
specify what security level is desired, as well as support for
service ceritifcate privacy mode.
9cfbd3e Force Level 3 fallback
Adds support for voluntarily invoking L3 crypto to the OEMCrypto
wrapper.
95d12c1 Add pointer to CdmClientPropertySet class to OpenSession.
Adds support for storing the property set on a session-by-session
basis and choosing the appropriate crypto level.
17de442 Add Settable Properties for Clank to Android
Adds support for setting the aforementioned properties to the
DrmEngine
bbe704d Fixes to force fallback to level three security
Corrections to invoke provisioning, OEMCrypto API with configured
security level rather than the default. Unit tests were also revised.
Note that some parts of this are also support for the ability to use
a service certificate-based privacy mode. The remaining code for
supporting this mode is still forthcoming.
Bug: 10109249
Change-Id: I2755e4dea1de3e8a56cff237360298f7b7f1bddc
2013-08-15 11:31:45 -07:00
John "Juce" Bruce
0fa3e16999
Remove Stale Licenses on Reprovisioning
...
Merges change 267713c (Remove stale licenses on reprovisioning) from
the Widevine CDM repository. This change removes licenses belonging
to the previous provisioning when provisioning changes.
Bug: 9761923
Change-Id: I473816dd11dd950f4fb009b5b004630bd2d2b579
2013-08-08 14:57:40 -07:00
Jeff Tinker
0190f99fb3
Migration from jb-mr2 to master for Widevine CDM
...
Android development of the widevine CDM has been done
on the jb-mr2 branch of the cdm code base. This CL
contains a merge of that jb-mr2 work to CDM master, and
also reflects the evolution of the common Modular DRM
code base since jb-mr2 branched.
Change-Id: I1d7e1a12d092c00044a4298261146cb97808d4ef
2013-07-29 17:29:07 -07:00
Jeff Tinker
1b295f4c81
Support Offline Licenses
...
Bug: 8621588
Merge of the following CLs from the Widevine CDM repository:
https://widevine-internal-review.googlesource.com/#/c/5602/
https://widevine-internal-review.googlesource.com/#/c/5431/
https://widevine-internal-review.googlesource.com/#/c/5660/
Change-Id: If37940e2535e1a1eca95e4394d8cf9bf689e9c3a
2013-05-15 21:18:20 -07:00
Jeff Tinker
63c597d330
Update path to Widevine MediaDrm engine credentials
...
Use separate directories for unit test-generated
credentials vs actual credentials, so the unit test
credentials don't interfere with the real ones.
related-to-bug: 8620943
Merge of:
Update path to where CDM persistently stores data
https://widevine-internal-review.googlesource.com/#/c/5300/
Rename Keybox File
https://widevine-internal-review.googlesource.com/#/c/5240/
... from the widevine CDM repo.
Change-Id: Idefa484b3a2f71f723238f033460bf431ce4209b
2013-04-25 14:12:11 -07:00
Jeff Tinker
958bbe6d05
Certificate provisioning verification
...
bug: 8620943
This is a merge of changes made to the Widevine CDM
repository during certificate provisioning verification.
The following changes are included:
Fixes for certificate based licensing
https://widevine-internal-review.googlesource.com/#/c/5162/
Base64 encode and decode now handles non-multiple of 24-bits input
https://widevine-internal-review.googlesource.com/#/c/4981/
Fixed issues with device provisioning response handling
https://widevine-internal-review.googlesource.com/#/c/5153/
Persistent storage to support device certificates
https://widevine-internal-review.googlesource.com/#/c/5161/
Enable loading of certificates
https://widevine-internal-review.googlesource.com/#/c/5172/
Provide license server url
https://widevine-internal-review.googlesource.com/#/c/5173/
Change-Id: I0c032c1ae0055dcc1a7a77ad4b0ea0898030dc7d
2013-04-22 20:12:03 -07:00
