Update ODK to v17.1

2022-12-13 11:36:17 -08:00
parent c1401c6a1c
commit 2bfd670424
59 changed files with 1557 additions and 441 deletions
--- a/oemcrypto/odk/test/fuzzing/Android.bp
+++ b/oemcrypto/odk/test/fuzzing/Android.bp
@@ -1,7 +1,19 @@
 // Copyright 2020 Google LLC. All rights reserved. This file and proprietary
-// source code may only be used and distributed under the Widevine Master
+// source code may only be used and distributed under the Widevine
 // License Agreement.

+// *** THIS PACKAGE HAS SPECIAL LICENSING CONDITIONS.  PLEASE
+//     CONSULT THE OWNERS AND opensource-licensing@google.com BEFORE
+//     DEPENDING ON IT IN YOUR PROJECT. ***
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "vendor_widevine_license"
+    // to get the below license kinds:
+    //   legacy_by_exception_only (by exception only)
+    default_applicable_licenses: ["vendor_widevine_license"],
+}
+
 cc_defaults {
    name: "odk_fuzz_library_defaults",
    srcs: [
@@ -165,4 +177,4 @@ cc_fuzz {
    ],
    defaults: ["odk_fuzz_library_defaults"],
    proprietary: true,
-}
+}
--- a/oemcrypto/odk/test/fuzzing/corpus_generator/Android.bp
+++ b/oemcrypto/odk/test/fuzzing/corpus_generator/Android.bp
@@ -1,5 +1,5 @@
 // Copyright 2020 Google LLC. All rights reserved. This file and proprietary
-// source code may only be used and distributed under the Widevine Master
+// source code may only be used and distributed under the Widevine
 // License Agreement.

 // ----------------------------------------------------------------
@@ -9,6 +9,18 @@
 // ----------------------------------------------------------------
 // Builds libwv_odk.so, The ODK shared Library (libwv_odk) is used
 // by the OEMCrypto unit tests to generate corpus for ODK fuzz scrips.
