Remove certificates from Channel ID

net/cert/x509_util_openssl_unittest.cc

Index: net/cert/x509_util_openssl_unittest.cc
diff --git a/net/cert/x509_util_openssl_unittest.cc b/net/cert/x509_util_openssl_unittest.cc
index 070fba4da126a5f15281e1c742e91b75610b38c6..3e4f41a2bbb5f8773b177d279f21ae4e050f741a 100644
--- a/net/cert/x509_util_openssl_unittest.cc
+++ b/net/cert/x509_util_openssl_unittest.cc
@@ -13,79 +13,6 @@
 
 namespace net {
 
-namespace {
-
-// Verify that a given certificate was signed with the private key corresponding
-// to a given public key.
-// |der_cert| is the DER-encoded X.509 certificate.
-// |der_spki| is the DER-encoded public key of the signer.
-void VerifyCertificateSignature(const std::string& der_cert,
-                                const std::vector<uint8>& der_spki) {
-  const unsigned char* cert_data =
-      reinterpret_cast<const unsigned char*>(der_cert.data());
-  int cert_data_len = static_cast<int>(der_cert.size());
-  ScopedX509 cert(d2i_X509(NULL, &cert_data, cert_data_len));
-  ASSERT_TRUE(cert.get());
-
-  // NOTE: SignatureVerifier wants the DER-encoded ASN.1 AlgorithmIdentifier
-  // but there is no OpenSSL API to extract it from an X509 object (!?)
-  // Use X509_verify() directly instead, which takes an EVP_PKEY.
-  const unsigned char* pub_key_data = &der_spki.front();
-  int pub_key_len = static_cast<int>(der_spki.size());
-  crypto::ScopedEVP_PKEY pub_key(d2i_PUBKEY(NULL, &pub_key_data, pub_key_len));
-  ASSERT_TRUE(pub_key.get());
-
-  // NOTE: X509_verify() returns 1 in case of succes, 0 or -1 on error.
-  EXPECT_EQ(1, X509_verify(cert.get(), pub_key.get()));
-}
-
-// Verify the attributes of a domain-bound certificate.
-// |domain| is the bound domain name.
-// |der_cert| is the DER-encoded X.509 certificate.
-void VerifyChannelID(const std::string& domain,
-                     const std::string& der_cert) {
-  // Origin Bound Cert OID.
-  static const char oid_string[] = "1.3.6.1.4.1.11129.2.1.6";
-  crypto::ScopedOpenSSL<ASN1_OBJECT, ASN1_OBJECT_free> oid_obj(
-      OBJ_txt2obj(oid_string, 0));
-  ASSERT_TRUE(oid_obj.get());
-
-  const unsigned char* cert_data =
-      reinterpret_cast<const unsigned char*>(der_cert.data());
-  int cert_data_len = static_cast<int>(der_cert.size());
-  ScopedX509 cert(d2i_X509(NULL, &cert_data, cert_data_len));
-  ASSERT_TRUE(cert.get());
-
-  // Find the extension.
-  int ext_pos = X509_get_ext_by_OBJ(cert.get(), oid_obj.get(), -1);
-  ASSERT_NE(-1, ext_pos);
-  X509_EXTENSION* ext = X509_get_ext(cert.get(), ext_pos);
-  ASSERT_TRUE(ext);
-
-  // Check its value, it must be an ASN.1 IA5STRING
-  // Which means <tag> <length> <domain>, with:
-  // <tag> == 22
-  // <length> is the domain length, a single byte for short forms.
-  // <domain> are the domain characters.
-  // See http://en.wikipedia.org/wiki/X.690
-  ASN1_STRING* value_asn1 = X509_EXTENSION_get_data(ext);
-  ASSERT_TRUE(value_asn1);
-  std::string value_str(reinterpret_cast<const char*>(value_asn1->data),
-                        value_asn1->length);
-
-  // Check that the domain size is small enough for short form.
-  ASSERT_LE(domain.size(), 127U) << "Domain is too long!";
-  std::string value_expected;
-  value_expected.resize(2);
-  value_expected[0] = 22;
-  value_expected[1] = static_cast<char>(domain.size());
-  value_expected += domain;
-
-  EXPECT_EQ(value_expected, value_str);
-}
-
-}  // namespace
-
 TEST(X509UtilOpenSSLTest, IsSupportedValidityRange) {
   base::Time now = base::Time::Now();
   EXPECT_TRUE(x509_util::IsSupportedValidityRange(now, now));
@@ -111,29 +38,4 @@ TEST(X509UtilOpenSSLTest, IsSupportedValidityRange) {
   EXPECT_FALSE(x509_util::IsSupportedValidityRange(too_late, too_late));
 }
 
-TEST(X509UtilOpenSSLTest, CreateChannelIDEC) {
-  // Create a sample ASCII weborigin.
-  std::string domain = "weborigin.com";
-  base::Time now = base::Time::Now();
-
-  scoped_ptr<crypto::ECPrivateKey> private_key(
-      crypto::ECPrivateKey::Create());
-  std::string der_cert;
-  ASSERT_TRUE(
-      x509_util::CreateChannelIDEC(private_key.get(),
-                                   x509_util::DIGEST_SHA1,
-                                   domain,
-                                   1,
-                                   now,
-                                   now + base::TimeDelta::FromDays(1),
-                                   &der_cert));
-
-  VerifyChannelID(domain, der_cert);
-
-  // signature_verifier_win and signature_verifier_mac can't handle EC certs.
-  std::vector<uint8> spki;
-  ASSERT_TRUE(private_key->ExportPublicKey(&spki));
-  VerifyCertificateSignature(der_cert, spki);
-}
-
 }  // namespace net