diff --git a/libwvdrmengine/mediadrm/src/wv_metrics_adapter.cpp b/libwvdrmengine/mediadrm/src/wv_metrics_adapter.cpp index 69d72a26..92a304b4 100644 --- a/libwvdrmengine/mediadrm/src/wv_metrics_adapter.cpp +++ b/libwvdrmengine/mediadrm/src/wv_metrics_adapter.cpp @@ -529,6 +529,18 @@ void WvMetricsAdapter::AddCryptoMetrics( group_builder->AddDistributions( "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( "oemcrypto_load_entitled_keys_time_us", proto_metrics.oemcrypto_load_entitled_keys_time_us()); diff --git a/libwvdrmengine/oemcrypto/test/oemcrypto_provisioning_test.cpp b/libwvdrmengine/oemcrypto/test/oemcrypto_provisioning_test.cpp index fbb7a83c..d38101c9 100644 --- a/libwvdrmengine/oemcrypto/test/oemcrypto_provisioning_test.cpp +++ b/libwvdrmengine/oemcrypto/test/oemcrypto_provisioning_test.cpp @@ -545,13 +545,13 @@ TEST_F(OEMCryptoProv40Test, InstallOemPrivateKeyCanBeUsed) { wrapped_private_key2.resize(wrapped_private_key_size2); // 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( public_key1.data(), public_key1.size())); ASSERT_NO_FATAL_FAILURE( s.VerifyRsaSignature(public_key2, public_key_signature2.data(), 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( public_key1.data(), public_key1.size())); ASSERT_NO_FATAL_FAILURE(s.VerifyEccSignature(public_key2, diff --git a/libwvdrmengine/version.txt b/libwvdrmengine/version.txt index 5e4e8d04..64c7b1b7 100644 --- a/libwvdrmengine/version.txt +++ b/libwvdrmengine/version.txt @@ -1 +1 @@ -AV1A.241114.001 +AV1A.241121.001