NSS: Handle unfriendly tokens in client auth.

net/ssl/client_cert_store_impl.h

Index: net/ssl/client_cert_store_impl.h
diff --git a/net/ssl/client_cert_store_impl.h b/net/ssl/client_cert_store_impl.h
index ff2759e06677acd0e41c333360c2f0a555a8aeb5..5abb8a95032a75a86a00f6b71484e057b0893ea0 100644
--- a/net/ssl/client_cert_store_impl.h
+++ b/net/ssl/client_cert_store_impl.h
@@ -6,23 +6,35 @@
 #define NET_SSL_CLIENT_CERT_STORE_IMPL_H_
 
 #include "base/basictypes.h"
+#include "base/callback.h"
 #include "base/gtest_prod_util.h"
 #include "net/base/net_export.h"
 #include "net/ssl/client_cert_store.h"
 #include "net/ssl/ssl_cert_request_info.h"
 
+namespace crypto {
+class CryptoModuleBlockingPasswordDelegate;
+}
+
 namespace net {
 
 class NET_EXPORT ClientCertStoreImpl : public ClientCertStore {
  public:
-  ClientCertStoreImpl() {}
-  virtual ~ClientCertStoreImpl() {}
+  ClientCertStoreImpl();
+  virtual ~ClientCertStoreImpl();
 
   // ClientCertStore:
   virtual void GetClientCerts(const SSLCertRequestInfo& cert_request_info,
                               CertificateList* selected_certs,
                               const base::Closure& callback) OVERRIDE;
 
+#if defined(USE_NSS)
+  typedef base::Callback<crypto::CryptoModuleBlockingPasswordDelegate*(
+      const std::string&)> PasswordDelegateFactory;

[Ryan Sleevi, 2013/11/26 19:59:03]

Can you include a documentation note about what this callback (and the
associated parameter)

[mattm, 2013/11/26 21:49:14]

Done.

+  void set_password_delegate_factory(

[Ryan Sleevi, 2013/11/26 19:59:03]

style: Shouldn't this be SetPasswordDelegateFactory

[mattm, 2013/11/26 21:49:14]

Style guide says that simple setters & getters use the lower_underscore style:
http://google-styleguide.googlecode.com/svn/trunk/cppguide.xml#Function_Names

+      const PasswordDelegateFactory& password_delegate_factory);
+#endif
+
  private:
   friend class ClientCertStoreImplTest;
 
@@ -50,6 +62,12 @@ class NET_EXPORT ClientCertStoreImpl : public ClientCertStore {
       CertificateList* selected_certs);
 #endif
 
+#if defined(USE_NSS)
+  // The factory for creating the delegate for requesting a password to a
+  // PKCS#11 token. May be null.
+  PasswordDelegateFactory password_delegate_factory_;
+#endif  // defined(USE_NSS)
+
   DISALLOW_COPY_AND_ASSIGN(ClientCertStoreImpl);
 };