Merge OEMCrypto KDF and usage functions

Since KDF functions are only used right before specific functions, this
merges them to simplify internal state within OEMCrypto.

Fixes: 299527712
Change-Id: I426cfcdc102bd73cf65cd809b213da2474f44b34

libwvdrmengine/oemcrypto/test/oemcrypto_provisioning_test.cpp

@@ -67,24 +67,6 @@ TEST_F(OEMCryptoKeyboxTest, ProductionKeyboxValid) {
   ASSERT_EQ(OEMCrypto_SUCCESS, OEMCrypto_IsKeyboxValid());
 }
 
-// This tests GenerateDerivedKeys with an 8k context.
-TEST_F(OEMCryptoKeyboxTest, GenerateDerivedKeysFromKeyboxLargeBuffer) {
-  Session s;
-  ASSERT_NO_FATAL_FAILURE(s.open());
-  const size_t max_size = GetResourceValue(kLargeMessageSize);
-  vector<uint8_t> mac_context(max_size);
-  vector<uint8_t> enc_context(max_size);
-  // Stripe the data so the two vectors are not identical, and not all zeroes.
-  for (size_t i = 0; i < max_size; i++) {
-    mac_context[i] = i % 0x100;
-    enc_context[i] = (3 * i) % 0x100;
-  }
-  ASSERT_EQ(OEMCrypto_SUCCESS,
-            OEMCrypto_GenerateDerivedKeys(
-                s.session_id(), mac_context.data(), mac_context.size(),
-                enc_context.data(), enc_context.size()));
-}
-
 // This verifies that the device really does claim to have a certificate.
 // It should be filtered out for devices that have a keybox.
 TEST_F(OEMCryptoProv30Test, DeviceClaimsOEMCertificate) {
@@ -164,7 +146,6 @@ TEST_F(OEMCryptoProv30Test, GetCertOnlyAPI16) {
   // Derive keys from the session key -- this should use the DRM Cert's key.
   // It should NOT use the OEM Private key because that key should not have
   // been loaded.
-  ASSERT_NO_FATAL_FAILURE(s.GenerateDerivedKeysFromSessionKey());
   // Now fill a message and try to load it.
   LicenseRoundTrip license_messages(&s);
   license_messages.set_control(0);
@@ -745,14 +726,8 @@ TEST_F(OEMCryptoLoadsCertificate, SignProvisioningRequest) {
     GTEST_SKIP() << "Test for non Prov 4.0 devices only.";
   }
   Session s;
-  ASSERT_NO_FATAL_FAILURE(s.open());
-  if (global_features.provisioning_method == OEMCrypto_OEMCertificate) {
-    s.LoadOEMCert(true);
-  } else {
-    EXPECT_EQ(global_features.provisioning_method, OEMCrypto_Keybox);
-    s.GenerateDerivedKeysFromKeybox(keybox_);
-  }
   ProvisioningRoundTrip provisioning_messages(&s, encoded_rsa_key_);
+  ASSERT_NO_FATAL_FAILURE(provisioning_messages.PrepareSession(keybox_));
   ASSERT_NO_FATAL_FAILURE(provisioning_messages.SignAndVerifyRequest());
 }
 
@@ -764,16 +739,10 @@ TEST_F(OEMCryptoLoadsCertificate, SignLargeProvisioningRequestAPI16) {
     GTEST_SKIP() << "Test for non Prov 4.0 devices only.";
   }
   Session s;
-  ASSERT_NO_FATAL_FAILURE(s.open());
-  if (global_features.provisioning_method == OEMCrypto_OEMCertificate) {
-    s.LoadOEMCert(true);
-  } else {
-    EXPECT_EQ(global_features.provisioning_method, OEMCrypto_Keybox);
-    s.GenerateDerivedKeysFromKeybox(keybox_);
-  }
   ProvisioningRoundTrip provisioning_messages(&s, encoded_rsa_key_);
   const size_t max_size = GetResourceValue(kLargeMessageSize);
   provisioning_messages.set_message_size(max_size);
+  ASSERT_NO_FATAL_FAILURE(provisioning_messages.PrepareSession(keybox_));
   ASSERT_NO_FATAL_FAILURE(provisioning_messages.SignAndVerifyRequest());
 }
 
@@ -788,7 +757,7 @@ TEST_F(OEMCryptoLoadsCertificate, CertificateProvision) {
   }
   Session s;
   ProvisioningRoundTrip provisioning_messages(&s, encoded_rsa_key_);
