Update Partner Repo

This update brings the partner repo up-to-date with commit
ae93405f980295f9a783bd04e2132a2370720107 in the internal repo.

oemcrypto/odk/test/fuzzing/corpus_generator/odk_corpus_generator.c

@@ -1,8 +1,8 @@
-/* Copyright 2020 Google LLC. All rights reserved. This file and proprietary */
-/* source code may only be used and distributed under the Widevine Master */
-/* License Agreement. */
+// Copyright 2020 Google LLC. All rights reserved. This file and proprietary
+// source code may only be used and distributed under the Widevine Master
+// License Agreement.
 
-/* We must define this macro to get RTLD_NEXT definition from <dlfcn.h> */
+// We must define this macro to get RTLD_NEXT definition from <dlfcn.h>
 #define _GNU_SOURCE
 
 #include <dlfcn.h>
@@ -21,7 +21,7 @@ OEMCryptoResult ODK_PrepareCoreLicenseRequest(
       message, message_length, core_message_length, nonce_values);
   char* file_name = GetFileName("license_request_corpus");
 
-  /* License Request format expected by fuzzer - [Core License Request] */
+  // License Request format expected by fuzzer - [Core License Request]
   AppendToFile(file_name, (const char*)message, *core_message_length);
   free(file_name);
   return oem_crypto_result;
@@ -50,9 +50,8 @@ OEMCryptoResult ODK_ParseLicense(
       nonce_values, parsed_license);
   char* file_name = GetFileName("license_response_corpus");
 
-  /* License Response format expected by fuzzer - [ODK_ParseLicense_Args][Core
-   */
-  /* License Response] */
+  // License Response format expected by fuzzer - [ODK_ParseLicense_Args][Core
+  // License Response]
   AppendToFile(file_name, (const char*)&parse_license_args,
                sizeof(struct ODK_ParseLicense_Args));
   AppendToFile(file_name, (const char*)message, core_message_length);
@@ -74,8 +73,8 @@ OEMCryptoResult ODK_PrepareCoreRenewalRequest(uint8_t* message,
                            nonce_values, clock_values, system_time_seconds);
   char* file_name = GetFileName("renewal_request_corpus");
 
-  /* License Request format expected by fuzzer - [ODK_ClockValues][Core */
-  /* License Request] */
+  // License Request format expected by fuzzer - [ODK_ClockValues][Core
+  // License Request]
   AppendToFile(file_name, (const char*)clock_values, sizeof(ODK_ClockValues));
   AppendToFile(file_name, (const char*)message, *core_message_size);
   free(file_name);
@@ -103,9 +102,8 @@ OEMCryptoResult ODK_ParseRenewal(const uint8_t* message, size_t message_length,
       timer_limits, clock_values, timer_value);
   char* file_name = GetFileName("renewal_response_corpus");
 
-  /* Renewal Response format expected by fuzzer - [ODK_ParseRenewal_Args][Core
-   */
-  /* Renewal Response] */
+  // Renewal Response format expected by fuzzer - [ODK_ParseRenewal_Args][Core
+  // Renewal Response]
   AppendToFile(file_name, (const char*)&parse_renewal_args,
                sizeof(struct ODK_ParseRenewal_Args));
   AppendToFile(file_name, (const char*)message, core_message_length);
@@ -126,8 +124,8 @@ OEMCryptoResult ODK_PrepareCoreProvisioningRequest(
                            nonce_values, device_id, device_id_length);
   char* file_name = GetFileName("provisioning_request_corpus");
 
-  /* Provisioning Request format expected by fuzzer - [Core Provisioning */
-  /* Request] */
+  // Provisioning Request format expected by fuzzer - [Core Provisioning
+  // Request]
   AppendToFile(file_name, (const char*)message, *core_message_length);
   free(file_name);
   return oem_crypto_result;
@@ -150,8 +148,8 @@ OEMCryptoResult ODK_ParseProvisioning(
       device_id_length, parsed_response);
   char* file_name = GetFileName("provisioning_response_corpus");
 
-  /* Provisioning Response format expected by fuzzer - */
-  /* [ODK_ParseProvisioning_Args][Core Provisioning Response] */
+  // Provisioning Response format expected by fuzzer -
+  // [ODK_ParseProvisioning_Args][Core Provisioning Response]
   AppendToFile(file_name, (const char*)&parse_provisioning_args,
                sizeof(struct ODK_ParseProvisioning_Args));
   AppendToFile(file_name, (const char*)message, core_message_length);

oemcrypto/odk/test/fuzzing/corpus_generator/odk_corpus_generator_helper.c

