Implement license protocol 2.2 for OEMCrypto v19

This updates the code and tests to allow for using license protocol 2.2
when using OEMCrypto v19.

Issue: 80428549
Issue: 121031064
Issue: 232464183
Change-Id: Ib6bb61f86dd310b566227462658530bca5940b88

libwvdrmengine/oemcrypto/test/oec_session_util.h

@@ -444,6 +444,7 @@ class LicenseRoundTrip
         update_mac_keys_(true),
         api_version_(kCurrentAPI),
         expect_request_has_correct_nonce_(true),
+        skip_request_hash_(global_features.api_version < 19),
         license_type_(OEMCrypto_ContentLicense),
         request_hash_() {}
   void CreateDefaultResponse() override;
@@ -518,6 +519,8 @@ class LicenseRoundTrip
   }
   // Skip the nonce check when verifying the license request.
   void skip_nonce_check() { expect_request_has_correct_nonce_ = false; }
+  // Skip hashing license request before signing/KDF.
+  void skip_request_hash() { skip_request_hash_ = true; }
   // This sets the key id of the specified key to the specified string.
   // This is used to test with different key id lengths.
   void SetKeyId(size_t index, const string& key_id);
@@ -549,6 +552,9 @@ class LicenseRoundTrip
   // session. This is usually true, but when we are testing how OEMCrypto
   // handles a bad nonce, we don't want to.
   bool expect_request_has_correct_nonce_;
+  // Whether to skip hashing the request before signing and KDF; this is used
+  // for license protocol 2.2.
+  bool skip_request_hash_;
   // Whether this is a content license or an entitlement license. Used in
   // CreateDefaultResponse.
   OEMCrypto_LicenseType license_type_;
@@ -674,7 +680,7 @@ class Session {
   // not null, it will be incremented when a nonce flood is detected.
   void GenerateNonce(int* error_counter = nullptr);
   // Fill the vector with test context which generate known mac and enc keys.
-  std::vector<uint8_t> GetDefaultContext();
+  std::vector<uint8_t> GetDefaultContext(bool do_hash = false);
   // Generate known mac and enc keys using OEMCrypto_GenerateDerivedKeys and
   // also fill out enc_key_, mac_key_server_, and mac_key_client_.
   void GenerateDerivedKeysFromKeybox(const wvoec::WidevineKeybox& keybox);