Update Simulcrypt ECMg

common/rot_id_generator.h

@@ -38,7 +38,7 @@ class RootOfTrustIdGenerator {
   // values. The unique id hash values identify revoked devices and are
   // published in the DCSL and consumed by the License SDK.
   RootOfTrustIdGenerator(std::unique_ptr<EciesEncryptor> ecies_encryptor,
-                         std::string wv_shared_salt)
+                         const std::string& wv_shared_salt)
       : ecies_encryptor_(std::move(ecies_encryptor)),
         wv_shared_salt_(std::move(wv_shared_salt)) {}
 
@@ -73,8 +73,10 @@ class RootOfTrustIdGenerator {
 class RootOfTrustIdDecryptor {
  public:
   explicit RootOfTrustIdDecryptor(
-      std::unique_ptr<EciesDecryptor> ecies_decryptor)
-      : ecies_decryptor_(std::move(ecies_decryptor)) {}
+      std::unique_ptr<EciesDecryptor> ecies_decryptor,
+      const std::string& wv_shared_salt)
+      : ecies_decryptor_(std::move(ecies_decryptor)),
+        wv_shared_salt_(wv_shared_salt) {}
 
   // Decrypts the |rot_encrypted_id| using the |system_id| as part of the
   // context. |unique_id| contains the decrypted value on success.
@@ -83,8 +85,18 @@ class RootOfTrustIdDecryptor {
   Status DecryptUniqueId(uint32_t system_id, const std::string& rot_encrypted_id,
                          std::string* unique_id) const;
 
+  // Decrypts the encrypted id within the |root_of_trust_id|, extacting the
+  // |device_unique_id|, and generating the |device_unique_id_hash|. It then
+  // generates the rot id revocation hash and verifies that it matches the
+  // unique_id_hash from the root_of_trust_id.
+  Status VerifyAndExtractAllValues(uint32_t system_id,
+                                   const RootOfTrustId& root_of_trust_id,
+                                   std::string* device_unique_id,
+                                   std::string* device_unique_id_hash) const;
+
  private:
   std::unique_ptr<EciesDecryptor> ecies_decryptor_;
+  std::string wv_shared_salt_;
 };
 
 }  // namespace widevine