@@ -1,6 +1,6 @@
-/* Copyright 2020 Google LLC. All rights reserved. This file and proprietary */
-/* source code may only be used and distributed under the Widevine Master */
-/* License Agreement. */
+// Copyright 2020 Google LLC. All rights reserved. This file and proprietary
+// source code may only be used and distributed under the Widevine Master
+// License Agreement.
 #include "fuzzing/corpus_generator/odk_corpus_generator_helper.h"
 
 void AppendToFile(const char* file_name, const char* message,

oemcrypto/odk/test/fuzzing/corpus_generator/odk_corpus_generator_helper.h

@@ -1,6 +1,6 @@
-/* Copyright 2020 Google LLC. All rights reserved. This file and proprietary */
-/* source code may only be used and distributed under the Widevine Master */
-/* License Agreement. */
+// Copyright 2020 Google LLC. All rights reserved. This file and proprietary
+// source code may only be used and distributed under the Widevine Master
+// License Agreement.
 #ifndef WIDEVINE_ODK_TEST_FUZZING_CORPUS_GENERATOR_ODK_CORPUS_GENERATOR_HELPER_H_
 #define WIDEVINE_ODK_TEST_FUZZING_CORPUS_GENERATOR_ODK_CORPUS_GENERATOR_HELPER_H_
 
@@ -15,5 +15,4 @@ void AppendToFile(const char* file_name, const char* message,
 
 char* GetFileName(const char* directory);
 
-#endif /* WIDEVINE_ODK_TEST_FUZZING_CORPUS_GENERATOR_ODK_CORPUS_GENERATOR_HELPER_H_ \
-        */
+#endif  // WIDEVINE_ODK_TEST_FUZZING_CORPUS_GENERATOR_ODK_CORPUS_GENERATOR_HELPER_H_

oemcrypto/odk/test/fuzzing/odk_fuzz_helper.cpp

@@ -28,13 +28,13 @@ void ConvertDataToValidBools(ODK_ParsedLicense* t) {
       &t->timer_limits.soft_enforce_rental_duration);
 }
 
-void ConvertDataToValidBools(ODK_PreparedRenewalRequest* t) {}
+void ConvertDataToValidBools(ODK_PreparedRenewalRequest* t UNUSED) {}
 
-void ConvertDataToValidBools(ODK_ParsedProvisioning* t) {}
+void ConvertDataToValidBools(ODK_ParsedProvisioning* t UNUSED) {}
 
 OEMCryptoResult odk_serialize_LicenseRequest(
-    const void* in, uint8_t* out, size_t* size,
-    const ODK_LicenseRequest& core_license_request,
+    const void* in UNUSED, uint8_t* out, size_t* size,
+    const ODK_LicenseRequest& core_license_request UNUSED,
     const ODK_NonceValues* nonce_values) {
   return ODK_PrepareCoreLicenseRequest(out, SIZE_MAX, size, nonce_values);
 }
@@ -50,7 +50,7 @@ OEMCryptoResult odk_serialize_RenewalRequest(
 }
 
 OEMCryptoResult odk_serialize_ProvisioningRequest(
-    const void* in, uint8_t* out, size_t* size,
+    const void* in UNUSED, uint8_t* out, size_t* size,
     const ODK_ProvisioningRequest& core_provisioning,
     const ODK_NonceValues* nonce_values) {
   const std::string& device_id = core_provisioning.device_id;
@@ -99,11 +99,9 @@ OEMCryptoResult odk_deserialize_RenewalResponse(
   // odk_kdo method, we call Unpack_ODK_PreparedRenewalRequest private method.
   // playback_time cannot be captured from publicly exposed API
   // ODK_ParseRenewal.
-  Message* msg = nullptr;
-  AllocateMessage(&msg, message_block);
-  InitMessage(msg, const_cast<uint8_t*>(buf), len);
-  SetSize(msg, len);
-  Unpack_ODK_PreparedRenewalRequest(msg, renewal_msg);
+  ODK_Message msg = ODK_Message_Create(const_cast<uint8_t*>(buf), len);
+  ODK_Message_SetSize(&msg, len);
+  Unpack_ODK_PreparedRenewalRequest(&msg, renewal_msg);
   return OEMCrypto_SUCCESS;
 }
 

oemcrypto/odk/test/fuzzing/odk_fuzz_helper.h

@@ -1,6 +1,6 @@
-/* Copyright 2020 Google LLC. All rights reserved. This file and proprietary */
-/* source code may only be used and distributed under the Widevine Master */
-/* License Agreement. */
+// Copyright 2020 Google LLC. All rights reserved. This file and proprietary
+// source code may only be used and distributed under the Widevine Master
+// License Agreement.
 #ifndef WIDEVINE_ODK_TEST_FUZZING_ODK_FUZZ_HELPER_H_
 #define WIDEVINE_ODK_TEST_FUZZING_ODK_FUZZ_HELPER_H_
 
@@ -9,6 +9,7 @@
 
 #include "core_message_serialize.h"
 #include "fuzzing/odk_fuzz_structs.h"
+#include "odk_attributes.h"
 #include "odk_serialize.h"
 
 namespace oemcrypto_core_message {
@@ -56,24 +57,23 @@ bool kdo_serialize_ProvisioningResponse(
     const ODK_ParsedProvisioning& parsed_prov,
     std::string* oemcrypto_core_message);
 
-/* Idea behind having three different functions is: */
-/* Only ODK_ParseLicense structure had fields which needed additional */
-/* procession. Having a single function with templated parameter T was */
-/* failing during compile time because other two structures doesn't have */
-/* fields that need additional processing. Hence to reduce code redundance and
- */
-/* make us of common FuzzerMutateResponse across three response fuzzers, */
-/* three independent functions were defined and renewal and provisioning */
-/* functions would be empty as no additional processing is needed for them. */
+// Idea behind having three different functions is:
+// Only ODK_ParseLicense structure had fields which needed additional
+// procession. Having a single function with templated parameter T was
+// failing during compile time because other two structures doesn't have
+// fields that need additional processing. Hence to reduce code redundance and
+// make us of common FuzzerMutateResponse across three response fuzzers,
+// three independent functions were defined and renewal and provisioning
+// functions would be empty as no additional processing is needed for them.
 void ConvertDataToValidBools(ODK_ParsedLicense* t);
 
 void ConvertDataToValidBools(ODK_PreparedRenewalRequest* t);
 
 void ConvertDataToValidBools(ODK_ParsedProvisioning* t);
 
-/* Forward-declare the libFuzzer's mutator callback. Mark it weak so that */
-/* the program links successfully even outside of --config=asan-fuzzer */
-/* (apparently the only config in which LLVM uses our custom mutator). */
+// Forward-declare the libFuzzer's mutator callback. Mark it weak so that
+// the program links successfully even outside of --config=asan-fuzzer
+// (apparently the only config in which LLVM uses our custom mutator).
 extern "C" size_t LLVMFuzzerMutate(uint8_t* Data, size_t Size, size_t MaxSize)
     __attribute__((weak));
 
@@ -85,8 +85,8 @@ size_t FuzzerMutateResponse(uint8_t* data, size_t size, size_t max_size,
   const size_t kCoreResponseSize = sizeof(T);
   const size_t kTotalResponseSize = kArgsSize + kCoreResponseSize;
 
-  /* Deserializing data in order to make sure it deserializes properly. */
-  /* Input byte array format: [function arguments][data to parse]. */
+  // Deserializing data in order to make sure it deserializes properly.
+  // Input byte array format: [function arguments][data to parse].
   std::shared_ptr<A> _args(new A());
   A* args = _args.get();
   memcpy(args, data, kArgsSize);
@@ -97,17 +97,16 @@ size_t FuzzerMutateResponse(uint8_t* data, size_t size, size_t max_size,
   OEMCryptoResult result =
       odk_deserialize_fun(buf, size - kArgsSize, args, &nonce_values, &t);
 
-  /* If data doesn't deserialize successfully, We copy random bytes into */
-  /* T and serialize using kdo function */
-  /* which will create a valid oemcrypto core message using */
-  /* nonce and request hash from function args. OEMCrypto core message acts as
-   */
-  /* input to odk_kdo. */
+  // If data doesn't deserialize successfully, We copy random bytes into
+  // T and serialize using kdo function
+  // which will create a valid oemcrypto core message using
+  // nonce and request hash from function args. OEMCrypto core message acts as
+  // input to odk_kdo.
   if (result != OEMCrypto_SUCCESS) {
     if (max_size < kTotalResponseSize) {
       return 0;
     }
-    /* Initialize remaining bytes needed in data to zero. */
+    // Initialize remaining bytes needed in data to zero.
     if (size < kTotalResponseSize) {
       memset(data + size, 0, kTotalResponseSize - size);
     }
@@ -115,24 +114,24 @@ size_t FuzzerMutateResponse(uint8_t* data, size_t size, size_t max_size,
     memcpy(&t, buf, kCoreResponseSize);
   }
 
-  /* Ask LLVM to run its usual mutations, hopefully giving us interesting */
-  /* inputs. We copy deserialized data into pointer data, run mutations */
-  /* and copy back the mutated data to args and t */
+  // Ask LLVM to run its usual mutations, hopefully giving us interesting
+  // inputs. We copy deserialized data into pointer data, run mutations
+  // and copy back the mutated data to args and t
   memcpy(data + kArgsSize, &t, kCoreResponseSize);
   LLVMFuzzerMutate(data, kTotalResponseSize, kTotalResponseSize);
   memcpy(args, data, kArgsSize);
   memcpy(&t, data + kArgsSize, kCoreResponseSize);
-  /* Convert boolean flags in parsed message to valid bytes to */
-  /* avoid errors from msan. Only needed for parsed license. */
+  // Convert boolean flags in parsed message to valid bytes to
+  // avoid errors from msan. Only needed for parsed license.
   ConvertDataToValidBools(&t);
-  /* Serialize the data after mutation. */
+  // Serialize the data after mutation.
   std::string oemcrypto_core_message;
   if (!kdo_serialize_fun(args, t, &oemcrypto_core_message)) {
     return 0;
   }
 
-  /* Copy mutated and serialized oemcrypto_core_message to data */
-  /* so that it acts as input to odk_kdo function. */
+  // Copy mutated and serialized oemcrypto_core_message to data
+  // so that it acts as input to odk_kdo function.
   memcpy(data + kArgsSize, oemcrypto_core_message.data(),
          oemcrypto_core_message.size());
   return kArgsSize + oemcrypto_core_message.size();
@@ -149,9 +148,9 @@ size_t FuzzerMutateResponse(uint8_t* data, size_t size, size_t max_size,
  */
 template <typename A, typename T, typename F, typename G>
 void odk_kdo(const F& odk_fun, const G& kdo_fun, const uint8_t* in,
-             const size_t size, const size_t args_size, uint8_t* out) {
+             const size_t size, const size_t args_size, uint8_t* out UNUSED) {
   T t = {};
-  /* Input byte array format: [function arguments][data to parse] */
+  // Input byte array format: [function arguments][data to parse]
   if (size < args_size) {
     return;
   }
@@ -187,8 +186,8 @@ static void kdo_odk(const F& kdo_fun, const G& odk_fun, const uint8_t* in,
   if (size <= clock_value_size) {
     return;
   }
-  /* Input byte array format: [Clock Values][data to parse]. */
-  /* Only Renewal Request expects clock values to be present. */
+  // Input byte array format: [Clock Values][data to parse].
+  // Only Renewal Request expects clock values to be present.
   std::string input(reinterpret_cast<const char*>(in) + clock_value_size,
                     size - clock_value_size);
   T t = {};
@@ -202,5 +201,5 @@ static void kdo_odk(const F& kdo_fun, const G& odk_fun, const uint8_t* in,
     return;
   }
 }
-} /* namespace oemcrypto_core_message */
-#endif /* WIDEVINE_ODK_TEST_FUZZING_ODK_FUZZ_HELPER_H_ */
+}  // namespace oemcrypto_core_message
+#endif  // WIDEVINE_ODK_TEST_FUZZING_ODK_FUZZ_HELPER_H_

oemcrypto/odk/test/fuzzing/odk_fuzz_structs.h

@@ -1,6 +1,6 @@
-/* Copyright 2020 Google LLC. All rights reserved. This file and proprietary */
-/* source code may only be used and distributed under the Widevine Master */
-/* License Agreement. */
+// Copyright 2020 Google LLC. All rights reserved. This file and proprietary
+// source code may only be used and distributed under the Widevine Master
+// License Agreement.
 #ifndef WIDEVINE_ODK_TEST_FUZZING_ODK_FUZZ_STRUCTS_H_
 #define WIDEVINE_ODK_TEST_FUZZING_ODK_FUZZ_STRUCTS_H_
 
@@ -25,4 +25,4 @@ struct ODK_ParseProvisioning_Args {
   size_t device_id_length;
   uint8_t device_id[64];
 };
-#endif /* WIDEVINE_ODK_TEST_FUZZING_ODK_FUZZ_STRUCTS_H_ */
+#endif  // WIDEVINE_ODK_TEST_FUZZING_ODK_FUZZ_STRUCTS_H_

oemcrypto/odk/test/fuzzing/odk_license_response_fuzz_with_mutator.cpp

@@ -12,7 +12,8 @@ namespace oemcrypto_core_message {
 // The custom mutator: Ensure that each input can be deserialized properly
 // by ODK function after mutation.
 extern "C" size_t LLVMFuzzerCustomMutator(uint8_t* data, size_t size,
-                                          size_t max_size, unsigned int seed) {
+                                          size_t max_size,
+                                          unsigned int seed UNUSED) {
   const size_t kLicenseResponseArgsSize = sizeof(ODK_ParseLicense_Args);
   if (size < kLicenseResponseArgsSize) {
     return 0;