From 882c80783bd114a6a6d74f3e5cf156db641ec81f Mon Sep 17 00:00:00 2001 From: Vicky Min Date: Fri, 23 Feb 2024 11:06:50 -0800 Subject: [PATCH] Update ODK version to 18.4 [ Merge of http://go/wvgerrit/192493 ] Bug: 311951236 Test: WVTS Change-Id: Ia59bfacf91d812f36f7a198632f7fa3462d0b8df --- .../oemcrypto/odk/include/core_message_features.h | 6 +++--- libwvdrmengine/oemcrypto/odk/include/odk_structs.h | 2 +- libwvdrmengine/oemcrypto/odk/test/odk_test.cpp | 3 ++- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/libwvdrmengine/oemcrypto/odk/include/core_message_features.h b/libwvdrmengine/oemcrypto/odk/include/core_message_features.h index ea689076..e4d6a0e3 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 18.4. - uint32_t maximum_major_version = 18; - uint32_t maximum_minor_version = 4; + // number. The default is 19.0. + uint32_t maximum_major_version = 19; + uint32_t maximum_minor_version = 0; 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 99cc9f09..c0989277 100644 --- a/libwvdrmengine/oemcrypto/odk/include/odk_structs.h +++ b/libwvdrmengine/oemcrypto/odk/include/odk_structs.h @@ -19,7 +19,7 @@ extern "C" { #define ODK_MINOR_VERSION 0 /* ODK Version string. Date changed automatically on each release. */ -#define ODK_RELEASE_DATE "ODK v19.0 2024-02-10" +#define ODK_RELEASE_DATE "ODK v19.0 2024-02-23" /* The lowest version number for an ODK message. */ #define ODK_FIRST_VERSION 16 diff --git a/libwvdrmengine/oemcrypto/odk/test/odk_test.cpp b/libwvdrmengine/oemcrypto/odk/test/odk_test.cpp index 955741ca..41996d9f 100644 --- a/libwvdrmengine/oemcrypto/odk/test/odk_test.cpp +++ b/libwvdrmengine/oemcrypto/odk/test/odk_test.cpp @@ -1292,7 +1292,8 @@ std::vector TestCases() { {0, 16, 5, 16, 5}, {0, 17, 1, 17, 1}, {0, 17, 2, 17, 2}, - {0, 18, 4, 18, 4}, // Change to 19 when the default version is updated. + {0, 18, 3, 18, 3}, // Change to 19 when the default version is updated. + {0, 18, 4, 18, 4}, }; return test_cases; }