Commit Graph

2 Commits

Author SHA1 Message Date
Fred Gylys-Colwell
cab913f848 Undo bad merge
This CL undoes the merge cc28abea0b by
TreeHugger that should not have gone to master.  We re-enable a unit
tests that is required for OC MR1, but is not required for OC.

It also includes a minor change that allows the oemcrypto mock to be
built by an Android NDK:
Merge from Widevine repo of http://go/wvgerrit/24681

b/31458046
b/35141278

Change-Id: I8edc51504a16f1825ef765aeaff6f77f034f0362
2017-04-15 00:38:11 +00:00
Fred Gylys-Colwell
3164194908 Move keybox and root certificate handling into new class.
Merge from Widevine repo of http://go/wvgerrit/22804

Create a class, AuthenticationRoot, to encapsulate the objects and
logic for managing either keyboxes or certificates as the device's
root of trust.

Currently the class provides the existing keybox-related functions
needed by oemcrypto's CryptoEngine. It will be extended to provide
both keybox and certificate related functions, and the logic to
determine whether keybox or certificate based authentication should
be performed.

Change-Id: I792d1bfc8e9a81bbfd2baec20e3b3d182f0392f7
2017-01-20 16:57:32 -08:00