From 985eaacfb9c82adc34cf4c8828a7667769d66676 Mon Sep 17 00:00:00 2001
From: Matt Feddersen <mattfedd@google.com>
Date: Mon, 25 Mar 2024 11:56:10 -0700
Subject: [PATCH] Update ODK version to 19.1

[ Merge of http://go/wvgerrit/195352 ]

PiperOrigin-RevId: 618915151
Merged from https://widevine-internal-review.googlesource.com/195050

Change-Id: Ieff901a961c3f965497b62a655c3ddb536e112a0
---
 .../oemcrypto/odk/include/core_message_features.h          | 4 ++--
 libwvdrmengine/oemcrypto/odk/include/odk_structs.h         | 4 ++--
 libwvdrmengine/oemcrypto/odk/src/core_message_features.cpp | 2 +-
 libwvdrmengine/oemcrypto/odk/src/odk_timer.c               | 3 +++
 libwvdrmengine/oemcrypto/odk/test/odk_test.cpp             | 7 +++++--
 5 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/libwvdrmengine/oemcrypto/odk/include/core_message_features.h b/libwvdrmengine/oemcrypto/odk/include/core_message_features.h
index e4d6a0e3..b2dda6a9 100644
--- a/libwvdrmengine/oemcrypto/odk/include/core_message_features.h
+++ b/libwvdrmengine/oemcrypto/odk/include/core_message_features.h
@@ -26,9 +26,9 @@ struct CoreMessageFeatures {
 
   // This is the published version of the ODK Core Message library. The default
   // behavior is for the server to restrict messages to at most this version
-  // number. The default is 19.0.
+  // number. The default is 19.1.
   uint32_t maximum_major_version = 19;
-  uint32_t maximum_minor_version = 0;
+  uint32_t maximum_minor_version = 1;
 
   bool operator==(const CoreMessageFeatures &other) const;
   bool operator!=(const CoreMessageFeatures &other) const {
diff --git a/libwvdrmengine/oemcrypto/odk/include/odk_structs.h b/libwvdrmengine/oemcrypto/odk/include/odk_structs.h
index 5f93e356..3335f95d 100644
--- a/libwvdrmengine/oemcrypto/odk/include/odk_structs.h
+++ b/libwvdrmengine/oemcrypto/odk/include/odk_structs.h
@@ -16,10 +16,10 @@ extern "C" {
 
 /* The version of this library. */
 #define ODK_MAJOR_VERSION 19
-#define ODK_MINOR_VERSION 0
+#define ODK_MINOR_VERSION 1
 
 /* ODK Version string. Date changed automatically on each release. */
-#define ODK_RELEASE_DATE "ODK v19.0 2024-03-22"
+#define ODK_RELEASE_DATE "ODK v19.1 2024-03-25"
 
 /* The lowest version number for an ODK message. */
 #define ODK_FIRST_VERSION 16
diff --git a/libwvdrmengine/oemcrypto/odk/src/core_message_features.cpp b/libwvdrmengine/oemcrypto/odk/src/core_message_features.cpp
index 65a6d2f3..4143d140 100644
--- a/libwvdrmengine/oemcrypto/odk/src/core_message_features.cpp
+++ b/libwvdrmengine/oemcrypto/odk/src/core_message_features.cpp
@@ -33,7 +33,7 @@ CoreMessageFeatures CoreMessageFeatures::DefaultFeatures(
       features.maximum_minor_version = 4;  // 18.4
       break;
     case 19:
-      features.maximum_minor_version = 0;  // 19.0
+      features.maximum_minor_version = 1;  // 19.1
       break;
     default:
       features.maximum_minor_version = 0;
diff --git a/libwvdrmengine/oemcrypto/odk/src/odk_timer.c b/libwvdrmengine/oemcrypto/odk/src/odk_timer.c
index 57e4f431..c76fc5ab 100644
--- a/libwvdrmengine/oemcrypto/odk/src/odk_timer.c
+++ b/libwvdrmengine/oemcrypto/odk/src/odk_timer.c
@@ -276,6 +276,9 @@ OEMCryptoResult ODK_InitializeSessionValues(ODK_TimerLimits* timer_limits,
     case 18:
       nonce_values->api_minor_version = 4;
       break;
+    case 19:
+      nonce_values->api_minor_version = 1;
+      break;
     default:
       nonce_values->api_minor_version = 0;
       break;
diff --git a/libwvdrmengine/oemcrypto/odk/test/odk_test.cpp b/libwvdrmengine/oemcrypto/odk/test/odk_test.cpp
index 41996d9f..420b25fd 100644
--- a/libwvdrmengine/oemcrypto/odk/test/odk_test.cpp
+++ b/libwvdrmengine/oemcrypto/odk/test/odk_test.cpp
@@ -1275,7 +1275,7 @@ std::vector<VersionParameters> TestCases() {
       {16, ODK_MAJOR_VERSION, ODK_MINOR_VERSION, 16, 5},
       {17, ODK_MAJOR_VERSION, ODK_MINOR_VERSION, 17, 2},
       {18, ODK_MAJOR_VERSION, ODK_MINOR_VERSION, 18, 4},
-      {19, ODK_MAJOR_VERSION, ODK_MINOR_VERSION, 19, 0},
+      {19, ODK_MAJOR_VERSION, ODK_MINOR_VERSION, 19, 1},
       // Here are some known good versions. Make extra sure they work.
       {ODK_MAJOR_VERSION, 16, 3, 16, 3},
       {ODK_MAJOR_VERSION, 16, 4, 16, 4},
@@ -1287,13 +1287,16 @@ std::vector<VersionParameters> TestCases() {
       {ODK_MAJOR_VERSION, 18, 3, 18, 3},
       {ODK_MAJOR_VERSION, 18, 4, 18, 4},
       {ODK_MAJOR_VERSION, 19, 0, 19, 0},
+      {ODK_MAJOR_VERSION, 19, 1, 19, 1},
       {0, 16, 3, 16, 3},
       {0, 16, 4, 16, 4},
       {0, 16, 5, 16, 5},
       {0, 17, 1, 17, 1},
       {0, 17, 2, 17, 2},
-      {0, 18, 3, 18, 3},  // Change to 19 when the default version is updated.
+      {0, 18, 3, 18, 3},
       {0, 18, 4, 18, 4},
+      {0, 19, 0, 19, 0},
+      {0, 19, 1, 19, 1},
   };
   return test_cases;
 }