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

Update OEMCrypto to match ODK version updates

Browse Source 
Bug: 293154424
Change-Id: Ie22bc48e043f2a88090a2601d5d5c96953e73015
This commit is contained in:
Vicky Min
2023-08-01 17:42:16 +00:00
committed by Robert Shih
parent 41942e1014
commit 5c718ecb0d
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libwvdrmengine/oemcrypto/test/oec_device_features.h
View File

@@ -10,7 +10,7 @@
namespace wvoec { namespace wvoec {
// These tests are designed to work for this version: // These tests are designed to work for this version:
constexpr unsigned int kCurrentAPI = 18; constexpr unsigned int kCurrentAPI = 19;
// The API version when Core Messages were introduced. // The API version when Core Messages were introduced.
constexpr unsigned int kCoreMessagesAPI = 16; constexpr unsigned int kCoreMessagesAPI = 16;
// The API version when we stopped encrypting key control blocks. // The API version when we stopped encrypting key control blocks.

6
libwvdrmengine/oemcrypto/test/oemcrypto_basic_test.cpp
View File

@@ -180,7 +180,7 @@ TEST_F(OEMCryptoClientTest, FreeUnallocatedSecureBufferNoFailure) {
*/ */
TEST_F(OEMCryptoClientTest, VersionNumber) { TEST_F(OEMCryptoClientTest, VersionNumber) {
const std::string log_message = const std::string log_message =
"OEMCrypto unit tests for API 18.4. Tests last updated 2023-09-07"; "OEMCrypto unit tests for API 19.0. Tests last updated 2023-08-01";
cout << " " << log_message << "\n"; cout << " " << log_message << "\n";
cout << " " cout << " "
<< "These tests are part of Android U." << "These tests are part of Android U."
@@ -188,8 +188,8 @@ TEST_F(OEMCryptoClientTest, VersionNumber) {
LOGI("%s", log_message.c_str()); LOGI("%s", log_message.c_str());
// If any of the following fail, then it is time to update the log message // If any of the following fail, then it is time to update the log message
// above. // above.
EXPECT_EQ(ODK_MAJOR_VERSION, 18); EXPECT_EQ(ODK_MAJOR_VERSION, 19);
EXPECT_EQ(ODK_MINOR_VERSION, 4); EXPECT_EQ(ODK_MINOR_VERSION, 0);
EXPECT_EQ(kCurrentAPI, static_cast<unsigned>(ODK_MAJOR_VERSION)); EXPECT_EQ(kCurrentAPI, static_cast<unsigned>(ODK_MAJOR_VERSION));
OEMCrypto_Security_Level level = OEMCrypto_SecurityLevel(); OEMCrypto_Security_Level level = OEMCrypto_SecurityLevel();
EXPECT_GT(level, OEMCrypto_Level_Unknown); EXPECT_GT(level, OEMCrypto_Level_Unknown);