Pick widevine oemcrypto-v18 change
No-Typo-Check: From a third party header file Bug: 260918793 Test: unit tests Test: atp v2/widevine-eng/drm_compliance Change-Id: I36effd6a10a99bdb2399ab1f4a0fad026d607c70
This commit is contained in:
@@ -17,8 +17,10 @@ class SessionUtil {
|
||||
kTestRSAPKCS8PrivateKeyInfo2_2048 +
|
||||
sizeof(kTestRSAPKCS8PrivateKeyInfo2_2048)) {}
|
||||
|
||||
// Create a new wrapped DRM Certificate.
|
||||
void CreateWrappedRSAKey();
|
||||
// Create a new wrapped DRM Certificate. This creates a new one, even if one
|
||||
// already exists. For provisioning 2 or 3, it uses encoded_rsa_key_ to
|
||||
// specify the key. For Prov 4.0, the key is generated by OEMCrypto.
|
||||
void CreateWrappedDRMKey();
|
||||
|
||||
// This is used to force installation of a keybox. This overwrites the
|
||||
// production keybox -- it does NOT use OEMCrypto_LoadTestKeybox.
|
||||
@@ -26,15 +28,30 @@ class SessionUtil {
|
||||
|
||||
// This loads the test keybox or the test RSA key, using LoadTestKeybox or
|
||||
// LoadTestRSAKey as needed.
|
||||
void EnsureTestKeys();
|
||||
void EnsureTestROT();
|
||||
|
||||
void InstallTestRSAKey(Session* s);
|
||||
// Install a DRM private key in to the session. If a key has not been created,
|
||||
// tehn CreateWrappedDRMKey is used to create one first. Works with Prov 2-4.
|
||||
void InstallTestDrmKey(Session* s);
|
||||
|
||||
// Create and install an OEM Cert private key. After creation, the key is
|
||||
// saved to oem_public_key_. Only for provisioning 4.0
|
||||
void CreateProv4OEMKey(Session* s);
|
||||
|
||||
// Create a new DRM Cert. Only for provisioning 4.0
|
||||
void CreateProv4DRMKey();
|
||||
|
||||
// Used by prov2.0, prov3.0, and prov 4.0
|
||||
std::vector<uint8_t> encoded_rsa_key_;
|
||||
std::vector<uint8_t> wrapped_rsa_key_;
|
||||
OEMCrypto_PrivateKeyType key_type_;
|
||||
std::vector<uint8_t> wrapped_drm_key_;
|
||||
OEMCrypto_PrivateKeyType drm_key_type_;
|
||||
std::vector<uint8_t> drm_public_key_;
|
||||
wvoec::WidevineKeybox keybox_;
|
||||
|
||||
// Used by prov4.0
|
||||
std::vector<uint8_t> wrapped_oem_key_;
|
||||
std::vector<uint8_t> oem_public_key_;
|
||||
OEMCrypto_PrivateKeyType oem_key_type_;
|
||||
};
|
||||
|
||||
} // namespace wvoec
|
||||
|
||||
Reference in New Issue
Block a user