-  provisioning_messages.PrepareSession(keybox_);
+  ASSERT_NO_FATAL_FAILURE(provisioning_messages.PrepareSession(keybox_));
   ASSERT_NO_FATAL_FAILURE(provisioning_messages.SignAndVerifyRequest());
   ASSERT_NO_FATAL_FAILURE(provisioning_messages.CreateDefaultResponse());
   ASSERT_NO_FATAL_FAILURE(provisioning_messages.EncryptAndSignResponse());
@@ -1326,41 +1295,17 @@ TEST_F(OEMCryptoLoadsCertificate, RSAPerformance) {
   Session s;
   ASSERT_NO_FATAL_FAILURE(s.open());
   ASSERT_NO_FATAL_FAILURE(s.LoadWrappedRsaDrmKey(wrapped_drm_key_));
-  vector<uint8_t> session_key;
-  vector<uint8_t> enc_session_key;
   ASSERT_NO_FATAL_FAILURE(s.SetRsaPublicKeyFromPrivateKeyInfo(
       encoded_rsa_key_.data(), encoded_rsa_key_.size()));
-  ASSERT_TRUE(s.GenerateRsaSessionKey(&session_key, &enc_session_key));
-  vector<uint8_t> mac_context;
-  vector<uint8_t> enc_context;
-  s.FillDefaultContext(&mac_context, &enc_context);
 
-  enc_session_key = wvutil::a2b_hex(
-      "7789c619aa3b9fa3c0a53f57a4abc6"
-      "02157c8aa57e3c6fb450b0bea22667fb"
-      "0c3200f9d9d618e397837c720dc2dadf"
-      "486f33590744b2a4e54ca134ae7dbf74"
-      "434c2fcf6b525f3e132262f05ea3b3c1"
-      "198595c0e52b573335b2e8a3debd0d0d"
-      "d0306f8fcdde4e76476be71342957251"
-      "e1688c9ca6c1c34ed056d3b989394160"
-      "cf6937e5ce4d39cc73d11a2e93da21a2"
-      "fa019d246c852fe960095b32f120c3c2"
-      "7085f7b64aac344a68d607c0768676ce"
-      "d4c5b2d057f7601921b453a451e1dea0"
-      "843ebfef628d9af2784d68e86b730476"
-      "e136dfe19989de4be30a4e7878efcde5"
-      "ad2b1254f80c0c5dd3cf111b56572217"
-      "b9f58fc1dacbf74b59d354a1e62cfa0e"
-      "bf");
+  LicenseRoundTrip license_messages(&s);
+  license_messages.SignAndVerifyRequest();
+  license_messages.CreateDefaultResponse();
+
   start_time = clock.now();
   count = 0;
   do {
-    ASSERT_EQ(OEMCrypto_SUCCESS,
-              OEMCrypto_DeriveKeysFromSessionKey(
-                  s.session_id(), enc_session_key.data(),
-                  enc_session_key.size(), mac_context.data(),
-                  mac_context.size(), enc_context.data(), enc_context.size()));
+    license_messages.LoadResponse(&s, /* verify_keys= */ false);
     count++;
   } while (clock.now() - start_time < kTestDuration);
   delta_time = clock.now() - start_time;
@@ -1376,24 +1321,4 @@ TEST_F(OEMCryptoLoadsCertificate, RSAPerformance) {
          derive_keys_time);
 }
 
-// Test DeriveKeysFromSessionKey using the maximum size for the HMAC context.
-TEST_F(OEMCryptoUsesCertificate, GenerateDerivedKeysLargeBuffer) {
-  vector<uint8_t> session_key;
-  vector<uint8_t> enc_session_key;
-  ASSERT_TRUE(session_.GenerateSessionKey(&session_key, &enc_session_key));
-  const size_t max_size = GetResourceValue(kLargeMessageSize);
-  vector<uint8_t> mac_context(max_size);
-  vector<uint8_t> enc_context(max_size);
-  // Stripe the data so the two vectors are not identical, and not all zeroes.
-  for (size_t i = 0; i < max_size; i++) {
-    mac_context[i] = i % 0x100;
-    enc_context[i] = (3 * i) % 0x100;
-  }
-  ASSERT_EQ(OEMCrypto_SUCCESS,
-            OEMCrypto_DeriveKeysFromSessionKey(
-                session_.session_id(), enc_session_key.data(),
-                enc_session_key.size(), mac_context.data(), mac_context.size(),
-                enc_context.data(), enc_context.size()));
-}
-
 }  // namespace wvoec