Join Wi-Fi network dialog lists user and server-CA certificates.

- Fixed width of server CA combobox, as it can be very wide.
- Introduced WifiConfigModel to hold cert info for WifiConfigView.
- Send user cert to flimflam by PKCS#11 ID
- Send server CA cert to flimflam by nickname

BUG=chromium-os:11412
TEST=Make successful connection to 802.1x network.


Review URL: http://codereview.chromium.org/6693083

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81498 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 6 insertions, 0 deletions

diff --git a/chrome/common/net/x509_certificate_model.h b/chrome/common/net/x509_certificate_model.h
index f19ecb2..0c4806d 100644
--- a/chrome/common/net/x509_certificate_model.h
+++ b/chrome/common/net/x509_certificate_model.h
@@ -20,6 +20,8 @@ namespace x509_certificate_model {
 std::string GetCertNameOrNickname(
     net::X509Certificate::OSCertHandle cert_handle);
 
+std::string GetNickname(net::X509Certificate::OSCertHandle cert_handle);
+
 std::string GetTokenName(net::X509Certificate::OSCertHandle cert_handle);
 
 std::string GetVersion(net::X509Certificate::OSCertHandle cert_handle);
@@ -77,6 +79,10 @@ void GetNicknameStringsFromCertList(const net::CertificateList& certs,
                                     const std::string& cert_not_yet_valid,
                                     std::vector<std::string>* nick_names);
 
+// Returns the PKCS#11 attribute CKA_ID for a certificate as an upper-case
+// hex string, or the empty string if none is found.
+std::string GetPkcs11Id(net::X509Certificate::OSCertHandle cert_handle);
+
 struct Extension {
   std::string name;
   std::string value;