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

Make change and version bump to AV1A.241121.001

Browse Source 
Snap for 12682005 from ae80e87d0e to vic-widevine-partner-release

Change-Id: I019144c82fea32056698f4c38445bc5d3c802373
This commit is contained in:
Android Build Coastguard Worker
2024-11-21 09:15:37 +00:00
parent 49184d157e ae80e87d0e
commit 8aba94587c
3 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libwvdrmengine/mediadrm/src/wv_metrics_adapter.cpp
View File

@@ -529,6 +529,18 @@ void WvMetricsAdapter::AddCryptoMetrics(
group_builder->AddDistributions( group_builder->AddDistributions(
"oemcrypto_load_device_drm_key_time_us", "oemcrypto_load_device_drm_key_time_us",
proto_metrics.oemcrypto_load_device_drm_key_time_us()); proto_metrics.oemcrypto_load_device_drm_key_time_us());
group_builder->AddDistributions(
"oemcrypto_prep_and_sign_license_request_time_us",
proto_metrics.oemcrypto_prep_and_sign_license_request_time_us());
group_builder->AddDistributions(
"oemcrypto_prep_and_sign_renewal_request_time_us",
proto_metrics.oemcrypto_prep_and_sign_renewal_request_time_us());
group_builder->AddDistributions(
"oemcrypto_prep_and_sign_provisioning_request_time_us",
proto_metrics.oemcrypto_prep_and_sign_provisioning_request_time_us());
group_builder->AddDistributions(
"oemcrypto_load_license_time_us",
proto_metrics.oemcrypto_load_license_time_us());
group_builder->AddDistributions( group_builder->AddDistributions(
"oemcrypto_load_entitled_keys_time_us", "oemcrypto_load_entitled_keys_time_us",
proto_metrics.oemcrypto_load_entitled_keys_time_us()); proto_metrics.oemcrypto_load_entitled_keys_time_us());

4
libwvdrmengine/oemcrypto/test/oemcrypto_provisioning_test.cpp
View File

@@ -545,13 +545,13 @@ TEST_F(OEMCryptoProv40Test, InstallOemPrivateKeyCanBeUsed) {
wrapped_private_key2.resize(wrapped_private_key_size2); wrapped_private_key2.resize(wrapped_private_key_size2);
// Verify public_key_signature2 with public_key1. // Verify public_key_signature2 with public_key1.
if (key_type2 == OEMCrypto_PrivateKeyType::OEMCrypto_RSA_Private_Key) { if (key_type1 == OEMCrypto_PrivateKeyType::OEMCrypto_RSA_Private_Key) {
ASSERT_NO_FATAL_FAILURE(s.SetRsaPublicKeyFromSubjectPublicKey( ASSERT_NO_FATAL_FAILURE(s.SetRsaPublicKeyFromSubjectPublicKey(
public_key1.data(), public_key1.size())); public_key1.data(), public_key1.size()));
ASSERT_NO_FATAL_FAILURE( ASSERT_NO_FATAL_FAILURE(
s.VerifyRsaSignature(public_key2, public_key_signature2.data(), s.VerifyRsaSignature(public_key2, public_key_signature2.data(),
public_key_signature2.size(), kSign_RSASSA_PSS)); public_key_signature2.size(), kSign_RSASSA_PSS));
} else if (key_type2 == OEMCrypto_PrivateKeyType::OEMCrypto_ECC_Private_Key) { } else if (key_type1 == OEMCrypto_PrivateKeyType::OEMCrypto_ECC_Private_Key) {
ASSERT_NO_FATAL_FAILURE(s.SetEccPublicKeyFromSubjectPublicKey( ASSERT_NO_FATAL_FAILURE(s.SetEccPublicKeyFromSubjectPublicKey(
public_key1.data(), public_key1.size())); public_key1.data(), public_key1.size()));
ASSERT_NO_FATAL_FAILURE(s.VerifyEccSignature(public_key2, ASSERT_NO_FATAL_FAILURE(s.VerifyEccSignature(public_key2,

2
libwvdrmengine/version.txt
View File

@@ -1 +1 @@
AV1A.241114.001 AV1A.241121.001