Remove certificates from Channel ID

net/ssl/default_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_DEFAULT_CHANNEL_ID_STORE_H_
 #define NET_SSL_DEFAULT_CHANNEL_ID_STORE_H_
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/callback_forward.h"
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/memory/weak_ptr.h"
 #include "net/base/net_export.h"
 #include "net/ssl/channel_id_store.h"
 
+namespace crypto {
+class ECPrivateKey;
+}  // namespace crypto
+
 namespace net {
 
 // This class is the system for storing and retrieving server bound certs.
 // Modeled after the CookieMonster class, it has an in-memory cert store,
 // and synchronizes server bound certs to an optional permanent storage that
 // implements the PersistentStore interface. The use case is described in
 // http://balfanz.github.com/tls-obc-spec/draft-balfanz-tls-obc-00.html
 // TODO(wtc): Update this comment.
 class NET_EXPORT DefaultChannelIDStore : public ChannelIDStore {
  public:
   class PersistentStore;
 
   // The key for each ChannelID* in ChannelIDMap is the
   // corresponding server.
   typedef std::map<std::string, ChannelID*> ChannelIDMap;
 
   // The store passed in should not have had Init() called on it yet. This
   // class will take care of initializing it. The backing store is NOT owned by
   // this class, but it must remain valid for the duration of the
   // DefaultChannelIDStore's existence. If |store| is NULL, then no
   // backing store will be updated.
   explicit DefaultChannelIDStore(PersistentStore* store);
 
   ~DefaultChannelIDStore() override;
 
   // ChannelIDStore implementation.
   int GetChannelID(const std::string& server_identifier,
-                   base::Time* expiration_time,
-                   std::string* private_key_result,
-                   std::string* cert_result,
+                   scoped_ptr<crypto::ECPrivateKey>* key_result,
                    const GetChannelIDCallback& callback) override;
-  void SetChannelID(const std::string& server_identifier,
-                    base::Time creation_time,
-                    base::Time expiration_time,
-                    const std::string& private_key,
-                    const std::string& cert) override;
+  void SetChannelID(scoped_ptr<ChannelID> channel_id) override;
   void DeleteChannelID(const std::string& server_identifier,
                        const base::Closure& callback) override;
   void DeleteAllCreatedBetween(base::Time delete_begin,
                                base::Time delete_end,
                                const base::Closure& callback) override;
   void DeleteAll(const base::Closure& callback) override;
   void GetAllChannelIDs(const GetChannelIDListCallback& callback) override;
   int GetChannelIDCount() override;
   void SetForceKeepSessionState() override;
 
@@ skipping 26 matching lines @@
 
   // Initializes the backing store and reads existing certs from it.
   // Should only be called by InitIfNecessary().
   void InitStore();
 
   // Callback for backing store loading completion.
   void OnLoaded(scoped_ptr<ScopedVector<ChannelID> > certs);
 
   // Syncronous methods which do the actual work. Can only be called after
   // initialization is complete.
-  void SyncSetChannelID(
-      const std::string& server_identifier,
-      base::Time creation_time,
-      base::Time expiration_time,
-      const std::string& private_key,
-      const std::string& cert);
+  void SyncSetChannelID(scoped_ptr<ChannelID> channel_id);
   void SyncDeleteChannelID(const std::string& server_identifier);
   void SyncDeleteAllCreatedBetween(base::Time delete_begin,
                                    base::Time delete_end);
   void SyncGetAllChannelIDs(ChannelIDList* channel_id_list);
 
   // Add |task| to |waiting_tasks_|.
   void EnqueueTask(scoped_ptr<Task> task);
   // If already initialized, run |task| immediately. Otherwise add it to
   // |waiting_tasks_|.
   void RunOrEnqueueTask(scoped_ptr<Task> task);
 
   // Deletes the channel id for the specified server, if such a channel id
   // exists, from the in-memory store. Deletes it from |store_| if |store_|
   // is not NULL.
   void InternalDeleteChannelID(const std::string& server);
 
-  // Takes ownership of *channel_id.
-  // Adds the channel id for the specified server to the in-memory store.
-  // Deletes it from |store_| if |store_| is not NULL.
-  void InternalInsertChannelID(const std::string& server_identifier,
-                               ChannelID* channel_id);
+  // Adds the channel id to the in-memory store and adds it to |store_| if
+  // |store_| is not NULL.
+  void InternalInsertChannelID(scoped_ptr<ChannelID> channel_id);
 
   // Indicates whether the channel id store has been initialized. This happens
   // lazily in InitIfNecessary().
   bool initialized_;
 
   // Indicates whether loading from the backend store is completed and
   // calls may be immediately processed.
   bool loaded_;
 
   // Tasks that are waiting to be run once we finish loading.
@@ skipping 38 matching lines @@
   PersistentStore();
   virtual ~PersistentStore();
 
  private:
   DISALLOW_COPY_AND_ASSIGN(PersistentStore);
 };
 
 }  // namespace net
 
 #endif  // NET_SSL_DEFAULT_CHANNEL_ID_STORE_H_