Merge cdm changes to android repo

Bug: 251924225
Test: GtsMediaTestCases
Change-Id: I1b4e64c0abf701fe1f5017f14dc72b72c3ea6770

libwvdrmengine/oemcrypto/odk/include/OEMCryptoCENCCommon.h

@@ -120,6 +120,11 @@ typedef enum OEMCrypto_Usage_Entry_Status {
   kInactiveUnused = 4,
 } OEMCrypto_Usage_Entry_Status;
 
+typedef enum OEMCrypto_ProvisioningRenewalType {
+  OEMCrypto_NoRenewal = 0,
+  OEMCrypto_RenewalACert = 1,
+} OEMCrypto_ProvisioningRenewalType;
+
 /**
  *  OEMCrypto_LicenseType is used in the license message to indicate if the key
  *  objects are for content keys, or for entitlement keys.
@@ -134,6 +139,7 @@ typedef enum OEMCrypto_LicenseType {
 typedef enum OEMCrypto_PrivateKeyType {
   OEMCrypto_RSA_Private_Key = 0,
   OEMCrypto_ECC_Private_Key = 1,
+  OEMCrypto_PrivateKeyType_MaxValue = OEMCrypto_ECC_Private_Key,
 } OEMCrypto_PrivateKeyType;
 
 /**

libwvdrmengine/oemcrypto/odk/include/core_message_deserialize.h

@@ -55,6 +55,18 @@ bool CoreProvisioningRequestFromMessage(
     const std::string& oemcrypto_core_message,
     ODK_ProvisioningRequest* core_provisioning_request);
 
+/**
+ * Counterpart (deserializer) of ODK_PrepareCoreRenewedProvisioningRequest
+ * (serializer)
+ *
+ * Parameters:
+ *   [in] oemcrypto_core_message
+ *   [out] core_provisioning_request
+ */
+bool CoreRenewedProvisioningRequestFromMessage(
+    const std::string& oemcrypto_core_message,
+    ODK_ProvisioningRequest* core_provisioning_request);
+
 /**
  * Serializer counterpart is not used and is therefore not implemented.
  *

libwvdrmengine/oemcrypto/odk/include/core_message_features.h

@@ -25,10 +25,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 16.5, the last version used by Chrome. This will
-  // change to 17.0 when v17 has been released.
+  // number. The default is 17.2.
   uint32_t maximum_major_version = 17;
-  uint32_t maximum_minor_version = 0;
+  uint32_t maximum_minor_version = 2;
 
   bool operator==(const CoreMessageFeatures &other) const;
   bool operator!=(const CoreMessageFeatures &other) const {

libwvdrmengine/oemcrypto/odk/include/core_message_types.h

@@ -96,7 +96,8 @@ struct ODK_RenewalRequest {
 };
 
 /**
- * Output structure for CoreProvisioningRequestFromMessage
+ * Output structure for CoreProvisioningRequestFromMessage and
+ * CoreRenewedProvisioningRequestFromMessage
  * Input structure for CreateCoreProvisioningResponse
  */
 struct ODK_ProvisioningRequest {
@@ -105,6 +106,8 @@ struct ODK_ProvisioningRequest {
   uint32_t nonce;
   uint32_t session_id;
   std::string device_id;
+  uint16_t renewal_type;
+  std::string renewal_data;
 };
 
 }  // namespace oemcrypto_core_message

libwvdrmengine/oemcrypto/odk/include/odk.h

