Merge cdm changes to android repo

Bug: 251924225
Test: GtsMediaTestCases
Change-Id: I1b4e64c0abf701fe1f5017f14dc72b72c3ea6770

libwvdrmengine/oemcrypto/util/include/oemcrypto_key_deriver.h

@@ -47,6 +47,11 @@ class KeyDeriver {
   bool DeriveEncryptionKey(const std::vector<uint8_t>& enc_key_context,
                            std::vector<uint8_t>* enc_key);
 
+  // Derive renewed device key. Use on KeyDeriver initialized with old device
+  // key. |context| should be just the context field, eg A_priv+CA_token.
+  bool DeriveRenewedDeviceKey(const std::vector<uint8_t>& context,
+                              std::vector<uint8_t>* renewed_device_key);
+
   ~KeyDeriver() {}
 
  private:

libwvdrmengine/oemcrypto/util/include/oemcrypto_rsa_key.h

@@ -268,6 +268,13 @@ class RsaPrivateKey {
   // Returns an empty vector on error.
   std::vector<uint8_t> Serialize() const;
 
+  // Serializes the key's private exponent in network-byte-order
+  // using I2OSP primitive as defined by RFC3447 Section 4.1.  The
+  // exact length of the exponent will depend on the exponents value,
+  // not the modulus size.
+  // Returns an empty vector on error.
+  std::vector<uint8_t> GetPrivateExponent() const;
+
   // Signs the provided |message| using the RSA signing algorithm
   // specified by |algorithm|.  See RsaSignatureAlgorithm for
   // details on each algorithm.