Reduce buggy usage of the registry controlled domain service.

net/cert/x509_certificate.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_certificate.h"
 
 #include <limits.h>
 #include <stdlib.h>
 
 #include <algorithm>
@@ skipping 533 matching lines @@
     // Do not allow wildcards for public/ICANN registry controlled domains -
     // that is, prevent *.com or *.co.uk as valid presented names, but do not
     // prevent *.appspot.com (a private registry controlled domain).
     // In addition, unknown top-level domains (such as 'intranet' domains or
     // new TLDs/gTLDs not yet added to the registry controlled domain dataset)
     // are also implicitly prevented.
     // Because |reference_domain| must contain at least one name component that
     // is not registry controlled, this ensures that all reference domains
     // contain at least three domain components when using wildcards.
     size_t registry_length =
-        registry_controlled_domains::GetRegistryLength(
+        registry_controlled_domains::GetCanonicalHostRegistryLength(
             reference_name,
             registry_controlled_domains::INCLUDE_UNKNOWN_REGISTRIES,
             registry_controlled_domains::EXCLUDE_PRIVATE_REGISTRIES);
 
     // Because |reference_name| was already canonicalized, the following
     // should never happen.
     CHECK_NE(std::string::npos, registry_length);
 
     // Account for the leading dot in |reference_domain|.
     bool is_registry_controlled =
@@ skipping 147 matching lines @@
     RemoveFromCache(cert_handle_);
     FreeOSCertHandle(cert_handle_);
   }
   for (size_t i = 0; i < intermediate_ca_certs_.size(); ++i) {
     RemoveFromCache(intermediate_ca_certs_[i]);
     FreeOSCertHandle(intermediate_ca_certs_[i]);
   }
 }
 
 }  // namespace net