@@ -326,7 +326,7 @@ OEMCryptoResult ODK_PrepareCoreRenewalRequest(uint8_t* message,
  * OEMCrypto_GetDeviceID. The device ID shall be unique to the device, and
  * stable across reboots and factory resets for an L1 device.
  *
- * NOTE: if the message pointer is null and/or input core_message_size is
+ * NOTE: if the message pointer is null and/or input core_message_length is
  * zero, this function returns OEMCrypto_ERROR_SHORT_BUFFER and sets output
  * core_message_size to the size needed.
  *
@@ -351,10 +351,56 @@ OEMCryptoResult ODK_PrepareCoreRenewalRequest(uint8_t* message,
  * This method is new in version 16 of the API.
  */
 OEMCryptoResult ODK_PrepareCoreProvisioningRequest(
-    uint8_t* message, size_t message_length, size_t* core_message_size,
+    uint8_t* message, size_t message_length, size_t* core_message_length,
     const ODK_NonceValues* nonce_values, const uint8_t* device_id,
     size_t device_id_length);
 
+/**
+ * Modifies the message to include a core renewal provisioning request at the
+ * beginning of the message buffer. The values in nonce_values are used to
+ * populate the message.
+ *
+ * This shall be called by OEMCrypto from
+ * OEMCrypto_PrepAndSignProvisioningRequest.
+ *
+ * The buffer device_id shall be the same string returned by
+ * OEMCrypto_GetDeviceID. The device ID shall be unique to the device, and
+ * stable across reboots and factory resets for an L1 device.
+ *
+ * NOTE: if the message pointer is null and/or input core_message_length is
+ * zero, this function returns OEMCrypto_ERROR_SHORT_BUFFER and sets output
+ * core_message_size to the size needed.
+ *
+ * @param[in,out] message: pointer to memory for the entire message. Modified by
+ *       the ODK library.
+ * @param[in] message_length: length of the entire message buffer.
+ * @param[in,out] core_message_size: length of the core message at the beginning
+ *       of the message. (in) size of buffer reserved for the core message, in
+ *       bytes. (out) actual length of the core message, in bytes.
+ * @param[in] nonce_values: pointer to the session's nonce data.
+ * @param[in] device_id: For devices with a keybox, this is the device ID from
+ *       the keybox. For devices with an OEM Certificate, this is a device
+ *       unique id string.
+ * @param[in] device_id_length: length of device_id. The device ID can be at
+ *       most 64 bytes.
+ * @param[in] renewal_type: type of renewal used
+ * @param[in] renewal_data: renewal data used. For renewal_type = 1,
+ *       renewal_data is the Android attestation batch certificate.
+ * @param[in] renewal_data_length: length of renewal_data
+ *
+ * @retval OEMCrypto_SUCCESS
+ * @retval OEMCrypto_ERROR_SHORT_BUFFER: core_message_size is too small
+ * @retval OEMCrypto_ERROR_INVALID_CONTEXT
+ *
+ * @version
+ * This method is new in version 17 of the API.
+ */
+OEMCryptoResult ODK_PrepareCoreRenewedProvisioningRequest(
+    uint8_t* message, size_t message_length, size_t* core_message_length,
+    const ODK_NonceValues* nonce_values, const uint8_t* device_id,
+    size_t device_id_length, uint16_t renewal_type, const uint8_t* renewal_data,
+    size_t renewal_data_length);
+
 /// @}
 
 /// @addtogroup odk_timer

libwvdrmengine/oemcrypto/odk/include/odk_message.h

@@ -36,10 +36,12 @@ extern "C" {
 
 #if defined(__GNUC__) || defined(__clang__)
 #define ALIGNED __attribute__((aligned))
+#elif _MSC_VER
+#define ALIGNED __declspec(align(8))
 #else
 #define ALIGNED
 #error ODK_Message must be aligned to the maximum useful alignment of the \
-  machine you are compiling for. Define the ALIGNED macro accordingly.
+    machine you are compiling for. Define the ALIGNED macro accordingly.
 #endif
 
 typedef struct {
@@ -48,19 +50,19 @@ typedef struct {
 } ALIGNED ODK_Message;
 
 typedef enum {
-  MESSAGE_STATUS_OK = 0xe937fcf7,
-  MESSAGE_STATUS_UNKNOWN_ERROR = 0xe06c1190,
-  MESSAGE_STATUS_OVERFLOW_ERROR = 0xc43ae4bc,
+  MESSAGE_STATUS_OK = 0x7937fcf7,
+  MESSAGE_STATUS_UNKNOWN_ERROR = 0x706c1190,
+  MESSAGE_STATUS_OVERFLOW_ERROR = 0x543ae4bc,
   MESSAGE_STATUS_UNDERFLOW_ERROR = 0x7123cd0b,
   MESSAGE_STATUS_PARSE_ERROR = 0x0b9f6189,
   MESSAGE_STATUS_NULL_POINTER_ERROR = 0x2d66837a,
   MESSAGE_STATUS_API_VALUE_ERROR = 0x6ba34f47,
-  MESSAGE_STATUS_END_OF_MESSAGE_ERROR = 0x998db72a,
-  MESSAGE_STATUS_INVALID_ENUM_VALUE = 0xedb88197,
+  MESSAGE_STATUS_END_OF_MESSAGE_ERROR = 0x798db72a,
+  MESSAGE_STATUS_INVALID_ENUM_VALUE = 0x7db88197,
   MESSAGE_STATUS_INVALID_TAG_ERROR = 0x14dce06a,
   MESSAGE_STATUS_NOT_INITIALIZED = 0x2990b6c6,
-  MESSAGE_STATUS_OUT_OF_MEMORY = 0xfc5c64cc,
-  MESSAGE_STATUS_MAP_SHARED_MEMORY_FAILED = 0xfafecacf,
+  MESSAGE_STATUS_OUT_OF_MEMORY = 0x7c5c64cc,
+  MESSAGE_STATUS_MAP_SHARED_MEMORY_FAILED = 0x7afecacf,
   MESSAGE_STATUS_SECURE_BUFFER_ERROR = 0x78f0e873
 } ODK_MessageStatus;
 

libwvdrmengine/oemcrypto/odk/include/odk_structs.h

@@ -16,10 +16,10 @@ extern "C" {
 
 /* The version of this library. */
 #define ODK_MAJOR_VERSION 17
-#define ODK_MINOR_VERSION 0
+#define ODK_MINOR_VERSION 2
 
 /* ODK Version string. Date changed automatically on each release. */
-#define ODK_RELEASE_DATE "ODK v17.0 2022-05-06"
+#define ODK_RELEASE_DATE "ODK v17.2 2022-08-10"
 
 /* The lowest version number for an ODK message. */
 #define ODK_FIRST_VERSION 16
@@ -27,6 +27,7 @@ extern "C" {
 /* Some useful constants. */
 #define ODK_DEVICE_ID_LEN_MAX 64
 #define ODK_SHA256_HASH_SIZE 32
+#define ODK_KEYBOX_RENEWAL_DATA_SIZE 1600
 
 /// @addtogroup odk_timer
 /// @{