chrome.platformKeys: Add filtering by certificate types

chrome/browser/chromeos/platform_keys/platform_keys.h

 // Copyright 2014 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_PLATFORM_KEYS_PLATFORM_KEYS_H_
 #define CHROME_BROWSER_CHROMEOS_PLATFORM_KEYS_PLATFORM_KEYS_H_
 
 #include <string>
 #include <vector>
 
 #include "base/callback_forward.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "net/cert/x509_certificate.h"
-#include "net/ssl/ssl_client_cert_type.h"
 
 namespace content {
 class BrowserContext;
 }
 
 namespace chromeos {
 
 namespace platform_keys {
 
 // A token is a store for keys or certs and can provide cryptographic
@@ skipping 13 matching lines @@
   HASH_ALGORITHM_SHA384,
   HASH_ALGORITHM_SHA512
 };
 
 struct ClientCertificateRequest {
   ClientCertificateRequest();
   ~ClientCertificateRequest();
 
   // The list of the types of certificates requested, sorted in order of the
   // server's preference.
-  std::vector<net::SSLClientCertType> certificate_key_types;
+  std::vector<net::X509Certificate::PublicKeyType> certificate_key_types;
 
   // List of distinguished names of certificate authorities allowed by the
   // server. Each entry must be a DER-encoded X.509 DistinguishedName.
   std::vector<std::string> certificate_authorities;
 };
 
 namespace subtle {
 // Functions of this namespace shouldn't be called directly from the context of
 // an extension. Instead use PlatformKeysService which enforces restrictions
 // upon extensions.
@@ skipping 37 matching lines @@
                      content::BrowserContext* browser_context);
 
 // If the certificate request could be processed successfully, |matches| will
 // contain the list of matching certificates (which may be empty) and
 // |error_message| will be empty. If an error occurred, |matches| will be null
 // and |error_message| contain an error message.
 typedef base::Callback<void(scoped_ptr<net::CertificateList> matches,
                             const std::string& error_message)>
     SelectCertificatesCallback;
 
-// Returns the list of all certificates that match |request|. |callback| will be
-// invoked with these matches or an error message.
-void SelectClientCertificates(const ClientCertificateRequest& request,
-                              const SelectCertificatesCallback& callback,
-                              content::BrowserContext* browser_context);
+// Returns the list of all certificates that were issued by one of the
+// |certificate_authorities|. If |certificate_authorities| is empty, all
+// certificates will be returned. |callback| will be invoked with the matches or
+// an error message.
+void SelectClientCertificates(
+    const std::vector<std::string>& certificate_authorities,
+    const SelectCertificatesCallback& callback,
+    content::BrowserContext* browser_context);
 
 }  // namespace subtle
 
 // Returns the DER encoding of the X.509 Subject Public Key Info of the public
 // key in |certificate|.
 std::string GetSubjectPublicKeyInfo(
     const scoped_refptr<net::X509Certificate>& certificate);
 
 // Obtains information about the public key in |certificate|.
 // If |certificate| contains an RSA key, sets |key_size_bits| to the modulus
@@ skipping 62 matching lines @@
 // of available tokens is determined, possibly with an error message.
 // Must be called and calls |callback| on the UI thread.
 void GetTokens(const GetTokensCallback& callback,
                content::BrowserContext* browser_context);
 
 }  // namespace platform_keys
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_PLATFORM_KEYS_PLATFORM_KEYS_H_