Source release 18.5.0

oemcrypto/test/oemcrypto_license_test.cpp

@@ -84,10 +84,6 @@ void TestMaxKeys(SessionUtil* util, size_t num_keys_per_session) {
   }
 }
 
-TEST_F(OEMCryptoSessionTestKeyboxTest, TestKeyboxIsValid) {
-  ASSERT_EQ(OEMCrypto_SUCCESS, OEMCrypto_IsKeyboxValid());
-}
-
 TEST_F(OEMCryptoSessionTests,
        OEMCryptoMemoryPrepareLicenseRequestForHugeRequestMessageLength) {
   TestPrepareLicenseRequestForHugeBufferLengths(
@@ -875,7 +871,7 @@ TEST_P(OEMCryptoRefreshTest, RefreshLargeBuffer) {
 }
 
 // This situation would occur if an app only uses one key in the license.  When
-// that happens, SelectKey would be called before the first decrypt, and then
+// that happens, GetKeyHandle would be called before the first decrypt, and then
 // would not need to be called again, even if the license is refreshed.
 TEST_P(OEMCryptoRefreshTest, RefreshWithNoSelectKey) {
   LoadLicense();
@@ -967,4 +963,4 @@ INSTANTIATE_TEST_SUITE_P(TestAPI16, OEMCryptoRefreshTestAPI16,
                          Range<uint32_t>(kCoreMessagesAPI, kCurrentAPI + 1));
 
 /// @}
-}  // namespace wvoec
+}  // namespace wvoec