Refactoring of Cast-related crypto code

chrome/common/extensions/api/networking_private/networking_private_crypto_openssl.cc

Index: chrome/common/extensions/api/networking_private/networking_private_crypto_openssl.cc
diff --git a/chrome/common/extensions/api/networking_private/networking_private_crypto_openssl.cc b/chrome/common/extensions/api/networking_private/networking_private_crypto_openssl.cc
index e08b51d661c8e2c494755a354c75c50d8e864f3e..2a22065f23c5ce650df5afd7a764163d3a7b80e5 100644
--- a/chrome/common/extensions/api/networking_private/networking_private_crypto_openssl.cc
+++ b/chrome/common/extensions/api/networking_private/networking_private_crypto_openssl.cc
@@ -10,7 +10,6 @@
 #include <openssl/x509.h>
 
 #include "base/logging.h"
-#include "base/strings/string_util.h"
 #include "crypto/openssl_util.h"
 #include "crypto/rsa_private_key.h"
 #include "crypto/scoped_openssl_types.h"
@@ -18,8 +17,6 @@
 
 namespace {
 
-typedef crypto::ScopedOpenSSL<X509, X509_free>::Type ScopedX509;
-
 // Parses |pem_data| for a PEM block of |pem_type|.
 // Returns true if a |pem_type| block is found, storing the decoded result in
 // |der_output|.
@@ -41,106 +38,6 @@ bool GetDERFromPEM(const std::string& pem_data,
 
 namespace networking_private_crypto {
 
-bool VerifyCredentials(const std::string& certificate,
-                       const std::string& signature,
-                       const std::string& data,
-                       const std::string& connected_mac) {
-  crypto::EnsureOpenSSLInit();
-  crypto::OpenSSLErrStackTracer err_tracer(FROM_HERE);
-
-  std::vector<uint8_t> cert_data;
-  if (!GetDERFromPEM(certificate, "CERTIFICATE", &cert_data)) {
-    LOG(ERROR) << "Failed to parse certificate.";
-    return false;
-  }
-
-  // Parse into an OpenSSL X509.
-  const uint8_t* ptr = cert_data.empty() ? NULL : &cert_data[0];
-  const uint8_t* end = ptr + cert_data.size();
-  ScopedX509 cert(d2i_X509(NULL, &ptr, cert_data.size()));
-  if (!cert || ptr != end) {
-    LOG(ERROR) << "Failed to parse certificate.";
-    return false;
-  }
-
-  // Import the trusted public key.
-  ptr = kTrustedCAPublicKeyDER;
-  crypto::ScopedRSA ca_public_key_rsa(
-      d2i_RSAPublicKey(NULL, &ptr, kTrustedCAPublicKeyDERLength));
-  if (!ca_public_key_rsa ||
-      ptr != kTrustedCAPublicKeyDER + kTrustedCAPublicKeyDERLength) {
-    NOTREACHED();
-    LOG(ERROR) << "Failed to import trusted public key.";
-    return false;
-  }
-  crypto::ScopedEVP_PKEY ca_public_key(EVP_PKEY_new());
-  if (!ca_public_key ||
-      !EVP_PKEY_set1_RSA(ca_public_key.get(), ca_public_key_rsa.get())) {
-    LOG(ERROR) << "Failed to initialize EVP_PKEY";
-    return false;
-  }
-
-  // Check that the certificate is signed by the trusted public key.
-  if (X509_verify(cert.get(), ca_public_key.get()) <= 0) {
-    LOG(ERROR) << "Certificate is not issued by the trusted CA.";
-    return false;
-  }
-
-  // Check that the device listed in the certificate is correct.
-  // Something like evt_e161 001a11ffacdf
-  std::string common_name;
-  int common_name_length = X509_NAME_get_text_by_NID(
-      cert->cert_info->subject, NID_commonName, NULL, 0);
-  if (common_name_length < 0) {
-    LOG(ERROR) << "Certificate does not have common name.";
-    return false;
-  }
-  if (common_name_length > 0) {
-    common_name_length = X509_NAME_get_text_by_NID(
-        cert->cert_info->subject,
-        NID_commonName,
-        WriteInto(&common_name, common_name_length + 1),
-        common_name_length + 1);
-    DCHECK_EQ((int)common_name.size(), common_name_length);
-    if (common_name_length < 0) {
-      LOG(ERROR) << "Certificate does not have common name.";
-      return false;
-    }
-    common_name.resize(common_name_length);
-  }
-
-  std::string translated_mac;
-  base::RemoveChars(connected_mac, ":", &translated_mac);
-  if (!EndsWith(common_name, translated_mac, false)) {
-    LOG(ERROR) << "MAC addresses don't match.";
-    return false;
-  }
-
-  // Make sure that the certificate matches the unsigned data presented.
-  // Verify that the |signature| matches |data|.
-  crypto::ScopedEVP_PKEY public_key(X509_get_pubkey(cert.get()));
-  if (!public_key) {
-    LOG(ERROR) << "Unable to extract public key from certificate.";
-    return false;
-  }
-
-  crypto::ScopedEVP_MD_CTX ctx(EVP_MD_CTX_create());
-  if (!ctx) {
-    LOG(ERROR) << "Unable to allocate EVP_MD_CTX.";
-    return false;
-  }
-  if (EVP_DigestVerifyInit(
-          ctx.get(), NULL, EVP_sha1(), NULL, public_key.get()) <= 0 ||
-      EVP_DigestVerifyUpdate(ctx.get(), data.data(), data.size()) <= 0 ||
-      EVP_DigestVerifyFinal(ctx.get(),
-                            reinterpret_cast<const uint8_t*>(signature.data()),
-                            signature.size()) <= 0) {
-    LOG(ERROR) << "Signed blobs did not match.";
-    return false;
-  }
-  return true;
-}
-
 bool EncryptByteString(const std::vector<uint8_t>& pub_key_der,
                        const std::string& data,
                        std::vector<uint8_t>* encrypted_output) {