Switch SignatureVerifier to taking an algorithm enum.

components/crx_file/crx_file.cc

 // Copyright 2014 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.
 
 #include "components/crx_file/crx_file.h"
 
 #include "base/base64.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_file.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/numerics/safe_math.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
-#include "components/crx_file/constants.h"
 #include "components/crx_file/id_util.h"
 #include "crypto/secure_hash.h"
 #include "crypto/sha2.h"
 #include "crypto/signature_verifier.h"
 
 namespace crx_file {
 
 namespace {
 
 // The current version of the crx format.
@@ skipping 126 matching lines @@
   if (len != header.key_size)
     return ValidateError::CRX_PUBLIC_KEY_INVALID;
 
   std::vector<uint8_t> signature(header.signature_size);
   len = ReadAndHash(&signature.front(), sizeof(uint8_t), header.signature_size,
                     file.get(), hash.get());
   if (len < header.signature_size)
     return ValidateError::CRX_SIGNATURE_INVALID;
 
   crypto::SignatureVerifier verifier;
-  if (!verifier.VerifyInit(
-          crx_file::kSignatureAlgorithm, sizeof(crx_file::kSignatureAlgorithm),
-          &signature.front(), static_cast<int>(signature.size()), &key.front(),
-          static_cast<int>(key.size()))) {
+  if (!verifier.VerifyInit(crypto::SignatureVerifier::RSA_PKCS1_SHA1,
+                           signature.data(), static_cast<int>(signature.size()),
+                           key.data(), static_cast<int>(key.size()))) {
     // Signature verification initialization failed. This is most likely
     // caused by a public key in the wrong format (should encode algorithm).
     return ValidateError::CRX_SIGNATURE_VERIFICATION_INITIALIZATION_FAILED;
   }
 
   uint8_t buf[1 << 12] = {};
   while ((len = ReadAndHash(buf, sizeof(buf[0]), arraysize(buf), file.get(),
                             hash.get())) > 0)
     verifier.VerifyUpdate(buf, static_cast<int>(len));
 
@@ skipping 36 matching lines @@
   else if (header.signature_size > kMaxSignatureSize)
     *error = kInvalidSignatureTooLarge;
   else if (header.signature_size == 0)
     *error = kInvalidSignatureTooSmall;
   else
     valid = true;
   return valid;
 }
 
 }  // namespace crx_file