From 6161f812dc4349a2f6c044f52227b7e3226aaf70 Mon Sep 17 00:00:00 2001 From: Fred Gylys-Colwell Date: Tue, 8 Nov 2022 13:49:07 -0800 Subject: [PATCH] Fix cherry pick of unpacking enum Merge from Widevine repo of http://go/wvgerrit/158251 The cherry pick of http://go/wvgerrit/157958 was not complete. Bug: 251827716 Test: tested with http://go/ag/20420224 Change-Id: Icd4d2f23003ab621bf690ca3dcf1de2f0c5afc45 --- libwvdrmengine/oemcrypto/odk/src/odk_serialize.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libwvdrmengine/oemcrypto/odk/src/odk_serialize.c b/libwvdrmengine/oemcrypto/odk/src/odk_serialize.c index fd8d6a7e..537eefe2 100644 --- a/libwvdrmengine/oemcrypto/odk/src/odk_serialize.c +++ b/libwvdrmengine/oemcrypto/odk/src/odk_serialize.c @@ -270,7 +270,7 @@ static void Unpack_ODK_ParsedLicenseV16(ODK_Message* msg, Unpack_OEMCrypto_Substring(msg, &obj->enc_mac_keys); Unpack_OEMCrypto_Substring(msg, &obj->pst); Unpack_OEMCrypto_Substring(msg, &obj->srm_restriction_data); - obj->license_type = (OEMCrypto_LicenseType)Unpack_enum(msg); + Unpack_OEMCrypto_LicenseType(msg, &obj->license_type); Unpack_bool(msg, &obj->nonce_required); Unpack_ODK_TimerLimits(msg, &obj->timer_limits); Unpack_uint32_t(msg, &obj->key_array_length);