Rename ServerBoundCert => ChannelID to reflect the current name

net/cert/x509_util_nss.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/cert/x509_util.h"
 #include "net/cert/x509_util_nss.h"
 
 #include <cert.h>  // Must be included before certdb.h
 #include <certdb.h>
 #include <cryptohi.h>
@@ skipping 15 matching lines @@
 #include "crypto/nss_util_internal.h"
 #include "crypto/rsa_private_key.h"
 #include "crypto/scoped_nss_types.h"
 #include "crypto/third_party/nss/chromium-nss.h"
 #include "net/cert/x509_certificate.h"
 
 namespace net {
 
 namespace {
 
-class DomainBoundCertOIDWrapper {
+class ChannelIDOIDWrapper {
  public:
-  static DomainBoundCertOIDWrapper* GetInstance() {
+  static ChannelIDOIDWrapper* GetInstance() {
     // Instantiated as a leaky singleton to allow the singleton to be
     // constructed on a worker thead that is not joined when a process
     // shuts down.
-    return Singleton<DomainBoundCertOIDWrapper,
-                     LeakySingletonTraits<DomainBoundCertOIDWrapper> >::get();
+    return Singleton<ChannelIDOIDWrapper,
+                     LeakySingletonTraits<ChannelIDOIDWrapper> >::get();
   }
 
   SECOidTag domain_bound_cert_oid_tag() const {
     return domain_bound_cert_oid_tag_;
   }
 
  private:
-  friend struct DefaultSingletonTraits<DomainBoundCertOIDWrapper>;
+  friend struct DefaultSingletonTraits<ChannelIDOIDWrapper>;
 
-  DomainBoundCertOIDWrapper();
+  ChannelIDOIDWrapper();
 
   SECOidTag domain_bound_cert_oid_tag_;

[wtc, 2014/07/01 19:50:52]

Note: it is fine to not rename this member because it is referring to an
origin-bound certificate OID (object identifier).

[Ryan Hamilton, 2014/07/21 19:12:08]

Acknowledged.

 
-  DISALLOW_COPY_AND_ASSIGN(DomainBoundCertOIDWrapper);
+  DISALLOW_COPY_AND_ASSIGN(ChannelIDOIDWrapper);
 };
 
-DomainBoundCertOIDWrapper::DomainBoundCertOIDWrapper()
+ChannelIDOIDWrapper::ChannelIDOIDWrapper()
     : domain_bound_cert_oid_tag_(SEC_OID_UNKNOWN) {
   // 1.3.6.1.4.1.11129.2.1.6
   // (iso.org.dod.internet.private.enterprises.google.googleSecurity.
   //  certificateExtensions.originBoundCertificate)
   static const uint8 kObCertOID[] = {
     0x2b, 0x06, 0x01, 0x04, 0x01, 0xd6, 0x79, 0x02, 0x01, 0x06
   };
   SECOidData oid_data;
   memset(&oid_data, 0, sizeof(oid_data));
   oid_data.oid.data = const_cast<uint8*>(kObCertOID);
@@ skipping 213 matching lines @@
       crypto::BaseTimeToPRTime(not_valid_before),
       crypto::BaseTimeToPRTime(not_valid_after));
 
   if (!validity)
     return false;
 
   CERT_DestroyValidity(validity);
   return true;
 }
 
-bool CreateDomainBoundCertEC(crypto::ECPrivateKey* key,
+bool CreateChannelIDEC(crypto::ECPrivateKey* key,
                              DigestAlgorithm alg,
                              const std::string& domain,
                              uint32 serial_number,
                              base::Time not_valid_before,
                              base::Time not_valid_after,
                              std::string* der_cert) {

[wtc, 2014/07/01 19:50:52]

Fix the indentation of the parameters.

[Ryan Hamilton, 2014/07/21 19:12:08]

Done.

   DCHECK(key);
 
   CERTCertificate* cert = CreateCertificate(key->public_key(),
                                             "CN=anonymous.invalid",
                                             serial_number,
                                             not_valid_before,
                                             not_valid_after);
 
   if (!cert)
     return false;
@@ skipping 20 matching lines @@
   if (asn1_domain_string == NULL) {
     LOG(ERROR) << "Unable to get ASN1 encoding for domain in domain_bound_cert"
                   " extension";
     CERT_DestroyCertificate(cert);
     return false;
   }
 
   // Add the extension to the opaque handle
   if (CERT_AddExtension(
       cert_handle,
-      DomainBoundCertOIDWrapper::GetInstance()->domain_bound_cert_oid_tag(),
+      ChannelIDOIDWrapper::GetInstance()->domain_bound_cert_oid_tag(),
       asn1_domain_string,
       PR_TRUE,
       PR_TRUE) != SECSuccess){
     LOG(ERROR) << "Unable to add domain bound cert extension to opaque handle";
     CERT_DestroyCertificate(cert);
     return false;
   }
 
   // Copy extension into x509 cert
   if (CERT_FinishExtensions(cert_handle) != SECSuccess){
@@ skipping 277 matching lines @@
   }
 
   return new_name;
 }
 
 #endif  // defined(USE_NSS) || defined(OS_IOS)
 
 } // namespace x509_util
 
 } // namespace net