From adf03c92f4bccb044edbf4df0dc18a6bca93c4c6 Mon Sep 17 00:00:00 2001 From: Rahul Frias Date: Wed, 29 Mar 2023 02:29:40 -0700 Subject: [PATCH] Address CDM compilation warnings for android [ Merge of http://go/wvgerrit/169230 ] Bug: 275675184 Test: Compile and GtsMediaTestCases Change-Id: I3dc01f383a1fae07c126782e8d3561ab724316a8 --- .../cdm/core/src/content_key_session.cpp | 11 ++++++----- libwvdrmengine/cdm/core/src/crypto_session.cpp | 10 ++++++---- .../cdm/core/src/service_certificate.cpp | 3 ++- libwvdrmengine/cdm/util/src/file_store.cpp | 14 +++++++++----- .../src/WidevineRemotelyProvisionedComponent.cpp | 7 ++++--- libwvdrmengine/factory_upload_tool/src/log.cpp | 2 ++ 6 files changed, 29 insertions(+), 18 deletions(-) diff --git a/libwvdrmengine/cdm/core/src/content_key_session.cpp b/libwvdrmengine/cdm/core/src/content_key_session.cpp index 8221a81e..1e391505 100644 --- a/libwvdrmengine/cdm/core/src/content_key_session.cpp +++ b/libwvdrmengine/cdm/core/src/content_key_session.cpp @@ -214,11 +214,12 @@ OEMCryptoResult ContentKeySession::GenericVerify(const std::string& message, } OEMCryptoResult ContentKeySession::LoadKeysAsLicenseType( - const std::string& message, const std::string& signature, - const std::string& mac_key_iv, const std::string& mac_key, - const std::vector& keys, - const std::string& provider_session_token, - const std::string& srm_requirement, OEMCrypto_LicenseType license_type) { + const std::string& /* message */, const std::string& /* signature */, + const std::string& /* mac_key_iv */, const std::string& /* mac_key */, + const std::vector& /* keys */, + const std::string& /* provider_session_token */, + const std::string& /* srm_requirement */, + OEMCrypto_LicenseType /* license_type */) { // TODO(b/252670759): remove all of this. // const uint8_t* msg = reinterpret_cast(message.data()); // cached_key_id_.clear(); diff --git a/libwvdrmengine/cdm/core/src/crypto_session.cpp b/libwvdrmengine/cdm/core/src/crypto_session.cpp index 6d9ca395..7cb8e5dd 100644 --- a/libwvdrmengine/cdm/core/src/crypto_session.cpp +++ b/libwvdrmengine/cdm/core/src/crypto_session.cpp @@ -1074,18 +1074,20 @@ CdmResponseType CryptoSession::PrepareAndSignLicenseRequest( "PrepareAndSignLicenseRequest"); } -CdmResponseType CryptoSession::UseSecondaryKey(bool dual_key) { #ifdef HAS_DUAL_KEY +CdmResponseType CryptoSession::UseSecondaryKey(bool dual_key) { OEMCryptoResult sts; WithOecSessionLock("UseSecondaryKey", [&] { sts = OEMCrypto_UseSecondaryKey(oec_session_id_, dual_key); }); return MapOEMCryptoResult(sts, LOAD_KEY_ERROR, "UseSecondaryKey"); -#else - return CdmResponseType(NO_ERROR); -#endif } +#else +CdmResponseType CryptoSession::UseSecondaryKey(bool /* dual_key */) { + return CdmResponseType(NO_ERROR); +} +#endif CdmResponseType CryptoSession::LoadLicense(const std::string& signed_message, const std::string& core_message, diff --git a/libwvdrmengine/cdm/core/src/service_certificate.cpp b/libwvdrmengine/cdm/core/src/service_certificate.cpp index e3ae66c4..09ab4939 100644 --- a/libwvdrmengine/cdm/core/src/service_certificate.cpp +++ b/libwvdrmengine/cdm/core/src/service_certificate.cpp @@ -234,7 +234,8 @@ CdmResponseType ServiceCertificate::EncryptRsaOaep( } CdmResponseType ServiceCertificate::EncryptClientId( - CryptoSession* crypto_session, const ClientIdentification* clear_client_id, + CryptoSession* /* crypto_session */, + const ClientIdentification* clear_client_id, EncryptedClientIdentification* encrypted_client_id) const { encrypted_client_id->set_provider_id(provider_id_); encrypted_client_id->set_service_certificate_serial_number(serial_number_); diff --git a/libwvdrmengine/cdm/util/src/file_store.cpp b/libwvdrmengine/cdm/util/src/file_store.cpp index 82ba2db8..ca11cdfb 100644 --- a/libwvdrmengine/cdm/util/src/file_store.cpp +++ b/libwvdrmengine/cdm/util/src/file_store.cpp @@ -8,6 +8,8 @@ #include #include +#include +#include #include #include #include @@ -406,11 +408,13 @@ class AndroidFile : public File { return; } LOGD( - "Stat: path = %s, st_dev = %lu, st_ino = %lu, st_mode = 0%o (%s), " - "st_uid = %u, st_gid = %u, st_size = %ld, st_atime = %s, " - "st_mtime = %s, st_ctime = %s", - file_path(), st.st_dev, st.st_ino, st.st_mode, - StatModeToString(st.st_mode).c_str(), st.st_uid, st.st_gid, st.st_size, + "Stat: path = %s, st_dev = %" PRIu64 ", st_ino = %" PRIu64 + ", st_mode = 0%o (%s), st_uid = %u, st_gid = %u, st_size = %" PRId64 + ", st_atime = %s, st_mtime = %s, st_ctime = %s", + file_path(), static_cast(st.st_dev), + static_cast(st.st_ino), st.st_mode, + StatModeToString(st.st_mode).c_str(), st.st_uid, st.st_gid, + static_cast(st.st_size), PosixTimeToString(st.st_atime).c_str(), PosixTimeToString(st.st_mtime).c_str(), PosixTimeToString(st.st_ctime).c_str()); diff --git a/libwvdrmengine/factory_upload_tool/src/WidevineRemotelyProvisionedComponent.cpp b/libwvdrmengine/factory_upload_tool/src/WidevineRemotelyProvisionedComponent.cpp index 31432704..c722d05a 100644 --- a/libwvdrmengine/factory_upload_tool/src/WidevineRemotelyProvisionedComponent.cpp +++ b/libwvdrmengine/factory_upload_tool/src/WidevineRemotelyProvisionedComponent.cpp @@ -83,15 +83,16 @@ ScopedAStatus WidevineRemotelyProvisionedComponent::getHardwareInfo( } ScopedAStatus WidevineRemotelyProvisionedComponent::generateEcdsaP256KeyPair( - bool testMode, MacedPublicKey* macedPublicKey, bytevec* privateKeyHandle) { + bool /* testMode */, MacedPublicKey* /* macedPublicKey */, + bytevec* /* privateKeyHandle */) { return Status("Invalid operation."); } ScopedAStatus WidevineRemotelyProvisionedComponent::generateCertificateRequest( bool testMode, const vector& keysToSign, - const bytevec& endpointEncCertChain, const bytevec& challenge, + const bytevec& endpointEncCertChain, const bytevec& /* challenge */, DeviceInfo* deviceInfo, ProtectedData* protectedData, - bytevec* keysToSignMac) { + bytevec* /* keysToSignMac */) { if (!keysToSign.empty()) { return Status("Invalid operation: Keys to sign must be empty."); } diff --git a/libwvdrmengine/factory_upload_tool/src/log.cpp b/libwvdrmengine/factory_upload_tool/src/log.cpp index 5d018870..9b5ce01d 100644 --- a/libwvdrmengine/factory_upload_tool/src/log.cpp +++ b/libwvdrmengine/factory_upload_tool/src/log.cpp @@ -63,6 +63,8 @@ void Log(const char* file, const char* function, int line, LogPriority level, android_LogPriority prio = ANDROID_LOG_VERBOSE; switch (level) { + case CDM_LOG_SILENT: + return; case CDM_LOG_ERROR: prio = ANDROID_LOG_ERROR; break;