Fred Gylys-Colwell
69d7ffb22d
Update key control block verification
...
This is a merge of http://go/wvgerrit/13752
Replace the mock's macro with a memcmp because that is
even cleaner.
Change-Id: Ie402689ca9e14a67736db7eea928204f067427ac
2015-03-19 20:49:14 -07:00
Edwin Wong
a7887f60fc
Add OEMCrypto_IsAntiRollbackHwPresent API for OEMCrypto v10.
...
Merge from WV CDM repo: https://widevine-internal-review.googlesource.com/#/c/13660/ .
bug: 18948905
Change-Id: I1ffe72baaac9abf05c06139de790236e763f89a8
2015-03-18 17:53:17 -07:00
Fred Gylys-Colwell
87ea4f6ad4
Merge OEMCrypto changes from CDM to android repository
...
This is a merge of the following CLs:
Style clean up in oemcrypto/mock
https://widevine-internal-review.googlesource.com/#/c/10660
Split off default keybox.
https://widevine-internal-review.googlesource.com/#/c/10661/
Split off several properties from CryptoEngine.
https://widevine-internal-review.googlesource.com/#/c/10662/
Split off Keybox installation.
https://widevine-internal-review.googlesource.com/#/c/10680/
Wii-U build compatibility fixes.
https://widevine-internal-review.googlesource.com/#/c/10720/
Fix style issues in oemcrypto_logging_test.
https://widevine-internal-review.googlesource.com/#/c/10824/
Correct OEMCrypto error codes in the mock.
https://widevine-internal-review.googlesource.com/#/c/10821/
Enable logging during OEMCrypto unit tests.
https://widevine-internal-review.googlesource.com/#/c/10833/
Wait to create usage table path until needed.
https://widevine-internal-review.googlesource.com/#/c/10831/
Allow keybox installation to be unimplemented.
https://widevine-internal-review.googlesource.com/#/c/10850/
Minor clean up in the OEMCrypto header.
https://widevine-internal-review.googlesource.com/#/c/10921/
Add usage table device property to the mock oemcrypto
https://widevine-internal-review.googlesource.com/#/c/11092/
Change-Id: I02a818a620bcd4bd2291f1b3c0ac9308ae444319
2015-03-02 16:45:43 -08: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
Fred Gylys-Colwell
1cd8195d88
OEMCrypto Usage Tables
...
This CL adds usage tables to the OEMCrypto reference implementation
(mock) and unit tests.
There is also a new parameter called oem_crypto_require_usage_tables
that determines if the usage tables are required or not. This is set
to true for Android and false for all other platforms.
This CL is most of OEMCrypto version 9 updates.
This CL is a copy of
https://widevine-internal-review.googlesource.com/#/c/9720
https://widevine-internal-review.googlesource.com/#/c/9874
https://widevine-internal-review.googlesource.com/#/c/9873
Change-Id: I78c4f7651306f9f79ba2260c3e04fb1eca7e20e3
2014-04-24 11:40:30 -07:00
Fred Gylys-Colwell
e95eebf326
Refactor OEMCrypto mock and its unit tests
...
This is a copy of the Widevine CL:
https://widevine-internal-review.googlesource.com/#/c/9708/
This CL refactors some of code in oemcrypto/mock and oemcrypto/test in
preparation for adding usage table code.
Change-Id: I7e58c8ecd6d92b3e177cb915733212fcad645485
2014-04-10 17:34:51 -07:00
Fred Gylys-Colwell
026a04701e
Test Key Control Block with HDCP Version
...
This is a copy of the Widevine CL:
https://widevine-internal-review.googlesource.com/#/c/9480/
This change is part of OEMCrypto API version 9.
This CL adds verification that a key control block which requires a
specific version of HDCP can be loaded. Also, if secure data path is
not set, it verifies that data is still decrypted.
This CL also adds test that verify DecryptCTR fails when the current
HDCP version is below that in the key control block. The expected
error is OEMCrypto_ERROR_INSUFFICIENT_HDCP. This error code is newly
introduced in this CL.
This is one attempt to clarify HDCP, as specified in b/13626021, and
is a slight modification from previous behavior for the mock and the
level 3 haystacked code.
This CL also tests the two valid verification codes "kctl"
and "kc09".
bug: 13626021
Change-Id: If380709d2306a3489470b29fb148a45b609b089d
2014-04-10 16:22:25 -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
Fred Gylys-Colwell
39ea1df671
Part of Qualcomm L1 OEMCrypto integration
...
Upgrade to version 2.1 of license protocol in OEMCrypto.
related-to-bug: 8621521
Merge of https://widevine-internal-review.googlesource.com/#/c/4952/
from Widevine CDM repository to android repository.
Change-Id: I0d85dae1981b7525ab17aec5f21cf668d078bf47
2013-04-22 16:15:03 -07:00
Jeff Tinker
1a8aa0dd05
Initial import of Widevine Common Encryption DRM engine
...
Builds libwvmdrmengine.so, which is loaded by the new
MediaDrm APIs to support playback of Widevine/CENC
protected content.
Change-Id: I6f57dd37083dfd96c402cb9dd137c7d74edc8f1c
2013-03-22 11:14:17 -07:00
