Update Simulcrypt ECMg

common/ec_key.h

@@ -16,7 +16,9 @@
 #include <memory>
 #include <string>
 
+#include "absl/base/macros.h"
 #include "openssl/ec.h"
+#include "common/hash_algorithm.h"
 #include "common/openssl_util.h"
 
 namespace widevine {
@@ -65,9 +67,24 @@ class ECPrivateKey {
   // DER-encoded signature.
   // Caller retains ownership of all pointers.
   // Returns true on success and false on error.
+  // TODO(b/155438325): remove this function after the below function is fully
+  // propagated.
+  ABSL_DEPRECATED(
+      "Use the below function with |hash_algorithm| argument instead.")
   virtual bool GenerateSignature(const std::string& message,
                                  std::string* signature) const;
 
+  // Given a message, calculates a signature using ECDSA with the key_.
+  // |message| is the message to be signed.
+  // |hash_algorithm| specifies the hash algorithm.
+  // |signature| will contain the resulting signature. This will be an ASN.1
+  // DER-encoded signature.
+  // Caller retains ownership of all pointers.
+  // Returns true on success and false on error.
+  virtual bool GenerateSignature(const std::string& message,
+                                 HashAlgorithm hash_algorithm,
+                                 std::string* signature) const;
+
   // Returns whether the given private key is the same as key_.
   virtual bool MatchesPrivateKey(const ECPrivateKey& private_key) const;
 
@@ -110,9 +127,23 @@ class ECPublicKey {
   // |message| is the message that was signed.
   // |signature| is an ASN.1 DER-encoded signature.
   // Returns true on success and false on error.
+  // TODO(b/155438325): remove this function after the below function is fully
+  // propagated.
+  ABSL_DEPRECATED(
+      "Use the below function with |hash_algorithm| argument instead.")
   virtual bool VerifySignature(const std::string& message,
                                const std::string& signature) const;
 
+  // Given a message and a signature, verifies that the signature was created
+  // using the private key associated with key_.
+  // |message| is the message that was signed.
+  // |hash_algorithm| specifies the hash algorithm.
+  // |signature| is an ASN.1 DER-encoded signature.
+  // Returns true on success and false on error.
+  virtual bool VerifySignature(const std::string& message,
+                               HashAlgorithm hash_algorithm,
+                               const std::string& signature) const;
+
   // Returns whether the given private key is part of the same key pair as key_.
   virtual bool MatchesPrivateKey(const ECPrivateKey& private_key) const;