Update Unit tests and reference code

This patch adds a suite of tests for OEMCrypto that verifying buffer overflow and off-by-one errors. The reference code has also been updated to pass these tests. The ODK library and the OEMCrypto API have not changed since the release of version 16.4.
2021-01-25 19:51:10 -08:00
parent 7e3c282944
commit bb16924e69
45 changed files with 3119 additions and 489 deletions
--- a/util/include/advance_iv_ctr.h
+++ b/util/include/advance_iv_ctr.h
@@ -1,6 +1,6 @@
 // Copyright 2019 Google LLC. All Rights Reserved. This file and proprietary
-// source code may only be used and distributed under the Widevine Master
-// License Agreement.
+// source code may only be used and distributed under the Widevine License
+// Agreement.

 #ifndef WVCDM_UTIL_ADVANCE_IV_CTR_H_
 #define WVCDM_UTIL_ADVANCE_IV_CTR_H_
--- a/util/include/arraysize.h
+++ b/util/include/arraysize.h
@@ -1,6 +1,6 @@
 // Copyright 2019 Google LLC. All Rights Reserved. This file and proprietary
-// source code may only be used and distributed under the Widevine Master
-// License Agreement.
+// source code may only be used and distributed under the Widevine License
+// Agreement.

 #ifndef WVCDM_UTIL_ARRAYSIZE_H_
 #define WVCDM_UTIL_ARRAYSIZE_H_
--- a/util/include/cdm_random.h
+++ b/util/include/cdm_random.h
@@ -1,6 +1,6 @@
 // Copyright 2019 Google LLC. All Rights Reserved. This file and proprietary
-// source code may only be used and distributed under the Widevine Master
-// License Agreement.
+// source code may only be used and distributed under the Widevine License
+// Agreement.
 #ifndef WVCDM_CORE_CDM_RANDOM_H_
 #define WVCDM_CORE_CDM_RANDOM_H_

--- a/util/include/clock.h
+++ b/util/include/clock.h
@@ -1,6 +1,6 @@
 // Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary
-// source code may only be used and distributed under the Widevine Master
-// License Agreement.
+// source code may only be used and distributed under the Widevine License
+// Agreement.
 //
 // Clock - Platform independent interface for a time library
 //
--- a/util/include/disallow_copy_and_assign.h
+++ b/util/include/disallow_copy_and_assign.h
@@ -1,6 +1,6 @@
 // Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary
-// source code may only be used and distributed under the Widevine Master
-// License Agreement.
+// source code may only be used and distributed under the Widevine License
+// Agreement.

 #ifndef WVCDM_UTIL_DISALLOW_COPY_AND_ASSIGN_H_
 #define WVCDM_UTIL_DISALLOW_COPY_AND_ASSIGN_H_
--- a/util/include/file_store.h
+++ b/util/include/file_store.h
@@ -1,6 +1,6 @@
 // Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary
-// source code may only be used and distributed under the Widevine Master
-// License Agreement.
+// source code may only be used and distributed under the Widevine License
+// Agreement.
 //
 // File - Platform independent interface for a File class
 //
--- a/util/include/log.h
+++ b/util/include/log.h
@@ -1,6 +1,6 @@
 // Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary
-// source code may only be used and distributed under the Widevine Master
-// License Agreement.
+// source code may only be used and distributed under the Widevine License
+// Agreement.
 //
 // Log - Platform independent interface for a Logging class
 //
@@ -33,8 +33,18 @@ extern LogPriority g_cutoff;
 // unit tests.
 CORE_UTIL_EXPORT void InitLogging();

+// Only enable format specifier warnings on LP64 systems.  There is
+// no easy portable method to handle format specifiers for int64_t.
+#if (defined(__GNUC__) || defined(__clang__)) && defined(__LP64__)
+[[gnu::format(printf, 5, 6)]] CORE_UTIL_EXPORT void Log(const char* file,
+                                                        const char* function,
+                                                        int line,
+                                                        LogPriority level,
+                                                        const char* fmt, ...);
+#else
 CORE_UTIL_EXPORT void Log(const char* file, const char* function, int line,
                          LogPriority level, const char* fmt, ...);
+#endif

 // Log APIs
 #ifndef LOGE
--- a/util/include/platform.h
+++ b/util/include/platform.h
@@ -1,6 +1,6 @@
 // Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary
-// source code may only be used and distributed under the Widevine Master
-// License Agreement.
+// source code may only be used and distributed under the Widevine License
+// Agreement.
 //
 // Platform - Abstracts some utilities between platforms.
 //
--- a/util/include/rw_lock.h
+++ b/util/include/rw_lock.h
@@ -1,6 +1,6 @@
 // Copyright 2019 Google LLC. All Rights Reserved. This file and proprietary
-// source code may only be used and distributed under the Widevine Master
-// License Agreement.
+// source code may only be used and distributed under the Widevine License
+// Agreement.

 #ifndef WVCDM_UTIL_RW_LOCK_H_
 #define WVCDM_UTIL_RW_LOCK_H_
--- a/util/include/string_conversions.h
+++ b/util/include/string_conversions.h
@@ -1,6 +1,6 @@
 // Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary
-// source code may only be used and distributed under the Widevine Master
-// License Agreement.
+// source code may only be used and distributed under the Widevine License
+// Agreement.

 #ifndef WVCDM_UTIL_STRING_CONVERSIONS_H_
 #define WVCDM_UTIL_STRING_CONVERSIONS_H_
--- a/util/include/util_common.h
+++ b/util/include/util_common.h
@@ -1,6 +1,6 @@
 // Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary
-// source code may only be used and distributed under the Widevine Master
-// License Agreement.
+// source code may only be used and distributed under the Widevine License
+// Agreement.

 #ifndef WVCDM_UTIL_UTIL_COMMON_H_
 #define WVCDM_UTIL_UTIL_COMMON_H_