Source release 16.4.0

oemcrypto/test/fuzz_tests/oemcrypto_fuzz_helper.h

@@ -9,9 +9,9 @@
 #include "FuzzedDataProvider.h"
 #include "OEMCryptoCENC.h"
 #include "oec_device_features.h"
-#include "oec_session_util.h"
 #include "oemcrypto_corpus_generator_helper.h"
 #include "oemcrypto_session_tests_helper.h"
+
 namespace wvoec {
 // Initial setup to create a valid OEMCrypto state such as initializing crypto
 // firmware/hardware, installing golden key box etc. in order to fuzz
@@ -42,6 +42,15 @@ class OEMCryptoLicenseAPIFuzz : public InitializeFuzz {
 
   LicenseRoundTrip& license_messages() { return license_messages_; }
 
+  Session* session() { return &session_; }
+
+  void LoadLicense() {
+    license_messages_.SignAndVerifyRequest();
+    license_messages_.CreateDefaultResponse();
+    license_messages_.EncryptAndSignResponse();
+    license_messages_.LoadResponse();
+  }
+
  private:
   Session session_;
   LicenseRoundTrip license_messages_;
@@ -89,6 +98,9 @@ void ConvertDataToValidEnum(T max_enum_value, T* t) {
 // Redirect printf and log statements from oemcrypto functions to a file to
 // reduce noise
 void RedirectStdoutToFile();
+
+// Function to split fuzzer input using delimiter "-_^_".
+std::vector<std::vector<uint8_t>> SplitInput(const uint8_t* data, size_t size);
 }  // namespace wvoec
 
 #endif  // OEMCRYPTO_FUZZ_HELPER_H_