Change Origin bound certs -> Domain bound certs.

net/base/x509_util_nss_unittest.cc

 // 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.
 
 #include "net/base/x509_util.h"
 #include "net/base/x509_util_nss.h"
 
 #include <cert.h>
 #include <secoid.h>
 
@@ skipping 56 matching lines @@
       der_spki.size());
 
   ASSERT_TRUE(ok);
   verifier.VerifyUpdate(sd.data.data,
                         sd.data.len);
 
   ok = verifier.VerifyFinal();
   EXPECT_TRUE(ok);
 }
 
-void VerifyOriginBoundCert(const std::string& origin,
+void VerifyServerBoundCert(const std::string& server,

[wtc, 2012/03/15 23:46:38]

I believe in this file we should be referring to domain
bound certs.

[mattm, 2012/03/16 22:22:00]

Done.

                            const std::string& der_cert) {
   // Origin Bound Cert OID.
   static const char oid_string[] = "1.3.6.1.4.1.11129.2.1.6";
 
   // Create object neccessary for extension lookup call.
   SECItem extension_object = {
     siAsciiString,
-    (unsigned char*)origin.data(),
-    origin.size()
+    (unsigned char*)server.data(),
+    server.size()
   };
 
   // IA5Encode and arena allocate SECItem.
   PLArenaPool* arena = PORT_NewArena(DER_DEFAULT_CHUNKSIZE);
   SECItem* expected = SEC_ASN1EncodeItem(arena,
                                          NULL,
                                          &extension_object,
                                          SEC_ASN1_GET(SEC_IA5StringTemplate));
 
   ASSERT_NE(static_cast<SECItem*>(NULL), expected);
@@ skipping 35 matching lines @@
   PRBool result = SECITEM_ItemsAreEqual(expected, &actual);
   ASSERT_TRUE(result);
 
   // Do Cleanup.
   SECITEM_FreeItem(&actual, PR_FALSE);
   PORT_FreeArena(arena, PR_FALSE);
 }
 
 }  // namespace
 
-// This test creates an origin-bound cert from an EC private key and
+// This test creates a server-bound cert from an EC private key and
 // then verifies the content of the certificate.
-TEST(X509UtilNSSTest, CreateOriginBoundCertEC) {
+TEST(X509UtilNSSTest, CreateServerBoundCertEC) {
   // Create a sample ASCII weborigin.
-  std::string origin = "http://weborigin.com:443";
+  std::string server = "http://weborigin.com:443";
   base::Time now = base::Time::Now();
 
   scoped_ptr<crypto::ECPrivateKey> private_key(
       crypto::ECPrivateKey::Create());
   std::string der_cert;
-  ASSERT_TRUE(x509_util::CreateOriginBoundCertEC(
+  ASSERT_TRUE(x509_util::CreateServerBoundCertEC(
       private_key.get(),
-      origin, 1,
+      server, 1,
       now,
       now + base::TimeDelta::FromDays(1),
       &der_cert));
 
-  VerifyOriginBoundCert(origin, der_cert);
+  VerifyServerBoundCert(server, der_cert);
 
 #if !defined(OS_WIN) && !defined(OS_MACOSX)
   // 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);
 #endif
 }
 
 }  // namespace net