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

Bump OEMCrypto API to 18.2 to match ODK

Browse Source 
Merged from https://widevine-internal-review.googlesource.com/170295

Change-Id: I9e9cc0c7c3296db71ac31518cf2d3d8608066686
This commit is contained in:
Matt Feddersen
2023-04-12 17:49:49 +00:00
committed by Robert Shih
parent 84e27c660d
commit 2e7c68440b
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libwvdrmengine/oemcrypto/include/OEMCryptoCENC.h
View File

@@ -3,7 +3,7 @@
// License Agreement. // License Agreement.
/** /**
* @mainpage OEMCrypto API v18.1 * @mainpage OEMCrypto API v18.2
* *
* OEMCrypto is the low level library implemented by the OEM to provide key and * OEMCrypto is the low level library implemented by the OEM to provide key and
* content protection, usually in a separate secure memory or process space. The * content protection, usually in a separate secure memory or process space. The

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

@@ -156,7 +156,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.1. Tests last updated 2023-03-08"; "OEMCrypto unit tests for API 18.2. Tests last updated 2023-04-12";
cout << " " << log_message << "\n"; cout << " " << log_message << "\n";
cout << " " cout << " "
<< "These tests are part of Android U." << "These tests are part of Android U."
@@ -165,7 +165,7 @@ TEST_F(OEMCryptoClientTest, VersionNumber) {
// 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, 18);
EXPECT_EQ(ODK_MINOR_VERSION, 1); EXPECT_EQ(ODK_MINOR_VERSION, 2);
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);