Source release 19.1.0

oemcrypto/test/oemcrypto_license_test.cpp

@@ -12,6 +12,9 @@ using ::testing::Range;
 
 namespace wvoec {
 
+/// @addtogroup license
+/// @{
+
 // Function to test APIs that expect a buffer length as input
 // by passing huge buffer lengths up to end_buffer_length and test that the API
 // doesn't crash.
@@ -457,6 +460,8 @@ TEST_P(OEMCryptoLicenseTest, LoadKeyWithBadVerification) {
 // This test verifies that LoadKeys still works when the message is not aligned
 // in memory on a word (2 or 4 byte) boundary.
 TEST_P(OEMCryptoLicenseTest, LoadKeyUnalignedMessageAPI16) {
+  license_messages_.skip_request_hash();
+
   ASSERT_NO_FATAL_FAILURE(license_messages_.SignAndVerifyRequest());
   ASSERT_NO_FATAL_FAILURE(license_messages_.CreateDefaultResponse());
   ASSERT_NO_FATAL_FAILURE(license_messages_.EncryptAndSignResponse());
@@ -472,9 +477,12 @@ TEST_P(OEMCryptoLicenseTest, LoadKeyUnalignedMessageAPI16) {
                 license_messages_.encrypted_response_buffer().end());
   // Thus, buffer[offset] is NOT word aligned.
   const uint8_t* unaligned_message = &buffer[offset];
+  const std::vector<uint8_t> context = session_.GetDefaultContext();
   ASSERT_EQ(OEMCrypto_SUCCESS,
             OEMCrypto_LoadLicense(
-                session_.session_id(), unaligned_message,
+                session_.session_id(), context.data(), context.size(),
+                session_.enc_session_key().data(),
+                session_.enc_session_key().size(), unaligned_message,
                 license_messages_.encrypted_response_buffer().size(),
                 license_messages_.serialized_core_message().size(),
                 license_messages_.response_signature().data(),
@@ -674,6 +682,9 @@ TEST_P(OEMCryptoLicenseTest, QueryKeyControl) {
 // implementation should be able to handle the clear KCB in the 16.4.x response
 // and load the license correctly.
 TEST_F(OEMCryptoSessionTests, ClearKcbAPI17) {
+  if (wvoec::global_features.api_version < 17) {
+    GTEST_SKIP() << "Test for versions 17 and up only.";
+  }
   Session s;
   ASSERT_NO_FATAL_FAILURE(s.open());
   ASSERT_NO_FATAL_FAILURE(InstallTestDrmKey(&s));