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

Merge "Remove Unused OEMCrypto Wrapper Methods"

Browse Source
This commit is contained in:
John "Juce" Bruce
2014-05-16 18:00:21 +00:00
committed by Android (Google) Code Review
parent 5a1bf27fd3 d6c98f1290
commit 1de68fb7c2
2 changed files with 0 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libwvdrmengine/mediadrm/include/WVGenericCryptoInterface.h
View File

@@ -57,14 +57,6 @@ class WVGenericCryptoInterface {
algorithm, signature, signature_length); 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, virtual OEMCryptoResult loadDeviceRSAKey(OEMCrypto_SESSION session,
const uint8_t* wrapped_rsa_key, const uint8_t* wrapped_rsa_key,
size_t wrapped_rsa_key_length) { size_t wrapped_rsa_key_length) {

4
libwvdrmengine/mediadrm/test/WVDrmPlugin_test.cpp
View File

@@ -96,10 +96,6 @@ class MockCrypto : public WVGenericCryptoInterface {
size_t, OEMCrypto_Algorithm, size_t, OEMCrypto_Algorithm,
const uint8_t*, size_t)); const uint8_t*, size_t));
MOCK_METHOD1(openSession, OEMCryptoResult(OEMCrypto_SESSION*));
MOCK_METHOD1(closeSession, OEMCryptoResult(OEMCrypto_SESSION));
MOCK_METHOD3(loadDeviceRSAKey, OEMCryptoResult(OEMCrypto_SESSION, MOCK_METHOD3(loadDeviceRSAKey, OEMCryptoResult(OEMCrypto_SESSION,
const uint8_t*, size_t)); const uint8_t*, size_t));