Update to ODK v19.2

2024-07-08 22:56:53 +00:00
parent 74178f968f
commit 7b5fec3a79
62 changed files with 821 additions and 121 deletions
--- a/oemcrypto/odk/test/fuzzing/Android.bp
+++ b/oemcrypto/odk/test/fuzzing/Android.bp
@@ -1,4 +1,4 @@
-// Copyright 2020 Google LLC. All rights reserved. This file and proprietary
+// Copyright 2020 Google LLC. This file and proprietary
 // source code may only be used and distributed under the Widevine
 // License Agreement.

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

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

--- 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,4 +1,4 @@
-// Copyright 2020 Google LLC. All rights reserved. This file and proprietary
+// Copyright 2020 Google LLC. This file and proprietary
 // 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,4 +1,4 @@
-// Copyright 2020 Google LLC. All rights reserved. This file and proprietary
+// Copyright 2020 Google LLC. This file and proprietary
 // 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_
--- 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,4 +1,4 @@
-# Copyright 2020 Google LLC. All rights reserved. This file and proprietary
+# Copyright 2020 Google LLC. This file and proprietary
 # source code may only be used and distributed under the Widevine License
 # Agreement.

--- a/oemcrypto/odk/test/fuzzing/odk_fuzz.gyp
+++ b/oemcrypto/odk/test/fuzzing/odk_fuzz.gyp
@@ -1,4 +1,4 @@
-# Copyright 2019 Google LLC. All rights reserved. This file and proprietary
+# Copyright 2019 Google LLC. This file and proprietary
 # source code may only be used and distributed under the Widevine License
 # Agreement.

--- a/oemcrypto/odk/test/fuzzing/odk_fuzz_helper.cpp
+++ b/oemcrypto/odk/test/fuzzing/odk_fuzz_helper.cpp
@@ -1,4 +1,4 @@
-// Copyright 2020 Google LLC. All rights reserved. This file and proprietary
+// Copyright 2020 Google LLC. This file and proprietary
 // source code may only be used and distributed under the Widevine
 // License Agreement.
 #include "fuzzing/odk_fuzz_helper.h"
@@ -10,6 +10,7 @@
 #include "odk.h"
 #include "odk_attributes.h"
 #include "odk_structs.h"
+#include "odk_target.h"

 namespace oemcrypto_core_message {
 using features::CoreMessageFeatures;
@@ -148,7 +149,7 @@ bool kdo_serialize_LicenseResponse(const ODK_ParseLicense_Args* args,
  parsed_license.key_array_length = parsed_lic.key_array_length;
  std::vector<OEMCrypto_KeyObject> key_array;
  size_t i;
-  for (i = 0; i < parsed_lic.key_array_length; i++) {
+  for (i = 0; i < parsed_lic.key_array_length && i < ODK_MAX_NUM_KEYS; i++) {
    key_array.push_back(parsed_lic.key_array[i]);
  }
  parsed_license.key_array = key_array.data();
--- a/oemcrypto/odk/test/fuzzing/odk_fuzz_helper.h
+++ b/oemcrypto/odk/test/fuzzing/odk_fuzz_helper.h
@@ -1,4 +1,4 @@
-// Copyright 2020 Google LLC. All rights reserved. This file and proprietary
+// Copyright 2020 Google LLC. This file and proprietary
 // source code may only be used and distributed under the Widevine
 // License Agreement.
 #ifndef WIDEVINE_ODK_TEST_FUZZING_ODK_FUZZ_HELPER_H_
--- a/oemcrypto/odk/test/fuzzing/odk_fuzz_structs.h
+++ b/oemcrypto/odk/test/fuzzing/odk_fuzz_structs.h
@@ -1,4 +1,4 @@
-// Copyright 2020 Google LLC. All rights reserved. This file and proprietary
+// Copyright 2020 Google LLC. This file and proprietary
 // source code may only be used and distributed under the Widevine
 // License Agreement.
 #ifndef 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,4 +1,4 @@
-/* Copyright 2020 Google LLC. All rights reserved. This file and proprietary
+/* Copyright 2020 Google LLC. This file and proprietary
 * 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,4 +1,4 @@
-/* Copyright 2020 Google LLC. All rights reserved. This file and proprietary
+/* Copyright 2020 Google LLC. This file and proprietary
 * 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,4 +1,4 @@
-/* Copyright 2020 Google LLC. All rights reserved. This file and proprietary
+/* Copyright 2020 Google LLC. This file and proprietary
 * 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,4 +1,4 @@
-/* Copyright 2020 Google LLC. All rights reserved. This file and proprietary
+/* Copyright 2020 Google LLC. This file and proprietary
 * 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,4 +1,4 @@
-/* Copyright 2020 Google LLC. All rights reserved. This file and proprietary
+/* Copyright 2020 Google LLC. This file and proprietary
 * 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,4 +1,4 @@
-/* Copyright 2020 Google LLC. All rights reserved. This file and proprietary
+/* Copyright 2020 Google LLC. This file and proprietary
 * source code may only be used and distributed under the Widevine
 * License Agreement.
 */
--- a/oemcrypto/odk/test/fuzzing/odk_renewal_request_fuzz.cpp
+++ b/oemcrypto/odk/test/fuzzing/odk_renewal_request_fuzz.cpp
@@ -1,4 +1,4 @@
-/* Copyright 2020 Google LLC. All rights reserved. This file and proprietary
+/* Copyright 2020 Google LLC. This file and proprietary
 * 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,4 +1,4 @@
-/* Copyright 2020 Google LLC. All rights reserved. This file and proprietary
+/* Copyright 2020 Google LLC. This file and proprietary
 * 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,4 +1,4 @@
-/* Copyright 2020 Google LLC. All rights reserved. This file and proprietary
+/* Copyright 2020 Google LLC. This file and proprietary
 * source code may only be used and distributed under the Widevine
 * License Agreement.
 */