Remove certificates from Channel ID

net/ssl/channel_id_store.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 NET_SSL_CHANNEL_ID_STORE_H_
 #define NET_SSL_CHANNEL_ID_STORE_H_
 
 #include <list>
 #include <string>
 
@@ skipping 14 matching lines @@
 // for deleting it.
 class NET_EXPORT ChannelIDStore
     : NON_EXPORTED_BASE(public base::NonThreadSafe) {
  public:
   // The ChannelID class contains a private key in addition to the cert.
   class NET_EXPORT ChannelID {
    public:
     ChannelID();
     ChannelID(const std::string& server_identifier,
               base::Time creation_time,
-              base::Time expiration_time,
               const std::string& private_key,
-              const std::string& cert);
+              const std::string& public_key);
     ~ChannelID();
 
     // Server identifier.  For domain bound certs, for instance "verisign.com".
     const std::string& server_identifier() const { return server_identifier_; }
-    // The time the certificate was created, also the start of the certificate
-    // validity period.
+    // The time the certificate was created.

[mattm, 2015/04/10 01:00:28]

key

[nharper, 2015/04/25 02:59:19]

Done.

     base::Time creation_time() const { return creation_time_; }
-    // The time after which this certificate is no longer valid.
-    base::Time expiration_time() const { return expiration_time_; }
     // The encoding of the private key depends on the type.
     // rsa_sign: DER-encoded PrivateKeyInfo struct.
     // ecdsa_sign: DER-encoded EncryptedPrivateKeyInfo struct.
     const std::string& private_key() const { return private_key_; }
-    // DER-encoded certificate.
-    const std::string& cert() const { return cert_; }
+    // DER-encoded public key.
+    const std::string& public_key() const { return public_key_; }
 
    private:
     std::string server_identifier_;
     base::Time creation_time_;
-    base::Time expiration_time_;
     std::string private_key_;
-    std::string cert_;
+    std::string public_key_;
   };
 
   typedef std::list<ChannelID> ChannelIDList;
 
   typedef base::Callback<void(
       int,
       const std::string&,
-      base::Time,
       const std::string&,
       const std::string&)> GetChannelIDCallback;
   typedef base::Callback<void(const ChannelIDList&)> GetChannelIDListCallback;
 
   virtual ~ChannelIDStore() {}
 
   // GetChannelID may return the result synchronously through the
   // output parameters, in which case it will return either OK if a cert is
   // found in the store, or ERR_FILE_NOT_FOUND if none is found.  If the
   // result cannot be returned synchronously, GetChannelID will
   // return ERR_IO_PENDING and the callback will be called with the result
   // asynchronously.
   virtual int GetChannelID(
       const std::string& server_identifier,
-      base::Time* expiration_time,
       std::string* private_key_result,
       std::string* cert_result,
       const GetChannelIDCallback& callback) = 0;
 
   // Adds a server bound cert and the corresponding private key to the store.
   virtual void SetChannelID(
       const std::string& server_identifier,
       base::Time creation_time,
-      base::Time expiration_time,
       const std::string& private_key,
       const std::string& cert) = 0;
 
   // Removes a server bound cert and the corresponding private key from the
   // store.
   virtual void DeleteChannelID(
       const std::string& server_identifier,
       const base::Closure& completion_callback) = 0;
 
   // Deletes all of the server bound certs that have a creation_date greater
@@ skipping 20 matching lines @@
   virtual int GetChannelIDCount() = 0;
 
   // When invoked, instructs the store to keep session related data on
   // destruction.
   virtual void SetForceKeepSessionState() = 0;
 };
 
 }  // namespace net
 
 #endif  // NET_SSL_CHANNEL_ID_STORE_H_