Sign self-signed certs with SHA256.

net/ssl/server_bound_cert_service.cc

 // Copyright (c) 2012 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.
 
 #include "net/ssl/server_bound_cert_service.h"
 
 #include <algorithm>
 #include <limits>
 
 #include "base/bind.h"
@@ skipping 80 matching lines @@
     uint32 serial_number,
     int* error) {
   scoped_ptr<ServerBoundCertStore::ServerBoundCert> result;
 
   base::TimeTicks start = base::TimeTicks::Now();
   base::Time not_valid_before = base::Time::Now();
   base::Time not_valid_after =
       not_valid_before + base::TimeDelta::FromDays(kValidityPeriodInDays);
   std::string der_cert;
   std::vector<uint8> private_key_info;
-  scoped_ptr<crypto::ECPrivateKey> key(crypto::ECPrivateKey::Create());
-  if (!key.get()) {
-    DLOG(ERROR) << "Unable to create key pair for client";
-    *error = ERR_KEY_GENERATION_FAILED;
-    return result.Pass();
-  }
-  if (!x509_util::CreateDomainBoundCertEC(key.get(), server_identifier,
-                                          serial_number, not_valid_before,
-                                          not_valid_after, &der_cert)) {
+  crypto::ECPrivateKey* raw_key;
+  if (!x509_util::CreateKeyAndDomainBoundCertEC(server_identifier,
+                                                serial_number,
+                                                not_valid_before,
+                                                not_valid_after,
+                                                &raw_key,
+                                                &der_cert)) {
     DLOG(ERROR) << "Unable to create x509 cert for client";
     *error = ERR_ORIGIN_BOUND_CERT_GENERATION_FAILED;
     return result.Pass();
   }
 
+  scoped_ptr<crypto::ECPrivateKey> key(raw_key);
+
   if (!key->ExportEncryptedPrivateKey(ServerBoundCertService::kEPKIPassword,
                                       1, &private_key_info)) {
     DLOG(ERROR) << "Unable to export private key";
     *error = ERR_PRIVATE_KEY_EXPORT_FAILED;
     return result.Pass();
   }
 
   // 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());
@@ skipping 544 matching lines @@
   }
 
   return err;
 }
 
 int ServerBoundCertService::cert_count() {
   return server_bound_cert_store_->GetCertCount();
 }
 
 }  // namespace net