SSLCertRequestInfo: Add |valid_cas| and |valid_key_types|

net/base/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/base/x509_certificate.h"
 
 #include <stdlib.h>
 
 #include <algorithm>
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/base64.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/memory/singleton.h"
 #include "base/metrics/histogram.h"
 #include "base/pickle.h"
 #include "base/sha1.h"
 #include "base/string_piece.h"
 #include "base/string_util.h"
 #include "base/synchronization/lock.h"
 #include "base/time.h"
 #include "googleurl/src/url_canon_ip.h"
 #include "net/base/net_util.h"
 #include "net/base/pem_tokenizer.h"
+#include "net/base/ssl_cert_request_info.h"
+#include "net/base/x509_cert_types.h"
 
 namespace net {
 
 namespace {
 
 // Indicates the order to use when trying to decode binary data, which is
 // based on (speculation) as to what will be most common -> least common
 const X509Certificate::Format kFormatDecodePriority[] = {
   X509Certificate::FORMAT_SINGLE_CERTIFICATE,
   X509Certificate::FORMAT_PKCS7
@@ skipping 653 matching lines @@
   if (cert_handle_) {
     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]);
   }
 }
 
+#if !defined(USE_OPENSSL)
+bool X509Certificate::IsValidClientCertificate(
+    const SSLCertRequestInfo& cert_info) {
+  DCHECK(cert_info.no_client_certs == false);

[Ryan Sleevi, 2012/12/11 21:30:24]

While this impl is NACKed, as a style nit, this DCHECK style is discouraged.

DCHECK_EQ(false, cert_info.no_client_certs)

which quickly reveals it's better as

DCHECK(!cert_info.no_client_certs);

[digit1, 2012/12/11 23:05:31]

Oh thanks, point taken, will do.

+
+  // Check that the current certificate matches the critera supplied in
+  // a CertificateRequest message.
+  const std::vector<scoped_refptr<X509Certificate> >& client_certs =
+      cert_info.client_certs;
+  for (size_t i = 0; i < client_certs.size(); ++i) {
+    if (Equals(client_certs[i])) {
+      return true;
+    }
+  }
+  return false;
+#endif  // !USE_OPENSSL
+
 }  // namespace net