Support EC certs in OriginBoundCertService and OriginBoundCertStore.

net/base/origin_bound_cert_store.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 NET_BASE_ORIGIN_BOUND_CERT_STORE_H_
 #define NET_BASE_ORIGIN_BOUND_CERT_STORE_H_
 #pragma once
 
 #include <string>
 #include <vector>
 
 #include "net/base/net_export.h"
+#include "net/base/origin_bound_cert_type.h"
 
 namespace net {
 
 // An interface for storing and retrieving origin bound certs. Origin bound
 // certificates are specified in
 // http://balfanz.github.com/tls-obc-spec/draft-balfanz-tls-obc-00.html.
 
 // Owned only by a single OriginBoundCertService object, which is responsible
 // for deleting it.
 
 class NET_EXPORT OriginBoundCertStore {
  public:
   // Used by GetAllOriginBoundCerts.
   struct OriginBoundCertInfo {
     std::string origin;  // Origin, for instance "https://www.verisign.com:443".
+    OriginBoundCertType type;

[Ryan Sleevi, 2011/11/25 00:07:02]

This may put you close to the clang style warning about ctors needing to be
out-of-lined.

It looks for scores >= 10 - class members count for 3, int members for 1.
Probably want to run it against the _clang trybots.

[mattm, 2011/12/02 01:55:59]

will do.

     std::string private_key;  // DER-encoded PrivateKeyInfo struct.
     std::string cert;  // DER-encoded certificate.
   };
 
   virtual ~OriginBoundCertStore() {}
 
-  // TODO(rkn): Specify certificate type (RSA or DSA).
   // TODO(rkn): File I/O may be required, so this should have an asynchronous
   // interface.
   // Returns true on success. |private_key_result| stores a DER-encoded
   // PrivateKeyInfo struct and |cert_result| stores a DER-encoded
   // certificate. Returns false if no origin bound cert exists for the
   // specified origin.
-  virtual bool GetOriginBoundCert(const std::string& origin,
-                                  std::string* private_key_result,
-                                  std::string* cert_result) = 0;
+  virtual bool GetOriginBoundCert(
+      const std::string& origin,

[wtc, 2011/11/30 23:23:40]

IMPORTANT: I think we should also pass requested_types as an input argument.  Or
are you storing only one type of cert
for each origin?

[mattm, 2011/12/01 00:06:27]

This is only storing one type of cert per origin.  I figured the case of a
server switching back and forth between only accepted one type of cert, then
another type, would be pretty unlikely, so the extra work of storing multiple
types per origin didn't seem worth it.

+      OriginBoundCertType* type,
+      std::string* private_key_result,
+      std::string* cert_result) = 0;
 
   // Adds an origin bound cert and the corresponding private key to the store.
-  virtual void SetOriginBoundCert(const std::string& origin,
-                                  const std::string& private_key,
-                                  const std::string& cert) = 0;
+  virtual void SetOriginBoundCert(
+      const std::string& origin,
+      OriginBoundCertType type,
+      const std::string& private_key,
+      const std::string& cert) = 0;
 
   // Removes an origin bound cert and the corresponding private key from the
   // store.
   virtual void DeleteOriginBoundCert(const std::string& origin) = 0;
 
   // Removes all origin bound certs and the corresponding private keys from
   // the store.
   virtual void DeleteAll() = 0;
 
   // Returns all origin bound certs and the corresponding private keys.
   virtual void GetAllOriginBoundCerts(
       std::vector<OriginBoundCertInfo>* origin_bound_certs) = 0;
 
   // Returns the number of certs in the store.
   // Public only for unit testing.
   virtual int GetCertCount() = 0;
 };
 
 }  // namespace net
 
 #endif  // NET_BASE_ORIGIN_BOUND_CERT_STORE_H_