From 5c718ecb0de01002e88ecd9f30adce8c7d561249 Mon Sep 17 00:00:00 2001 From: Vicky Min Date: Tue, 1 Aug 2023 17:42:16 +0000 Subject: [PATCH] Update OEMCrypto to match ODK version updates Bug: 293154424 Change-Id: Ie22bc48e043f2a88090a2601d5d5c96953e73015 --- libwvdrmengine/oemcrypto/test/oec_device_features.h | 2 +- libwvdrmengine/oemcrypto/test/oemcrypto_basic_test.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libwvdrmengine/oemcrypto/test/oec_device_features.h b/libwvdrmengine/oemcrypto/test/oec_device_features.h index ec0a8fc1..00b88b31 100644 --- a/libwvdrmengine/oemcrypto/test/oec_device_features.h +++ b/libwvdrmengine/oemcrypto/test/oec_device_features.h @@ -10,7 +10,7 @@ namespace wvoec { // 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. constexpr unsigned int kCoreMessagesAPI = 16; // The API version when we stopped encrypting key control blocks. diff --git a/libwvdrmengine/oemcrypto/test/oemcrypto_basic_test.cpp b/libwvdrmengine/oemcrypto/test/oemcrypto_basic_test.cpp index f1483b2c..89671d07 100644 --- a/libwvdrmengine/oemcrypto/test/oemcrypto_basic_test.cpp +++ b/libwvdrmengine/oemcrypto/test/oemcrypto_basic_test.cpp @@ -180,7 +180,7 @@ TEST_F(OEMCryptoClientTest, FreeUnallocatedSecureBufferNoFailure) { */ TEST_F(OEMCryptoClientTest, VersionNumber) { 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 << " " << "These tests are part of Android U." @@ -188,8 +188,8 @@ TEST_F(OEMCryptoClientTest, VersionNumber) { LOGI("%s", log_message.c_str()); // If any of the following fail, then it is time to update the log message // above. - EXPECT_EQ(ODK_MAJOR_VERSION, 18); - EXPECT_EQ(ODK_MINOR_VERSION, 4); + EXPECT_EQ(ODK_MAJOR_VERSION, 19); + EXPECT_EQ(ODK_MINOR_VERSION, 0); EXPECT_EQ(kCurrentAPI, static_cast(ODK_MAJOR_VERSION)); OEMCrypto_Security_Level level = OEMCrypto_SecurityLevel(); EXPECT_GT(level, OEMCrypto_Level_Unknown);