widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Test session should continue with no keybox

Browse Source 
Merge from Widevine repo of http://go/wvgerrit/142149

This CL updates the TestCryptoSession so that it will recover from
initializing without a keybox. This allows unit and integration tests
to be run using a test keybox on a device that does not have any
keybox.

Bug: 210807585
Bug: 161925952
Change-Id: I8639bd733a50ae5af3a7c786347b5a06a9d783ce
This commit is contained in:
Fred Gylys-Colwell
2021-12-19 07:25:33 +00:00
parent 2f57079f6a
commit 75b87c7f59
3 changed files with 50 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
libwvdrmengine/cdm/core/test/test_base.cpp
View File

@@ -215,14 +215,17 @@ std::string WvCdmTestBase::SignHMAC(const std::string& message,
TestCryptoSession::TestCryptoSession(metrics::CryptoMetrics* crypto_metrics)
: CryptoSession(crypto_metrics) {
// The first CryptoSession should have initialized OEMCrypto. This is right
// after that, so should tell oemcrypto to use a test keybox.
// after that, so we should tell oemcrypto to use a test keybox.
if (session_count() == 1) {
OverrideNeedKeyboxForTesting(false);
// However, if the device does not have a keybox, initialization would have
// failed. In that case we should try again.
if (!initialized()) {
// If not initialized, try again and see if we are just missing a keybox.
// Since we plan to install a test keybox, we can ignore keybox errors.
const OEMCryptoResult status = ::OEMCrypto_Initialize();
if (status != OEMCrypto_SUCCESS) return;
OverrideInitializedForTesting(true);
// Give up if we cannot initialize at all.
if (OEMCrypto_SUCCESS != OEMCrypto_Initialize()) return;
set_initialized(true);
// This was skipped in Init because initialization failed.
CacheVersion();
}
WvCdmTestBase::InstallTestRootOfTrust();
}