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

Remove namespace from Level3 aliases

Browse Source 
Since the L3 functions are meant to alias the OEMCrypto functions,
they shouldn't appear in a namespace.

Change-Id: I8d11279ff86c5b5c9eab0598d134f6904f0021ad
This commit is contained in:
Jacob Trimble
2023-12-14 22:21:25 +00:00
committed by Robert Shih
parent 955c89315e
commit c5d06cb7c7
4 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libwvdrmengine/level3/include/haystack.h
View File

@@ -126,7 +126,7 @@ OEMCryptoResult Haystack_LoadRenewal(OEMCrypto_SESSION session,
OEMCryptoResult Haystack_LoadEntitledContentKeys(
OEMCrypto_SESSION session, const uint8_t* message, size_t message_length,
size_t num_keys, const OEMCrypto_EntitledContentKeyObject* key_array);
wvoec3::Level3InitializationState Haystack_GetInitializationState();
Level3InitializationState Haystack_GetInitializationState();
void Haystack_OutputErrorLogs();
OEMCryptoResult Haystack_CreateEntitledKeySession(
OEMCrypto_SESSION oec_session, OEMCrypto_SESSION* key_session);

4
libwvdrmengine/level3/src/level3_adapter.cpp
View File

@@ -7,8 +7,6 @@
#include "haystack.h"
#include "level3.h"
namespace wvoec3 {
bool Level3_IsInApp() {
return haystack::Haystack_IsInApp();
}
@@ -576,5 +574,3 @@ OEMCryptoResult Level3_GetSignatureHashAlgorithm(
OEMCryptoResult Level3_EnterTestMode(void) {
return OEMCrypto_ERROR_NOT_IMPLEMENTED;
}
} // namespace wvoec3