+// *** THIS PACKAGE HAS SPECIAL LICENSING CONDITIONS.  PLEASE
+//     CONSULT THE OWNERS AND opensource-licensing@google.com BEFORE
+//     DEPENDING ON IT IN YOUR PROJECT. ***
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "vendor_widevine_license"
+    // to get the below license kinds:
+    //   legacy_by_exception_only (by exception only)
+    default_applicable_licenses: ["vendor_widevine_license"],
+}
+
 cc_library_shared {
    name: "libwv_odk_corpus_generator",
    include_dirs: [
--- a/oemcrypto/odk/test/fuzzing/corpus_generator/odk_corpus_generator.c
+++ b/oemcrypto/odk/test/fuzzing/corpus_generator/odk_corpus_generator.c
@@ -1,5 +1,5 @@
 // Copyright 2020 Google LLC. All rights reserved. This file and proprietary
-// source code may only be used and distributed under the Widevine Master
+// source code may only be used and distributed under the Widevine
 // License Agreement.

 // We must define this macro to get RTLD_NEXT definition from <dlfcn.h>
--- a/oemcrypto/odk/test/fuzzing/corpus_generator/odk_corpus_generator_helper.c
+++ b/oemcrypto/odk/test/fuzzing/corpus_generator/odk_corpus_generator_helper.c
@@ -1,5 +1,5 @@
 // Copyright 2020 Google LLC. All rights reserved. This file and proprietary
-// source code may only be used and distributed under the Widevine Master
+// source code may only be used and distributed under the Widevine
 // License Agreement.
 #include "fuzzing/corpus_generator/odk_corpus_generator_helper.h"

--- a/oemcrypto/odk/test/fuzzing/corpus_generator/odk_corpus_generator_helper.h
+++ b/oemcrypto/odk/test/fuzzing/corpus_generator/odk_corpus_generator_helper.h
@@ -1,5 +1,5 @@
 // Copyright 2020 Google LLC. All rights reserved. This file and proprietary
-// source code may only be used and distributed under the Widevine Master
+// source code may only be used and distributed under the Widevine
 // 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_
--- a/oemcrypto/odk/test/fuzzing/corpus_generator/odk_fuzz_corpus_generator.gyp
+++ b/oemcrypto/odk/test/fuzzing/corpus_generator/odk_fuzz_corpus_generator.gyp
@@ -1,5 +1,5 @@
 # Copyright 2020 Google LLC. All rights reserved. This file and proprietary
-# source code may only be used and distributed under the Widevine Master License
+# source code may only be used and distributed under the Widevine License
 # Agreement.

 # Reference Link explaining flags for LD_PRELOAD: https://catonmat.net/simple-ld-preload-tutorial-part-two
--- a/oemcrypto/odk/test/fuzzing/odk_fuzz.gyp
+++ b/oemcrypto/odk/test/fuzzing/odk_fuzz.gyp
@@ -1,5 +1,5 @@
 # Copyright 2019 Google LLC. All rights reserved. This file and proprietary
-# source code may only be used and distributed under the Widevine Master License
+# source code may only be used and distributed under the Widevine License
 # Agreement.

 #TODO(b/151858867): Fix File paths
@@ -18,6 +18,10 @@
          '../src',
          '../kdo/include',
        ],
+        'cflags': [
+          # TODO(b/172518513): Remove this
+          '-Wno-error=cast-qual',
+        ],
        'cflags_cc': [
          '-std=c++11',
          '-g3',
--- a/oemcrypto/odk/test/fuzzing/odk_fuzz_helper.cpp
+++ b/oemcrypto/odk/test/fuzzing/odk_fuzz_helper.cpp
@@ -1,11 +1,14 @@
 // Copyright 2020 Google LLC. All rights reserved. This file and proprietary
-// source code may only be used and distributed under the Widevine Master
+// source code may only be used and distributed under the Widevine
 // License Agreement.
 #include "fuzzing/odk_fuzz_helper.h"

+#include <string>
+
 #include "odk.h"

 namespace oemcrypto_core_message {
+using features::CoreMessageFeatures;

 bool convert_byte_to_valid_boolean(const bool* in) {
  const char* buf = reinterpret_cast<const char*>(in);
@@ -67,8 +70,8 @@ OEMCryptoResult odk_deserialize_LicenseResponse(const uint8_t* message,
  return ODK_ParseLicense(message, SIZE_MAX, core_message_length,
                          static_cast<bool>(a->initial_license_load),
                          static_cast<bool>(a->usage_entry_present),
-                          a->request_hash, &a->timer_limits, &a->clock_values,
-                          nonce_values, parsed_lic);
+                          &a->timer_limits, &a->clock_values, nonce_values,
+                          parsed_lic);
 }

 OEMCryptoResult odk_deserialize_RenewalResponse(
@@ -122,7 +125,8 @@ bool kdo_serialize_LicenseResponse(const ODK_ParseLicense_Args* args,
  std::string core_request_sha_256(
      reinterpret_cast<const char*>(args->request_hash), ODK_SHA256_HASH_SIZE);
  return serialize::CreateCoreLicenseResponse(
-      parsed_lic, core_request, core_request_sha_256, oemcrypto_core_message);
+      CoreMessageFeatures::kDefaultFeatures, parsed_lic, core_request,
+      core_request_sha_256, oemcrypto_core_message);
 }

 bool kdo_serialize_RenewalResponse(
@@ -134,7 +138,8 @@ bool kdo_serialize_RenewalResponse(
      nonce_values.api_minor_version, nonce_values.api_major_version,
      nonce_values.nonce, nonce_values.session_id, renewal_msg.playback_time};
  return serialize::CreateCoreRenewalResponse(
-      core_request, args->timer_limits.initial_renewal_duration_seconds,
+      CoreMessageFeatures::kDefaultFeatures, core_request,
+      args->timer_limits.initial_renewal_duration_seconds,
      oemcrypto_core_message);
 }

@@ -151,7 +156,8 @@ bool kdo_serialize_ProvisioningResponse(
      nonce_values.nonce, nonce_values.session_id,
      std::string(reinterpret_cast<const char*>(args->device_id),
                  args->device_id_length)};
-  return serialize::CreateCoreProvisioningResponse(parsed_prov, core_request,
-                                                   oemcrypto_core_message);
+  return serialize::CreateCoreProvisioningResponse(
+      CoreMessageFeatures::kDefaultFeatures, parsed_prov, core_request,
+      oemcrypto_core_message);
 }
 }  // namespace oemcrypto_core_message
--- a/oemcrypto/odk/test/fuzzing/odk_fuzz_helper.h
+++ b/oemcrypto/odk/test/fuzzing/odk_fuzz_helper.h
@@ -1,5 +1,5 @@
 // Copyright 2020 Google LLC. All rights reserved. This file and proprietary
-// source code may only be used and distributed under the Widevine Master
+// source code may only be used and distributed under the Widevine
 // License Agreement.
 #ifndef WIDEVINE_ODK_TEST_FUZZING_ODK_FUZZ_HELPER_H_
 #define WIDEVINE_ODK_TEST_FUZZING_ODK_FUZZ_HELPER_H_
@@ -7,6 +7,7 @@
 #include <memory>
 #include <string>

+#include "core_message_features.h"
 #include "core_message_serialize.h"
 #include "fuzzing/odk_fuzz_structs.h"
 #include "odk_attributes.h"
--- a/oemcrypto/odk/test/fuzzing/odk_fuzz_structs.h
+++ b/oemcrypto/odk/test/fuzzing/odk_fuzz_structs.h
@@ -1,5 +1,5 @@
 // Copyright 2020 Google LLC. All rights reserved. This file and proprietary
-// source code may only be used and distributed under the Widevine Master
+// source code may only be used and distributed under the Widevine
 // License Agreement.
 #ifndef WIDEVINE_ODK_TEST_FUZZING_ODK_FUZZ_STRUCTS_H_
 #define WIDEVINE_ODK_TEST_FUZZING_ODK_FUZZ_STRUCTS_H_
--- a/oemcrypto/odk/test/fuzzing/odk_license_request_fuzz.cpp
+++ b/oemcrypto/odk/test/fuzzing/odk_license_request_fuzz.cpp
@@ -1,5 +1,5 @@
 /* Copyright 2020 Google LLC. All rights reserved. This file and proprietary
- * source code may only be used and distributed under the Widevine Master
+ * source code may only be used and distributed under the Widevine
 * License Agreement.
 */

--- a/oemcrypto/odk/test/fuzzing/odk_license_response_fuzz.cpp
+++ b/oemcrypto/odk/test/fuzzing/odk_license_response_fuzz.cpp
@@ -1,5 +1,5 @@
 /* Copyright 2020 Google LLC. All rights reserved. This file and proprietary
- * source code may only be used and distributed under the Widevine Master
+ * source code may only be used and distributed under the Widevine
 * License Agreement.
 */

--- a/oemcrypto/odk/test/fuzzing/odk_license_response_fuzz_with_mutator.cpp
+++ b/oemcrypto/odk/test/fuzzing/odk_license_response_fuzz_with_mutator.cpp
@@ -1,5 +1,5 @@
 /* Copyright 2020 Google LLC. All rights reserved. This file and proprietary
- * source code may only be used and distributed under the Widevine Master
+ * source code may only be used and distributed under the Widevine
 * License Agreement.
 */

--- a/oemcrypto/odk/test/fuzzing/odk_provisioning_request_fuzz.cpp
+++ b/oemcrypto/odk/test/fuzzing/odk_provisioning_request_fuzz.cpp
@@ -1,5 +1,5 @@
 /* Copyright 2020 Google LLC. All rights reserved. This file and proprietary
- * source code may only be used and distributed under the Widevine Master
+ * source code may only be used and distributed under the Widevine
 * License Agreement.
 */

--- a/oemcrypto/odk/test/fuzzing/odk_provisioning_response_fuzz.cpp
+++ b/oemcrypto/odk/test/fuzzing/odk_provisioning_response_fuzz.cpp
@@ -1,5 +1,5 @@
 /* Copyright 2020 Google LLC. All rights reserved. This file and proprietary
- * source code may only be used and distributed under the Widevine Master
+ * source code may only be used and distributed under the Widevine
 * License Agreement.
 */

--- a/oemcrypto/odk/test/fuzzing/odk_provisioning_response_fuzz_with_mutator.cpp
+++ b/oemcrypto/odk/test/fuzzing/odk_provisioning_response_fuzz_with_mutator.cpp
@@ -1,18 +1,20 @@
 /* Copyright 2020 Google LLC. All rights reserved. This file and proprietary
- * source code may only be used and distributed under the Widevine Master
+ * source code may only be used and distributed under the Widevine
 * License Agreement.
 */

 #include <vector>

 #include "fuzzing/odk_fuzz_helper.h"
+#include "odk_attributes.h"

 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 kProvisioningResponseArgsSize =
      sizeof(ODK_ParseProvisioning_Args);
  if (size < kProvisioningResponseArgsSize) {
--- a/oemcrypto/odk/test/fuzzing/odk_renewal_request_fuzz.cpp
+++ b/oemcrypto/odk/test/fuzzing/odk_renewal_request_fuzz.cpp
@@ -1,5 +1,5 @@
 /* Copyright 2020 Google LLC. All rights reserved. This file and proprietary
- * source code may only be used and distributed under the Widevine Master
+ * source code may only be used and distributed under the Widevine
 * License Agreement.
 */

--- a/oemcrypto/odk/test/fuzzing/odk_renewal_response_fuzz.cpp
+++ b/oemcrypto/odk/test/fuzzing/odk_renewal_response_fuzz.cpp
@@ -1,5 +1,5 @@
 /* Copyright 2020 Google LLC. All rights reserved. This file and proprietary
- * source code may only be used and distributed under the Widevine Master
+ * source code may only be used and distributed under the Widevine
 * License Agreement.
 */

--- a/oemcrypto/odk/test/fuzzing/odk_renewal_response_fuzz_with_mutator.cpp
+++ b/oemcrypto/odk/test/fuzzing/odk_renewal_response_fuzz_with_mutator.cpp
@@ -1,18 +1,20 @@
 /* Copyright 2020 Google LLC. All rights reserved. This file and proprietary
- * source code may only be used and distributed under the Widevine Master
+ * source code may only be used and distributed under the Widevine
 * License Agreement.
 */

 #include <vector>

 #include "fuzzing/odk_fuzz_helper.h"
+#include "odk_attributes.h"

 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 kRenewalResponseArgsSize = sizeof(ODK_ParseRenewal_Args);
  if (size < kRenewalResponseArgsSize) {
    return 0;