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.

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_

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_

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_
 

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
 //

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_

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
 //

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

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.
 //

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_

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_

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_

util/libcrypto_dependency.gypi

@@ -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.
+# source code may only be used and distributed under the Widevine License
+# Agreement.
 {
   'conditions': [
     [

util/libssl_dependency.gypi

@@ -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.
+# source code may only be used and distributed under the Widevine License
+# Agreement.
 {
   'conditions': [
     [

util/src/cdm_random.cpp

@@ -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.
 
 #include "cdm_random.h"
 

util/src/dllmain.cpp

@@ -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.
 //
 // dllmain - A dummy DllMain method for Windows DLLs.
 //

util/src/platform.cpp

@@ -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.
 
 #include "platform.h"
 

util/src/rw_lock.cpp

@@ -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.
 
 #include "rw_lock.h"
 

util/src/string_conversions.cpp

@@ -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.
 
 #include "string_conversions.h"
 
@@ -56,12 +56,12 @@ std::vector<uint8_t> a2b_hex(const std::string& byte) {
     return array;
   }
 
-  for (unsigned int i = 0; i < count / 2; ++i) {
+  for (size_t i = 0; i < count / 2; ++i) {
     unsigned char msb = 0;  // most significant 4 bits
     unsigned char lsb = 0;  // least significant 4 bits
     if (!DecodeHexChar(byte[i * 2], &msb) ||
         !DecodeHexChar(byte[i * 2 + 1], &lsb)) {
-      LOGE("Invalid hex value %c%c at index %d", byte[i * 2], byte[i * 2 + 1],
+      LOGE("Invalid hex value %c%c at index %zu", byte[i * 2], byte[i * 2 + 1],
            i);
       return array;
     }
@@ -254,6 +254,8 @@ std::vector<uint8_t> Base64SafeDecode(const std::string& b64_input) {
 std::string HexEncode(const uint8_t* in_buffer, unsigned int size) {
   static const char kHexChars[] = "0123456789ABCDEF";
   if (size == 0) return "";
+  constexpr unsigned int kMaxSafeSize = 2048;
+  if (size > kMaxSafeSize) size = kMaxSafeSize;
   // Each input byte creates two output hex characters.
   std::string out_buffer(size * 2, '\0');
 

util/test/base64_test.cpp

@@ -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.
 
 #include <utility>
 

util/test/cdm_random_unittest.cpp

@@ -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.
 
 #include <stdlib.h>
 

util/test/file_store_unittest.cpp

@@ -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.
 
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>

util/test/test_clock.cpp

@@ -1,4 +1,6 @@
-// Copyright 2019 Google Inc. All Rights Reserved.
+// Copyright 2019 Google LLC. All Rights Reserved. This file and proprietary
+// source code may only be used and distributed under the Widevine License
+// Agreement.
 //
 // Clock - A fake clock just for running tests.
 

util/test/test_sleep.cpp

@@ -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.
 
 #include "test_sleep.h"
 
@@ -23,7 +23,7 @@ namespace wvcdm {
 
 bool TestSleep::real_sleep_ = true;
 TestSleep::CallBack* TestSleep::callback_ = nullptr;
-int TestSleep::total_clock_rollback_ = 0;
+int TestSleep::total_clock_rollback_seconds_ = 0;
 
 void TestSleep::Sleep(unsigned int seconds) {
   int64_t milliseconds = 1000 * seconds;
@@ -33,11 +33,15 @@ void TestSleep::Sleep(unsigned int seconds) {
     // total since the start, and then compare to a running total of sleep
     // calls. We sleep for approximately x second, and then advance the clock by
     // the amount of time that has actually passed.
-    static auto start_real = std::chrono::system_clock().now();
-    static int64_t fake_clock = 0;
+    static const auto start_real = std::chrono::system_clock().now();
     sleep(seconds);
-    auto now_real = std::chrono::system_clock().now();
-    int64_t total_real = (now_real - start_real) / std::chrono::milliseconds(1);
+    const auto now_real = std::chrono::system_clock().now();
+    const int64_t rollback_adjustment = 1000 * total_clock_rollback_seconds_;
+    const int64_t total_real =
+        (now_real - start_real) / std::chrono::milliseconds(1) +
+        rollback_adjustment;
+
+    static int64_t fake_clock = 0;
     // We want to advance the fake clock by the difference between the real
     // clock, and the previous value on the fake clock.
     milliseconds = total_real - fake_clock;
@@ -90,7 +94,7 @@ bool TestSleep::RollbackSystemTime(int seconds) {
 
   // For both real and fake sleep we still update the callback and we still keep
   // track of the total amount of time slept.
-  total_clock_rollback_ += seconds;
+  total_clock_rollback_seconds_ += seconds;
   if (callback_ != nullptr) callback_->ElapseTime(-1000 * seconds);
   return true;
 }
@@ -98,7 +102,6 @@ bool TestSleep::RollbackSystemTime(int seconds) {
 bool TestSleep::CanChangeSystemTime() {
   // If we are using a fake clock, then we can move the clock backwards by
   // just going backwards.
-  // ElapseTime.
   if (!real_sleep_) {
     return true;
   }

util/test/test_sleep.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.
 //
 // TestSleep - Controls sleep and clock adjustment during tests.
 //
@@ -44,8 +44,8 @@ class TestSleep {
   // Roll the system clock forward to undo all previous calls to
   // RollBackSystemTime. Returns true on success.
   static bool ResetRollback() {
-    return total_clock_rollback_ == 0 ||
-           RollbackSystemTime(-total_clock_rollback_);
+    return total_clock_rollback_seconds_ == 0 ||
+           RollbackSystemTime(-total_clock_rollback_seconds_);
   }
 
   // Returns true if the system time can be rolled back. This is true on some
@@ -67,7 +67,7 @@ class TestSleep {
   static CallBack* callback_;
   // The sum of all calls to RollBackSystemTime. Kept so we can undo all changes
   // at the end of a test.
-  static int total_clock_rollback_;
+  static int total_clock_rollback_seconds_;
 };
 
 }  // namespace wvcdm