Pick widevine oemcrypto-v18 change

No-Typo-Check: From a third party header file Bug: 260918793 Test: unit tests Test: atp v2/widevine-eng/drm_compliance Change-Id: I36effd6a10a99bdb2399ab1f4a0fad026d607c70
2022-12-16 03:21:08 +00:00
parent 4586522c07
commit 11255b7426
105 changed files with 324641 additions and 299787 deletions
--- a/libwvdrmengine/oemcrypto/odk/src/odk_serialize.c
+++ b/libwvdrmengine/oemcrypto/odk/src/odk_serialize.c
@@ -6,6 +6,8 @@
 * This code is auto-generated, do not edit
 */

+#include "odk_serialize.h"
+
 #include "odk_structs_priv.h"
 #include "serialization_base.h"

@@ -78,6 +80,48 @@ static void Pack_ODK_ParsedLicense(ODK_Message* msg,
    Pack_uint8_t(msg, &obj->dtcp2_required.cmi_descriptor_2.data[1]);
    Pack_uint8_t(msg, &obj->dtcp2_required.cmi_descriptor_2.data[2]);
  }
+  Pack_enum(msg, obj->renewal_delay_base);
+  Pack_uint32_t(msg, &obj->key_array_length);
+  size_t i;
+  for (i = 0; i < (size_t)obj->key_array_length; i++) {
+    Pack_OEMCrypto_KeyObject(msg, &obj->key_array[i]);
+  }
+}
+
+static void Pack_ODK_ParsedLicenseV17(ODK_Message* msg,
+                                      ODK_ParsedLicenseV17 const* obj) {
+  /* hand-coded */
+  if (obj->key_array_length > ODK_MAX_NUM_KEYS) {
+    ODK_Message_SetStatus(msg, MESSAGE_STATUS_OVERFLOW_ERROR);
+    return;
+  }
+  Pack_OEMCrypto_Substring(msg, &obj->enc_mac_keys_iv);
+  Pack_OEMCrypto_Substring(msg, &obj->enc_mac_keys);
+  Pack_OEMCrypto_Substring(msg, &obj->pst);
+  Pack_OEMCrypto_Substring(msg, &obj->srm_restriction_data);
+  Pack_enum(msg, obj->license_type);
+  Pack_bool(msg, &obj->nonce_required);
+  Pack_ODK_TimerLimits(msg, &obj->timer_limits);
+  Pack_uint32_t(msg, &obj->watermarking);
+  Pack_uint8_t(msg, &obj->dtcp2_required.dtcp2_required);
+  if (obj->dtcp2_required.dtcp2_required) {
+    Pack_uint8_t(msg, &obj->dtcp2_required.cmi_descriptor_0.id);
+    Pack_uint8_t(msg, &obj->dtcp2_required.cmi_descriptor_0.extension);
+    Pack_uint16_t(msg, &obj->dtcp2_required.cmi_descriptor_0.length);
+    Pack_uint8_t(msg, &obj->dtcp2_required.cmi_descriptor_0.data);
+    Pack_uint8_t(msg, &obj->dtcp2_required.cmi_descriptor_1.id);
+    Pack_uint8_t(msg, &obj->dtcp2_required.cmi_descriptor_1.extension);
+    Pack_uint16_t(msg, &obj->dtcp2_required.cmi_descriptor_1.length);
+    Pack_uint8_t(msg, &obj->dtcp2_required.cmi_descriptor_1.data[0]);
+    Pack_uint8_t(msg, &obj->dtcp2_required.cmi_descriptor_1.data[1]);
+    Pack_uint8_t(msg, &obj->dtcp2_required.cmi_descriptor_1.data[2]);
+    Pack_uint8_t(msg, &obj->dtcp2_required.cmi_descriptor_2.id);
+    Pack_uint8_t(msg, &obj->dtcp2_required.cmi_descriptor_2.extension);
+    Pack_uint16_t(msg, &obj->dtcp2_required.cmi_descriptor_2.length);
+    Pack_uint8_t(msg, &obj->dtcp2_required.cmi_descriptor_2.data[0]);
+    Pack_uint8_t(msg, &obj->dtcp2_required.cmi_descriptor_2.data[1]);
+    Pack_uint8_t(msg, &obj->dtcp2_required.cmi_descriptor_2.data[2]);
+  }
  Pack_uint32_t(msg, &obj->key_array_length);
  size_t i;
  for (i = 0; i < (size_t)obj->key_array_length; i++) {
@@ -114,11 +158,31 @@ static void Pack_ODK_ParsedProvisioning(ODK_Message* msg,
  Pack_OEMCrypto_Substring(msg, &obj->encrypted_message_key);
 }

+static void Pack_ODK_MessageCounterInfo(ODK_Message* msg,
+                                        ODK_MessageCounterInfo const* obj) {
+  Pack_uint64_t(msg, &obj->master_generation_number);
+  Pack_uint32_t(msg, &obj->provisioning_count);
+  Pack_uint32_t(msg, &obj->license_count);
+  Pack_uint32_t(msg, &obj->decrypt_count);
+  Pack_uint16_t(msg, &obj->major_version);
+  Pack_uint16_t(msg, &obj->minor_version);
+  Pack_uint16_t(msg, &obj->patch_version);
+  PackArray(msg, &obj->soc_vendor[0], sizeof(obj->soc_vendor));
+  PackArray(msg, &obj->chipset_model[0], sizeof(obj->chipset_model));
+  PackArray(msg, &obj->extra[0], sizeof(obj->extra));
+}
+
 /* @@ odk serialize */

 void Pack_ODK_PreparedLicenseRequest(ODK_Message* msg,
                                     ODK_PreparedLicenseRequest const* obj) {
  Pack_ODK_CoreMessage(msg, &obj->core_message);
+  Pack_ODK_MessageCounterInfo(msg, &obj->counter_info);
+}
+
+void Pack_ODK_PreparedLicenseRequestV17(
+    ODK_Message* msg, ODK_PreparedLicenseRequestV17 const* obj) {
+  Pack_ODK_CoreMessage(msg, &obj->core_message);
 }

 void Pack_ODK_PreparedRenewalRequest(ODK_Message* msg,
@@ -130,10 +194,24 @@ void Pack_ODK_PreparedRenewalRequest(ODK_Message* msg,
 void Pack_ODK_PreparedProvisioningRequest(
    ODK_Message* msg, const ODK_PreparedProvisioningRequest* obj) {
  Pack_ODK_CoreMessage(msg, &obj->core_message);
+  Pack_ODK_MessageCounterInfo(msg, &obj->counter_info);
+}
+
+void Pack_ODK_PreparedProvisioningRequestV17(
+    ODK_Message* msg, const ODK_PreparedProvisioningRequestV17* obj) {
+  Pack_ODK_CoreMessage(msg, &obj->core_message);
  Pack_uint32_t(msg, &obj->device_id_length);
  PackArray(msg, &obj->device_id[0], sizeof(obj->device_id));
 }

+void Pack_ODK_PreparedProvisioning40Request(
+    ODK_Message* msg, const ODK_PreparedProvisioning40Request* obj) {
+  Pack_ODK_CoreMessage(msg, &obj->core_message);
+  Pack_uint32_t(msg, &obj->device_info_length);
+  PackArray(msg, &obj->device_info[0], sizeof(obj->device_info));
+  Pack_ODK_MessageCounterInfo(msg, &obj->counter_info);
+}
+
 void Pack_ODK_PreparedRenewedProvisioningRequest(
    ODK_Message* msg, const ODK_PreparedRenewedProvisioningRequest* obj) {
  Pack_ODK_CoreMessage(msg, &obj->core_message);
@@ -148,13 +226,19 @@ void Pack_ODK_PreparedRenewedProvisioningRequest(

 void Pack_ODK_LicenseResponse(ODK_Message* msg,
                              ODK_LicenseResponse const* obj) {
-  Pack_ODK_PreparedLicenseRequest(msg, &obj->request);
+  Pack_ODK_CoreMessage(msg, &obj->core_message);
  Pack_ODK_ParsedLicense(msg, (const ODK_ParsedLicense*)obj->parsed_license);
 }

+void Pack_ODK_LicenseResponseV17(ODK_Message* msg,
+                                 ODK_LicenseResponseV17 const* obj) {
+  Pack_ODK_PreparedLicenseRequestV17(msg, &obj->request);
+  Pack_ODK_ParsedLicenseV17(msg, &obj->parsed_license);
+}
+
 void Pack_ODK_LicenseResponseV16(ODK_Message* msg,
                                 ODK_LicenseResponseV16 const* obj) {
-  Pack_ODK_PreparedLicenseRequest(msg, &obj->request);
+  Pack_ODK_PreparedLicenseRequestV17(msg, &obj->request);
  Pack_ODK_ParsedLicenseV16(msg, &obj->parsed_license);
  PackArray(msg, &obj->request_hash[0], sizeof(obj->request_hash));
 }
@@ -167,11 +251,23 @@ void Pack_ODK_RenewalResponse(ODK_Message* msg,

 void Pack_ODK_ProvisioningResponse(ODK_Message* msg,
                                   const ODK_ProvisioningResponse* obj) {
-  Pack_ODK_PreparedProvisioningRequest(msg, &obj->request);
+  Pack_ODK_CoreMessage(msg, &obj->core_message);
  Pack_ODK_ParsedProvisioning(
      msg, (const ODK_ParsedProvisioning*)obj->parsed_provisioning);
 }

+void Pack_ODK_ProvisioningResponseV16(ODK_Message* msg,
+                                      const ODK_ProvisioningResponseV16* obj) {
+  Pack_ODK_PreparedProvisioningRequestV17(msg, &obj->request);
+  Pack_ODK_ParsedProvisioning(
+      msg, (const ODK_ParsedProvisioning*)obj->parsed_provisioning);
+}
+
+void Pack_ODK_Provisioning40Response(ODK_Message* msg,
+                                     const ODK_Provisioning40Response* obj) {
+  Pack_ODK_CoreMessage(msg, &obj->core_message);
+}
+
 /* @ deserialize */

 /* @@ private deserialize */
@@ -253,6 +349,65 @@ static void Unpack_ODK_ParsedLicense(ODK_Message* msg, ODK_ParsedLicense* obj) {
    obj->dtcp2_required.cmi_descriptor_2.data[1] = 0;
    obj->dtcp2_required.cmi_descriptor_2.data[2] = 0;
  }
+  Unpack_OEMCrypto_TimerDelayBase(msg, &obj->renewal_delay_base);
+  Unpack_uint32_t(msg, &obj->key_array_length);
+  if (obj->key_array_length > ODK_MAX_NUM_KEYS) {
+    ODK_Message_SetStatus(msg, MESSAGE_STATUS_OVERFLOW_ERROR);
+    return;
+  }
+  uint32_t i;
+  for (i = 0; i < obj->key_array_length; i++) {
+    Unpack_OEMCrypto_KeyObject(msg, &obj->key_array[i]);
+  }
+}
+
+static void Unpack_ODK_ParsedLicenseV17(ODK_Message* msg,
+                                        ODK_ParsedLicenseV17* obj) {
+  Unpack_OEMCrypto_Substring(msg, &obj->enc_mac_keys_iv);
+  Unpack_OEMCrypto_Substring(msg, &obj->enc_mac_keys);
+  Unpack_OEMCrypto_Substring(msg, &obj->pst);
+  Unpack_OEMCrypto_Substring(msg, &obj->srm_restriction_data);
+  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->watermarking);
+  Unpack_uint8_t(msg, &obj->dtcp2_required.dtcp2_required);
+  if (obj->dtcp2_required.dtcp2_required) {
+    Unpack_uint8_t(msg, &obj->dtcp2_required.cmi_descriptor_0.id);
+    Unpack_uint8_t(msg, &obj->dtcp2_required.cmi_descriptor_0.extension);
+    Unpack_uint16_t(msg, &obj->dtcp2_required.cmi_descriptor_0.length);
+    Unpack_uint8_t(msg, &obj->dtcp2_required.cmi_descriptor_0.data);
+    Unpack_uint8_t(msg, &obj->dtcp2_required.cmi_descriptor_1.id);
+    Unpack_uint8_t(msg, &obj->dtcp2_required.cmi_descriptor_1.extension);
+    Unpack_uint16_t(msg, &obj->dtcp2_required.cmi_descriptor_1.length);
+    Unpack_uint8_t(msg, &obj->dtcp2_required.cmi_descriptor_1.data[0]);
+    Unpack_uint8_t(msg, &obj->dtcp2_required.cmi_descriptor_1.data[1]);
+    Unpack_uint8_t(msg, &obj->dtcp2_required.cmi_descriptor_1.data[2]);
+    Unpack_uint8_t(msg, &obj->dtcp2_required.cmi_descriptor_2.id);
+    Unpack_uint8_t(msg, &obj->dtcp2_required.cmi_descriptor_2.extension);
+    Unpack_uint16_t(msg, &obj->dtcp2_required.cmi_descriptor_2.length);
+    Unpack_uint8_t(msg, &obj->dtcp2_required.cmi_descriptor_2.data[0]);
+    Unpack_uint8_t(msg, &obj->dtcp2_required.cmi_descriptor_2.data[1]);
+    Unpack_uint8_t(msg, &obj->dtcp2_required.cmi_descriptor_2.data[2]);
+  } else {
+    obj->dtcp2_required.dtcp2_required = 0;
+    obj->dtcp2_required.cmi_descriptor_0.id = 0;
+    obj->dtcp2_required.cmi_descriptor_0.extension = 0;
+    obj->dtcp2_required.cmi_descriptor_0.length = 0;
+    obj->dtcp2_required.cmi_descriptor_0.data = 0;
+    obj->dtcp2_required.cmi_descriptor_1.id = 0;
+    obj->dtcp2_required.cmi_descriptor_1.extension = 0;
+    obj->dtcp2_required.cmi_descriptor_1.length = 0;
+    obj->dtcp2_required.cmi_descriptor_1.data[0] = 0;
+    obj->dtcp2_required.cmi_descriptor_1.data[1] = 0;
+    obj->dtcp2_required.cmi_descriptor_1.data[2] = 0;
+    obj->dtcp2_required.cmi_descriptor_2.id = 0;
+    obj->dtcp2_required.cmi_descriptor_2.extension = 0;
+    obj->dtcp2_required.cmi_descriptor_2.length = 0;
+    obj->dtcp2_required.cmi_descriptor_2.data[0] = 0;
+    obj->dtcp2_required.cmi_descriptor_2.data[1] = 0;
+    obj->dtcp2_required.cmi_descriptor_2.data[2] = 0;
+  }
  Unpack_uint32_t(msg, &obj->key_array_length);
  if (obj->key_array_length > ODK_MAX_NUM_KEYS) {
    ODK_Message_SetStatus(msg, MESSAGE_STATUS_OVERFLOW_ERROR);
@@ -292,11 +447,31 @@ static void Unpack_ODK_ParsedProvisioning(ODK_Message* msg,
  Unpack_OEMCrypto_Substring(msg, &obj->encrypted_message_key);
 }

+static void Unpack_ODK_MessageCounterInfo(ODK_Message* msg,
+                                          ODK_MessageCounterInfo* obj) {
+  Unpack_uint64_t(msg, &obj->master_generation_number);
+  Unpack_uint32_t(msg, &obj->provisioning_count);
+  Unpack_uint32_t(msg, &obj->license_count);
+  Unpack_uint32_t(msg, &obj->decrypt_count);
+  Unpack_uint16_t(msg, &obj->major_version);
+  Unpack_uint16_t(msg, &obj->minor_version);
+  Unpack_uint16_t(msg, &obj->patch_version);
+  UnpackArray(msg, &obj->soc_vendor[0], sizeof(obj->soc_vendor));
+  UnpackArray(msg, &obj->chipset_model[0], sizeof(obj->chipset_model));
+  UnpackArray(msg, &obj->extra[0], sizeof(obj->extra));
+}
+
 /* @ kdo deserialize */

 void Unpack_ODK_PreparedLicenseRequest(ODK_Message* msg,
                                       ODK_PreparedLicenseRequest* obj) {
  Unpack_ODK_CoreMessage(msg, &obj->core_message);
+  Unpack_ODK_MessageCounterInfo(msg, &obj->counter_info);
+}
+
+void Unpack_ODK_PreparedLicenseRequestV17(ODK_Message* msg,
+                                          ODK_PreparedLicenseRequestV17* obj) {
+  Unpack_ODK_CoreMessage(msg, &obj->core_message);
 }

 void Unpack_ODK_PreparedRenewalRequest(ODK_Message* msg,
@@ -308,10 +483,24 @@ void Unpack_ODK_PreparedRenewalRequest(ODK_Message* msg,
 void Unpack_ODK_PreparedProvisioningRequest(
    ODK_Message* msg, ODK_PreparedProvisioningRequest* obj) {
  Unpack_ODK_CoreMessage(msg, &obj->core_message);
+  Unpack_ODK_MessageCounterInfo(msg, &obj->counter_info);
+}
+
+void Unpack_ODK_PreparedProvisioningRequestV17(
+    ODK_Message* msg, ODK_PreparedProvisioningRequestV17* obj) {
+  Unpack_ODK_CoreMessage(msg, &obj->core_message);
  Unpack_uint32_t(msg, &obj->device_id_length);
  UnpackArray(msg, &obj->device_id[0], sizeof(obj->device_id));
 }

+void Unpack_ODK_PreparedProvisioning40Request(
+    ODK_Message* msg, ODK_PreparedProvisioning40Request* obj) {
+  Unpack_ODK_CoreMessage(msg, &obj->core_message);
+  Unpack_uint32_t(msg, &obj->device_info_length);
+  UnpackArray(msg, &obj->device_info[0], sizeof(obj->device_info));
+  Unpack_ODK_MessageCounterInfo(msg, &obj->counter_info);
+}
+
 void Unpack_ODK_PreparedRenewedProvisioningRequest(
    ODK_Message* msg, ODK_PreparedRenewedProvisioningRequest* obj) {
  Unpack_ODK_CoreMessage(msg, &obj->core_message);
@@ -329,13 +518,19 @@ void Unpack_ODK_PreparedCommonRequest(ODK_Message* msg,
 /* @@ odk deserialize */

 void Unpack_ODK_LicenseResponse(ODK_Message* msg, ODK_LicenseResponse* obj) {
-  Unpack_ODK_PreparedLicenseRequest(msg, &obj->request);
+  Unpack_ODK_CoreMessage(msg, &obj->core_message);
  Unpack_ODK_ParsedLicense(msg, obj->parsed_license);
 }

+void Unpack_ODK_LicenseResponseV17(ODK_Message* msg,
+                                   ODK_LicenseResponseV17* obj) {
+  Unpack_ODK_PreparedLicenseRequestV17(msg, &obj->request);
+  Unpack_ODK_ParsedLicenseV17(msg, &obj->parsed_license);
+}
+
 void Unpack_ODK_LicenseResponseV16(ODK_Message* msg,
                                   ODK_LicenseResponseV16* obj) {
-  Unpack_ODK_PreparedLicenseRequest(msg, &obj->request);
+  Unpack_ODK_PreparedLicenseRequestV17(msg, &obj->request);
  Unpack_ODK_ParsedLicenseV16(msg, &obj->parsed_license);
  UnpackArray(msg, &obj->request_hash[0], sizeof(obj->request_hash));
 }
@@ -347,6 +542,17 @@ void Unpack_ODK_RenewalResponse(ODK_Message* msg, ODK_RenewalResponse* obj) {

 void Unpack_ODK_ProvisioningResponse(ODK_Message* msg,
                                     ODK_ProvisioningResponse* obj) {
-  Unpack_ODK_PreparedProvisioningRequest(msg, &obj->request);
+  Unpack_ODK_CoreMessage(msg, &obj->core_message);
  Unpack_ODK_ParsedProvisioning(msg, obj->parsed_provisioning);
 }
+
+void Unpack_ODK_ProvisioningResponseV16(ODK_Message* msg,
+                                        ODK_ProvisioningResponseV16* obj) {
+  Unpack_ODK_PreparedProvisioningRequestV17(msg, &obj->request);
+  Unpack_ODK_ParsedProvisioning(msg, obj->parsed_provisioning);
+}
+
+void Unpack_ODK_Provisioning40Response(ODK_Message* msg,
+                                       ODK_Provisioning40Response* obj) {
+  Unpack_ODK_CoreMessage(msg, &obj->core_message);
+}