Merge "Add DRM reprovisioning request generation" into main

libwvdrmengine/cdm/core/include/crypto_session.h

@@ -112,6 +112,9 @@ class CryptoSession {
   // Only valid for OEM certificate-based based devices.
   virtual CdmResponseType GetTokenFromOemCert(
       RequestedSecurityLevel requested_security_level, std::string* oem_cert);
+  // Retrieves the embedded public certificate from OEMCrypto.
+  // Only valid for L3 devices with embedded (baked-in) certificates.
+  virtual CdmResponseType GetTokenFromEmbeddedCertificate(std::string* token);
 
   // The overloaded methods with |requested_level| may be called
   // without a preceding call to Open. The other method must call Open first.

libwvdrmengine/cdm/core/include/wv_cdm_types.h

@@ -463,6 +463,7 @@ enum CdmResponseEnum : int32_t {
   SESSION_NOT_FOUND_24 = 397,
   GET_DEVICE_INFORMATION_ERROR = 398,
   GET_DEVICE_SIGNED_CSR_PAYLOAD_ERROR = 399,
+  GET_TOKEN_FROM_EMBEDDED_CERT_ERROR = 400,
   // Don't forget to add new values to
   //  * core/src/wv_cdm_types.cpp
   //  * android/include/mapErrors-inl.h