From 9ee523a3cdbdc8e2e040a123f9661d8df59bd870 Mon Sep 17 00:00:00 2001 From: KongQun Yang Date: Fri, 13 Mar 2015 14:28:32 -0700 Subject: [PATCH] Use requested_security_level_ in SupportsUsageTable Also fix a build warning from an earlier CL. Merged from Widevine CDM repo: https://widevine-internal-review.googlesource.com/#/c/13669/ Change-Id: I87f161afac76e622869e5370e4f63476cb3ea97f --- libwvdrmengine/cdm/core/src/crypto_session.cpp | 3 +-- libwvdrmengine/oemcrypto/mock/src/oemcrypto_mock.cpp | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/libwvdrmengine/cdm/core/src/crypto_session.cpp b/libwvdrmengine/cdm/core/src/crypto_session.cpp index 083ad49e..16308c1f 100644 --- a/libwvdrmengine/cdm/core/src/crypto_session.cpp +++ b/libwvdrmengine/cdm/core/src/crypto_session.cpp @@ -693,8 +693,7 @@ bool CryptoSession::UsageInformationSupport(bool* has_support) { LOGV("UsageInformationSupport: id=%ld", (uint32_t)oec_session_id_); if (!initialized_) return false; - *has_support = OEMCrypto_SupportsUsageTable( - kSecurityLevelL3 == GetSecurityLevel() ? kLevel3 : kLevelDefault); + *has_support = OEMCrypto_SupportsUsageTable(requested_security_level_); return true; } diff --git a/libwvdrmengine/oemcrypto/mock/src/oemcrypto_mock.cpp b/libwvdrmengine/oemcrypto/mock/src/oemcrypto_mock.cpp index efbb56d2..81de1110 100644 --- a/libwvdrmengine/oemcrypto/mock/src/oemcrypto_mock.cpp +++ b/libwvdrmengine/oemcrypto/mock/src/oemcrypto_mock.cpp @@ -487,7 +487,7 @@ OEMCryptoResult OEMCrypto_DecryptCTR(OEMCrypto_SESSION session, bool is_encrypted, const uint8_t* iv, size_t block_offset, - const OEMCrypto_DestBufferDesc* out_buffer, + OEMCrypto_DestBufferDesc* out_buffer, uint8_t subsample_flags) { if (LogCategoryEnabled(kLoggingTraceOEMCryptoCalls)) { LOGI("-- OEMCryptoResult OEMCrypto_DecryptCTR"