diff --git a/libwvdrmengine/level3/arm/libwvlevel3.a b/libwvdrmengine/level3/arm/libwvlevel3.a index 71d767d4..7ccf19d7 100644 Binary files a/libwvdrmengine/level3/arm/libwvlevel3.a and b/libwvdrmengine/level3/arm/libwvlevel3.a differ diff --git a/libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp b/libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp index f3c144b5..b53243e2 100644 --- a/libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp +++ b/libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp @@ -4478,6 +4478,7 @@ TEST_F(DISABLED_GenericDRMTest, KeyDurationVerify) { TEST_F(OEMCryptoClientTest, SupportsUsageTable) { if (OEMCrypto_SupportsUsageTable()) { + EXPECT_EQ(OEMCrypto_SUCCESS, OEMCrypto_UpdateUsageTable()); cout << " OEMCrypto supports usage tables." << endl; } else { cout << " OEMCrypto does not support usage tables." << endl; @@ -4668,7 +4669,6 @@ TEST_P(DISABLED_UsageTableTest, FiftyEntries) { s1.LoadTestKeys(pst1, new_mac_keys_); sleep(kShortSleep); - cout << "Making 49\n"; const size_t ENTRY_COUNT = 49;// API says should hold at least 50 entries. Session sessions[ENTRY_COUNT]; for (int i=0; i(pst.c_str()), pst.length()); + EXPECT_EQ(OEMCrypto_ERROR_INVALID_CONTEXT, sts); + std::string null_pst = ""; + sts = OEMCrypto_DeactivateUsageEntry( + reinterpret_cast(null_pst.c_str()), null_pst.length()); + EXPECT_EQ(OEMCrypto_ERROR_INVALID_CONTEXT, sts); + } +} + TEST_P(DISABLED_UsageTableTest, GenericEncrypt) { if (OEMCrypto_SupportsUsageTable()) { std::string pst = "A PST";