Switch SignatureVerifier to taking an algorithm enum.

crypto/signature_verifier.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CRYPTO_SIGNATURE_VERIFIER_H_
 #define CRYPTO_SIGNATURE_VERIFIER_H_
 
 #include <stdint.h>
 
 #include <vector>
@@ skipping 15 matching lines @@
 // The SignatureVerifier class verifies a signature using a bare public key
 // (as opposed to a certificate).
 class CRYPTO_EXPORT SignatureVerifier {
  public:
   // The set of supported hash functions. Extend as required.
   enum HashAlgorithm {
     SHA1,
     SHA256,
   };
 
+  // The set of supported signature algorithms. Extend as required.
+  enum SignatureAlgorithm {
+    RSA_PKCS1_SHA1,
+    RSA_PKCS1_SHA256,
+    ECDSA_SHA256,
+  };
+
   SignatureVerifier();
   ~SignatureVerifier();
 
   // Streaming interface:
 
   // Initiates a signature verification operation.  This should be followed
   // by one or more VerifyUpdate calls and a VerifyFinal call.
   // NOTE: for RSA-PSS signatures, use VerifyInitRSAPSS instead.
   //
-  // The signature algorithm is specified as a DER encoded ASN.1
-  // AlgorithmIdentifier structure:
-  //   AlgorithmIdentifier  ::=  SEQUENCE  {
-  //       algorithm               OBJECT IDENTIFIER,
-  //       parameters              ANY DEFINED BY algorithm OPTIONAL  }
-  //
-  // The signature is encoded according to the signature algorithm, but it
-  // must not be further encoded in an ASN.1 BIT STRING.
-  // Note: An RSA signature is actually a big integer.  It must be in
-  // big-endian byte order.
+  // The signature is encoded according to the signature algorithm.
   //
   // The public key is specified as a DER encoded ASN.1 SubjectPublicKeyInfo
   // structure, which contains not only the public key but also its type
   // (algorithm):
   //   SubjectPublicKeyInfo  ::=  SEQUENCE  {
   //       algorithm            AlgorithmIdentifier,
   //       subjectPublicKey     BIT STRING  }
-  bool VerifyInit(const uint8_t* signature_algorithm,
-                  int signature_algorithm_len,
+  bool VerifyInit(SignatureAlgorithm signature_algorithm,
                   const uint8_t* signature,
                   int signature_len,
                   const uint8_t* public_key_info,
                   int public_key_info_len);
 
   // Initiates a RSA-PSS signature verification operation.  This should be
   // followed by one or more VerifyUpdate calls and a VerifyFinal call.
   //
   // The RSA-PSS signature algorithm parameters are specified with the
   // |hash_alg|, |mask_hash_alg|, and |salt_len| arguments.
@@ skipping 17 matching lines @@
                         int public_key_info_len);
 
   // Feeds a piece of the data to the signature verifier.
   void VerifyUpdate(const uint8_t* data_part, int data_part_len);
 
   // Concludes a signature verification operation.  Returns true if the
   // signature is valid.  Returns false if the signature is invalid or an
   // error occurred.
   bool VerifyFinal();
 
-  // Note: we can provide a one-shot interface if there is interest:
-  //   bool Verify(const uint8_t* data,
-  //               int data_len,
-  //               const uint8_t* signature_algorithm,
-  //               int signature_algorithm_len,
-  //               const uint8_t* signature,
-  //               int signature_len,
-  //               const uint8_t* public_key_info,
-  //               int public_key_info_len);
-
  private:
 #if defined(USE_OPENSSL)
-  bool CommonInit(const EVP_MD* digest,
+  bool CommonInit(int pkey_type,
+                  const EVP_MD* digest,
                   const uint8_t* signature,
                   int signature_len,
                   const uint8_t* public_key_info,
                   int public_key_info_len,
                   EVP_PKEY_CTX** pkey_ctx);
 #else
   static SECKEYPublicKey* DecodePublicKeyInfo(const uint8_t* public_key_info,
                                               int public_key_info_len);
 #endif
 
@@ skipping 13 matching lines @@
   HashAlgorithm mask_hash_alg_;
   unsigned int salt_len_;
   SECKEYPublicKey* public_key_;
   HASHContext* hash_context_;
 #endif
 };
 
 }  // namespace crypto
 
 #endif  // CRYPTO_SIGNATURE_VERIFIER_H_