CrOS - Add certificate support to VPN UI.

chrome/browser/chromeos/cros/network_library.h

 // Copyright (c) 2011 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_CROS_NETWORK_LIBRARY_H_
 #define CHROME_BROWSER_CHROMEOS_CROS_NETWORK_LIBRARY_H_
 #pragma once
 
 #include <string>
 #include <vector>
@@ skipping 416 matching lines @@
     PROVIDER_TYPE_OPEN_VPN,
     // Add new provider types before PROVIDER_TYPE_MAX.
     PROVIDER_TYPE_MAX,
   };
 
   explicit VirtualNetwork(const std::string& service_path);
   ~VirtualNetwork();
 
   const std::string& server_hostname() const { return server_hostname_; }
   ProviderType provider_type() const { return provider_type_; }
-  const std::string& ca_cert() const { return ca_cert_; }
+  const std::string& ca_cert_nss() const { return ca_cert_nss_; }
   const std::string& psk_passphrase() const { return psk_passphrase_; }
-  const std::string& user_cert() const { return user_cert_; }
-  const std::string& user_cert_key() const { return user_cert_key_; }
+  const std::string& client_cert_id() const { return client_cert_id_; }
   const std::string& username() const { return username_; }
   const std::string& user_passphrase() const { return user_passphrase_; }
 
   bool NeedMoreInfoToConnect() const;
 
   // Public setters.
-  void SetCACert(const std::string& ca_cert);
+  void SetCACertNSS(const std::string& ca_cert_nss);
   void SetPSKPassphrase(const std::string& psk_passphrase);
-  void SetUserCert(const std::string& user_cert);
-  void SetUserCertKey(const std::string& key);
+  void SetClientCertID(const std::string& cert_id);
   void SetUsername(const std::string& username);
   void SetUserPassphrase(const std::string& user_passphrase);
 
   std::string GetProviderTypeString() const;
 
  private:
   // Network overrides.
   virtual bool ParseValue(int index, const Value* value);
   virtual void ParseInfo(const DictionaryValue* info);
 
   // VirtualNetwork private methods.
   bool ParseProviderValue(int index, const Value* value);
 
   void set_server_hostname(const std::string& server_hostname) {
     server_hostname_ = server_hostname;
   }
   void set_provider_type(ProviderType provider_type) {
     provider_type_ = provider_type;
   }
-  void set_ca_cert(const std::string& ca_cert) {
-    ca_cert_ = ca_cert;
+  void set_ca_cert_nss(const std::string& ca_cert_nss) {
+    ca_cert_nss_ = ca_cert_nss;
   }
   void set_psk_passphrase(const std::string& psk_passphrase) {
     psk_passphrase_ = psk_passphrase;
   }
-  void set_user_cert(const std::string& user_cert) {
-    user_cert_ = user_cert;
-  }
-  void set_user_cert_key(const std::string& key) {
-    user_cert_key_ = key;
+  void set_client_cert_id(const std::string& client_cert_id) {
+    client_cert_id_ = client_cert_id;
   }
   void set_username(const std::string& username) {
     username_ = username;
   }
   void set_user_passphrase(const std::string& user_passphrase) {
     user_passphrase_ = user_passphrase;
   }
 
   std::string server_hostname_;
   ProviderType provider_type_;
-  std::string ca_cert_;
+  // NSS nickname for server CA certificate.
+  std::string ca_cert_nss_;
   std::string psk_passphrase_;
-  std::string user_cert_;
-  std::string user_cert_key_;
+  // PKCS#11 ID for client certificate.
+  std::string client_cert_id_;
   std::string username_;
   std::string user_passphrase_;
 
   friend class NetworkLibraryImpl;
   DISALLOW_COPY_AND_ASSIGN(VirtualNetwork);
 };
 typedef std::vector<VirtualNetwork*> VirtualNetworkVector;
 
 // Base class for networks of TYPE_WIFI or TYPE_CELLULAR.
 class WirelessNetwork : public Network {
@@ skipping 593 matching lines @@
 
   // Connect to the specified virtual network with service name,
   // server hostname, provider_type, PSK passphrase, username and passphrase.
   virtual void ConnectToVirtualNetworkPSK(
       const std::string& service_name,
       const std::string& server_hostname,
       const std::string& psk,
       const std::string& username,
       const std::string& user_passphrase) = 0;
 
+  // Connect to a virtual network with user certificate information.
+  // TODO(jamescook): Convert both this and above to take a struct of
+  // configuration information.
+  virtual void ConnectToVirtualNetworkCert(
+      const std::string& service_name,
+      const std::string& server_hostname,
+      const std::string& client_cert_id,
+      const std::string& username,
+      const std::string& user_passphrase) = 0;
+
   // Disconnect from the specified network.
   virtual void DisconnectFromNetwork(const Network* network) = 0;
 
   // Forget the wifi network corresponding to service_path.
   virtual void ForgetWifiNetwork(const std::string& service_path) = 0;
 
   // Returns home carrier ID if available, otherwise empty string is returned.
   // Carrier ID format: <carrier name> (country). Ex.: "Verizon (us)".
   virtual std::string GetCellularHomeCarrierId() const = 0;
 
@@ skipping 34 matching lines @@
       HardwareAddressFormat) = 0;
 
   // Factory function, creates a new instance and returns ownership.
   // For normal usage, access the singleton via CrosLibrary::Get().
   static NetworkLibrary* GetImpl(bool stub);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_CROS_NETWORK_LIBRARY_H_