Support EC certs in OriginBoundCertService and OriginBoundCertStore.

net/base/origin_bound_cert_service.cc

Index: net/base/origin_bound_cert_service.cc
diff --git a/net/base/origin_bound_cert_service.cc b/net/base/origin_bound_cert_service.cc
index 4d1af288fef99089d50925f5c3a857214c2a861f..82f9d0dd6ed36541b51e314b4fa69c0ecfda66ef 100644
--- a/net/base/origin_bound_cert_service.cc
+++ b/net/base/origin_bound_cert_service.cc
@@ -4,6 +4,7 @@
 
 #include "net/base/origin_bound_cert_service.h"
 
+#include <algorithm>
 #include <limits>
 
 #include "base/compiler_specific.h"
@@ -15,6 +16,7 @@
 #include "base/rand_util.h"
 #include "base/stl_util.h"
 #include "base/threading/worker_pool.h"
+#include "crypto/ec_private_key.h"
 #include "crypto/rsa_private_key.h"
 #include "net/base/net_errors.h"
 #include "net/base/origin_bound_cert_store.h"
@@ -34,13 +36,18 @@ const int kValidityPeriodInDays = 365;
 
 }  // namespace
 
+// static
+const char OriginBoundCertService::kEPKIPassword[] = "";
+
 // Represents the output and result callback of a request.
 class OriginBoundCertServiceRequest {
  public:
   OriginBoundCertServiceRequest(const CompletionCallback& callback,
+                                OriginBoundCertType* type,
                                 std::string* private_key,
                                 std::string* cert)
       : callback_(callback),
+        type_(type),
         private_key_(private_key),
         cert_(cert) {
   }
@@ -48,6 +55,7 @@ class OriginBoundCertServiceRequest {
   // Ensures that the result callback will never be made.
   void Cancel() {
     callback_.Reset();
+    type_ = NULL;
     private_key_ = NULL;
     cert_ = NULL;
   }
@@ -55,9 +63,11 @@ class OriginBoundCertServiceRequest {
   // Copies the contents of |private_key| and |cert| to the caller's output
   // arguments and calls the callback.
   void Post(int error,
+            OriginBoundCertType type,
             const std::string& private_key,
             const std::string& cert) {
     if (!callback_.is_null()) {
+      *type_ = type;
       *private_key_ = private_key;
       *cert_ = cert;
       callback_.Run(error);
@@ -69,6 +79,7 @@ class OriginBoundCertServiceRequest {
 
  private:
   CompletionCallback callback_;
+  OriginBoundCertType* type_;
   std::string* private_key_;
   std::string* cert_;
 };
@@ -80,8 +91,10 @@ class OriginBoundCertServiceWorker {
  public:
   OriginBoundCertServiceWorker(
       const std::string& origin,
+      OriginBoundCertType type,
       OriginBoundCertService* origin_bound_cert_service)
       : origin_(origin),
+        type_(type),
         serial_number_(base::RandInt(0, std::numeric_limits<int>::max())),
         origin_loop_(MessageLoop::current()),
         origin_bound_cert_service_(origin_bound_cert_service),
@@ -110,6 +123,7 @@ class OriginBoundCertServiceWorker {
   void Run() {
     // Runs on a worker thread.
     error_ = OriginBoundCertService::GenerateCert(origin_,
+                                                  type_,
                                                   serial_number_,
                                                   &private_key_,
                                                   &cert_);
@@ -136,7 +150,7 @@ class OriginBoundCertServiceWorker {
       // memory leaks or worse errors.
       base::AutoLock locked(lock_);
       if (!canceled_) {
-        origin_bound_cert_service_->HandleResult(origin_, error_,
+        origin_bound_cert_service_->HandleResult(origin_, error_, type_,
                                                  private_key_, cert_);
       }
     }
@@ -169,6 +183,7 @@ class OriginBoundCertServiceWorker {
   }
 
   const std::string origin_;
+  const OriginBoundCertType type_;
   // Note that serial_number_ must be initialized on a non-worker thread
   // (see documentation for OriginBoundCertService::GenerateCert).
   uint32 serial_number_;
@@ -195,8 +210,9 @@ class OriginBoundCertServiceWorker {
 // origin message loop.
 class OriginBoundCertServiceJob {
  public:
-  explicit OriginBoundCertServiceJob(OriginBoundCertServiceWorker* worker)
-      : worker_(worker) {
+  explicit OriginBoundCertServiceJob(OriginBoundCertServiceWorker* worker,
+                                     OriginBoundCertType type)

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

nit: Doesn't need to be explicit anymore

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

Done.

+      : worker_(worker), type_(type) {
   }
 
   ~OriginBoundCertServiceJob() {
@@ -206,19 +222,28 @@ class OriginBoundCertServiceJob {
     }
   }
 
+  OriginBoundCertType type() const { return type_; }
+
+  void Abort() {
+    worker_->Cancel();
+    HandleResult(ERR_ABORTED, ORIGIN_BOUND_INVALID_CERT_TYPE, "", "");
+  }
+
   void AddRequest(OriginBoundCertServiceRequest* request) {
     requests_.push_back(request);
   }
 
   void HandleResult(int error,
+                    OriginBoundCertType type,
                     const std::string& private_key,
                     const std::string& cert) {
     worker_ = NULL;
-    PostAll(error, private_key, cert);
+    PostAll(error, type, private_key, cert);
   }
 
  private:
   void PostAll(int error,
+               OriginBoundCertType type,
                const std::string& private_key,
                const std::string& cert) {
     std::vector<OriginBoundCertServiceRequest*> requests;
@@ -226,7 +251,7 @@ class OriginBoundCertServiceJob {
 
     for (std::vector<OriginBoundCertServiceRequest*>::iterator
          i = requests.begin(); i != requests.end(); i++) {
-      (*i)->Post(error, private_key, cert);
+      (*i)->Post(error, type, private_key, cert);
       // Post() causes the OriginBoundCertServiceRequest to delete itself.
     }
   }
@@ -244,6 +269,7 @@ class OriginBoundCertServiceJob {
 
   std::vector<OriginBoundCertServiceRequest*> requests_;
   OriginBoundCertServiceWorker* worker_;
+  OriginBoundCertType type_;
 };
 
 OriginBoundCertService::OriginBoundCertService(
@@ -259,43 +285,64 @@ OriginBoundCertService::~OriginBoundCertService() {
 
 int OriginBoundCertService::GetOriginBoundCert(
     const std::string& origin,
+    const std::vector<OriginBoundCertType>& requested_types,
+    OriginBoundCertType* type,
     std::string* private_key,
     std::string* cert,
     const CompletionCallback& callback,
     RequestHandle* out_req) {
   DCHECK(CalledOnValidThread());
 
-  if (callback.is_null() || !private_key || !cert || origin.empty()) {
+  if (callback.is_null() || requested_types.empty() || !private_key ||
+      !cert || origin.empty()) {
     *out_req = NULL;
     return ERR_INVALID_ARGUMENT;
   }
 
   requests_++;
 
-  // Check if an origin bound cert already exists for this origin.
+  // Check if an origin bound cert of an acceptable type already exists for this
+  // origin.
   if (origin_bound_cert_store_->GetOriginBoundCert(origin,
+                                                   type,
                                                    private_key,
                                                    cert)) {
-    cert_store_hits_++;
-    *out_req = NULL;
-    return OK;
+    if (std::find(requested_types.begin(), requested_types.end(), *type) !=
+        requested_types.end()) {
+      cert_store_hits_++;
+      *out_req = NULL;
+      return OK;
+    }
+    DVLOG(1) << "Cert store had cert of wrong type " << *type << " for "
+             << origin;
   }
 
   // |origin_bound_cert_store_| has no cert for this origin. See if an
   // identical request is currently in flight.
-  OriginBoundCertServiceJob* job;
-  std::map<std::string, OriginBoundCertServiceJob*>::const_iterator j;
+  OriginBoundCertServiceJob* job = NULL;
+  std::map<std::string, OriginBoundCertServiceJob*>::iterator j;
   j = inflight_.find(origin);
   if (j != inflight_.end()) {
     // An identical request is in flight already. We'll just attach our
     // callback.
     inflight_joins_++;
     job = j->second;
-  } else {
+    // Check that the job is for an acceptable type of cert.
+    if (std::find(requested_types.begin(), requested_types.end(), job->type())
+        == requested_types.end()) {
+      DVLOG(1) << "Aborting inflight job of wrong type " << job->type()
+               << " for " << origin;
+      job->Abort();
+      job = NULL;
+      inflight_.erase(j);
+    }
+  }
+
+  if (!job) {
     // Need to make a new request.
     OriginBoundCertServiceWorker* worker =
-        new OriginBoundCertServiceWorker(origin, this);
-    job = new OriginBoundCertServiceJob(worker);
+        new OriginBoundCertServiceWorker(origin, requested_types[0], this);
+    job = new OriginBoundCertServiceJob(worker, requested_types[0]);

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

IMPORTANT: We should not blindly pick requested_types[0].  We should
pick the first element of requested_types that we support.

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

My assumption was that the OriginBoundCertType enum will only contain types we
support, so we don't need to check here unless it's just as a bug catcher.. 
(picking types we support would happen when we translate from the server
supplied certTypes into our vector of enum values)

But if I do the other change you suggested to just pass the official cert types
values then we would need to check in here.

     if (!worker->Start()) {
       delete job;
       delete worker;
@@ -308,7 +355,7 @@ int OriginBoundCertService::GetOriginBoundCert(
   }
 
   OriginBoundCertServiceRequest* request =
-      new OriginBoundCertServiceRequest(callback, private_key, cert);
+      new OriginBoundCertServiceRequest(callback, type, private_key, cert);
   job->AddRequest(request);
   *out_req = request;
   return ERR_IO_PENDING;
@@ -316,31 +363,66 @@ int OriginBoundCertService::GetOriginBoundCert(
 
 // static
 int OriginBoundCertService::GenerateCert(const std::string& origin,
+                                         OriginBoundCertType type,
                                          uint32 serial_number,
                                          std::string* private_key,
                                          std::string* cert) {
-  scoped_ptr<crypto::RSAPrivateKey> key(
-      crypto::RSAPrivateKey::Create(kKeySizeInBits));
-  if (!key.get()) {
-    LOG(WARNING) << "Unable to create key pair for client";
-    return ERR_KEY_GENERATION_FAILED;
-  }
   std::string der_cert;
-  if (!x509_util::CreateOriginBoundCertRSA(
-      key.get(),
-      origin,
-      serial_number,
-      base::TimeDelta::FromDays(kValidityPeriodInDays),
-      &der_cert)) {
-    LOG(WARNING) << "Unable to create x509 cert for client";
-    return ERR_ORIGIN_BOUND_CERT_GENERATION_FAILED;
-  }
-
   std::vector<uint8> private_key_info;
-  if (!key->ExportPrivateKey(&private_key_info)) {
-    LOG(WARNING) << "Unable to export private key";
-    return ERR_PRIVATE_KEY_EXPORT_FAILED;
+  switch (type) {
+    case ORIGIN_BOUND_RSA_CERT:

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

See the Style Guide for an example of how to format a case
with curly braces:
http://google-styleguide.googlecode.com/svn/trunk/cppguide.xml#Loops_and_Swit...

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

Done.

+      {
+        scoped_ptr<crypto::RSAPrivateKey> key(
+            crypto::RSAPrivateKey::Create(kKeySizeInBits));
+        if (!key.get()) {
+          DLOG(ERROR) << "Unable to create key pair for client";
+          return ERR_KEY_GENERATION_FAILED;
+        }
+        if (!x509_util::CreateOriginBoundCertRSA(
+            key.get(),
+            origin,
+            serial_number,
+            base::TimeDelta::FromDays(kValidityPeriodInDays),
+            &der_cert)) {
+          DLOG(ERROR) << "Unable to create x509 cert for client";
+          return ERR_ORIGIN_BOUND_CERT_GENERATION_FAILED;
+        }
+
+        if (!key->ExportPrivateKey(&private_key_info)) {
+          DLOG(ERROR) << "Unable to export private key";
+          return ERR_PRIVATE_KEY_EXPORT_FAILED;
+        }
+      }
+      break;
+    case ORIGIN_BOUND_EC_CERT:
+      {
+        scoped_ptr<crypto::ECPrivateKey> key(crypto::ECPrivateKey::Create());
+        if (!key.get()) {
+          DLOG(ERROR) << "Unable to create key pair for client";
+          return ERR_KEY_GENERATION_FAILED;
+        }
+        if (!x509_util::CreateOriginBoundCertEC(
+            key.get(),
+            origin,
+            serial_number,
+            base::TimeDelta::FromDays(kValidityPeriodInDays),
+            &der_cert)) {
+          DLOG(ERROR) << "Unable to create x509 cert for client";
+          return ERR_ORIGIN_BOUND_CERT_GENERATION_FAILED;
+        }
+
+        if (!key->ExportEncryptedPrivateKey(
+            kEPKIPassword, 1, &private_key_info)) {
+          DLOG(ERROR) << "Unable to export private key";
+          return ERR_PRIVATE_KEY_EXPORT_FAILED;
+        }
+      }
+      break;
+    default:
+      NOTREACHED();
+      return ERR_INVALID_ARGUMENT;
   }
+
   // TODO(rkn): Perhaps ExportPrivateKey should be changed to output a
   // std::string* to prevent this copying.
   std::string key_out(private_key_info.begin(), private_key_info.end());
@@ -360,12 +442,13 @@ void OriginBoundCertService::CancelRequest(RequestHandle req) {
 // HandleResult is called by OriginBoundCertServiceWorker on the origin message
 // loop. It deletes OriginBoundCertServiceJob.
 void OriginBoundCertService::HandleResult(const std::string& origin,
-                                         int error,
-                                         const std::string& private_key,
-                                         const std::string& cert) {
+                                          int error,
+                                          OriginBoundCertType type,
+                                          const std::string& private_key,
+                                          const std::string& cert) {
   DCHECK(CalledOnValidThread());
 
-  origin_bound_cert_store_->SetOriginBoundCert(origin, private_key, cert);
+  origin_bound_cert_store_->SetOriginBoundCert(origin, type, private_key, cert);
 
   std::map<std::string, OriginBoundCertServiceJob*>::iterator j;
   j = inflight_.find(origin);
@@ -376,7 +459,7 @@ void OriginBoundCertService::HandleResult(const std::string& origin,
   OriginBoundCertServiceJob* job = j->second;
   inflight_.erase(j);
 
-  job->HandleResult(error, private_key, cert);
+  job->HandleResult(error, type, private_key, cert);
   delete job;
 }