Fred Gylys-Colwell
6d5be4fddf
Enable OEMCrypto Unit Tests
...
This is a merge from the widevine repository of
http://go/wvgerrit/13923 Switch openssl to use the EVP interface for aes-ctr-128
http://go/wvgerrit/13979 Add Test Certificate to OEMCrypto Mock
http://go/wvgerrit/13978 Add Test Keybox to Level 3 OEMCrypto
http://go/wvgerrit/13873 Enable OEMCrypto Unit Tests
This CL adds a main program to oemcrypto_test.cpp, which filters out
tests that are not supported on the specified platform. It also adds
LoadTestKeybox to the mock. This allows oemcrypto unit tests to be run
on devices that have production keybox. It also allows the same set
of unit tests to work on Android and on non-Android platforms.
b/18962381 Use test certificate (partial fix)
b/19867990 Separate cast receiver tests
Change-Id: If89c31530103ed85aa37d7379bd5b4dc2a927f38
2015-04-07 15:24:10 -07:00
John "Juce" Bruce
7b262e1d02
Alphabetize & Googleize Header Inclusions
...
(This is a merge of http://go/wvgerrit/13761 from the Widevine
repository.)
This cleans up our includes to be in Google Style Guide order and in
alphabetic order, for the parts of the code that are expected to
follow Google Style.
This also converts places in our code that were including C headers
in the C++ style (i.e. <cstring> instead of <string.h>) to use C style
instead. This is because, although it was not causing problems for us
yet, on Android these actually include different headers. (<cstring>
is provided by libcxx, while <string.h> is provided by Bionic)
Lastly, this change puts all headers that do not come from within our
project in <brackets> instead of "quotes," which was not being done
consistently.
This change is explicitly NOT trying to standardize the spacing of our
header includes. I have tried to respect, in each file, the spacing
style already present.
Change-Id: If3dc06532ab9b68010285d64518ef21dce3d6354
2015-03-26 15:02:02 -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
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
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
