From 6c953ab65164ba3e03734027b97b6480a9268e08 Mon Sep 17 00:00:00 2001 From: Vicky Min Date: Thu, 4 May 2023 20:10:50 -0700 Subject: [PATCH] Fix license response default values error in CreateCoreLicenseResponse PiperOrigin-RevId: 529588784 Merged from https://widevine-internal-review.googlesource.com/174260 # Conflicts: # oemcrypto/odk/include/odk_structs.h Change-Id: I96f348bfc9b5be7113ddb2af18a38c36d337697c --- libwvdrmengine/oemcrypto/odk/include/odk_structs.h | 2 +- libwvdrmengine/oemcrypto/odk/src/core_message_serialize.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libwvdrmengine/oemcrypto/odk/include/odk_structs.h b/libwvdrmengine/oemcrypto/odk/include/odk_structs.h index f2cfc126..6e663b51 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 2 /* ODK Version string. Date changed automatically on each release. */ -#define ODK_RELEASE_DATE "ODK v18.2 2023-04-18" +#define ODK_RELEASE_DATE "ODK v18.2 2023-05-05" /* The lowest version number for an ODK message. */ #define ODK_FIRST_VERSION 16 diff --git a/libwvdrmengine/oemcrypto/odk/src/core_message_serialize.cpp b/libwvdrmengine/oemcrypto/odk/src/core_message_serialize.cpp index 035223df..79a9398d 100644 --- a/libwvdrmengine/oemcrypto/odk/src/core_message_serialize.cpp +++ b/libwvdrmengine/oemcrypto/odk/src/core_message_serialize.cpp @@ -121,7 +121,7 @@ bool CreateCoreLicenseResponse(const CoreMessageFeatures& features, const std::string& core_request_sha256, std::string* oemcrypto_core_message) { ODK_LicenseResponse license_response{ - {}, const_cast(&parsed_lic)}; + {}, const_cast(&parsed_lic), {}}; if (!CreateResponseHeader(features, ODK_License_Response_Type, &license_response.core_message, core_request)) { return false;