From d6c98f12901924e837b535b38762898d7397bd7c Mon Sep 17 00:00:00 2001 From: "John \"Juce\" Bruce" Date: Wed, 14 May 2014 16:03:26 -0700 Subject: [PATCH] Remove Unused OEMCrypto Wrapper Methods (This is a merge of https://widevine-internal-review.googlesource.com/#/c/10141/ from the Widevine CDM repo.) Over the course of revising the CAST support, the need for the MediaDrm to call open and close session was removed. However, the methods to do that were not. This removes the unused code. Change-Id: I577f5314b6b20f36c308ac6753f1084ff3c707d9 --- .../mediadrm/include/WVGenericCryptoInterface.h | 8 -------- libwvdrmengine/mediadrm/test/WVDrmPlugin_test.cpp | 4 ---- 2 files changed, 12 deletions(-) diff --git a/libwvdrmengine/mediadrm/include/WVGenericCryptoInterface.h b/libwvdrmengine/mediadrm/include/WVGenericCryptoInterface.h index b21dae39..9424ea03 100644 --- a/libwvdrmengine/mediadrm/include/WVGenericCryptoInterface.h +++ b/libwvdrmengine/mediadrm/include/WVGenericCryptoInterface.h @@ -57,14 +57,6 @@ class WVGenericCryptoInterface { algorithm, signature, signature_length); } - virtual OEMCryptoResult openSession(OEMCrypto_SESSION *session) { - return OEMCrypto_OpenSession(session); - } - - virtual OEMCryptoResult closeSession(OEMCrypto_SESSION session) { - return OEMCrypto_CloseSession(session); - } - virtual OEMCryptoResult loadDeviceRSAKey(OEMCrypto_SESSION session, const uint8_t* wrapped_rsa_key, size_t wrapped_rsa_key_length) { diff --git a/libwvdrmengine/mediadrm/test/WVDrmPlugin_test.cpp b/libwvdrmengine/mediadrm/test/WVDrmPlugin_test.cpp index e8cd64c3..1f1391d6 100644 --- a/libwvdrmengine/mediadrm/test/WVDrmPlugin_test.cpp +++ b/libwvdrmengine/mediadrm/test/WVDrmPlugin_test.cpp @@ -96,10 +96,6 @@ class MockCrypto : public WVGenericCryptoInterface { size_t, OEMCrypto_Algorithm, const uint8_t*, size_t)); - MOCK_METHOD1(openSession, OEMCryptoResult(OEMCrypto_SESSION*)); - - MOCK_METHOD1(closeSession, OEMCryptoResult(OEMCrypto_SESSION)); - MOCK_METHOD3(loadDeviceRSAKey, OEMCryptoResult(OEMCrypto_SESSION, const uint8_t*, size_t));