Sign self-signed certs with SHA256.

net/cert/x509_util_unittest.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/cert/x509_util.h"
 
 #include <algorithm>
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time/time.h"
+#include "crypto/hmac.h"
 #include "crypto/rsa_private_key.h"
 #include "net/cert/x509_certificate.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace net {
 
 namespace x509_util {
 
 TEST(X509UtilTest, SortClientCertificates) {
   CertificateList certs;
@@ skipping 24 matching lines @@
   EXPECT_EQ("older cert", certs[1]->subject().common_name);
   ASSERT_TRUE(certs[2].get());
   EXPECT_EQ("not yet valid", certs[2]->subject().common_name);
   ASSERT_TRUE(certs[3].get());
   EXPECT_EQ("expired", certs[3]->subject().common_name);
   ASSERT_FALSE(certs[4].get());
   ASSERT_FALSE(certs[5].get());
 }
 
 #if defined(USE_NSS) || defined(OS_WIN) || defined(OS_MACOSX)
-// This test creates a self-signed cert from a private key and then verify the
+// This test creates a self-signed cert and a private key and then verifies the
 // content of the certificate.
-TEST(X509UtilTest, CreateSelfSigned) {
-  scoped_ptr<crypto::RSAPrivateKey> private_key(
-      crypto::RSAPrivateKey::Create(1024));
-
-  ASSERT_TRUE(private_key.get());
+TEST(X509UtilTest, CreateKeyAndSelfSigned) {
+  crypto::RSAPrivateKey* raw_key;
 
   std::string der_cert;
-  ASSERT_TRUE(x509_util::CreateSelfSignedCert(
-      private_key.get(),
+  ASSERT_TRUE(x509_util::CreateKeyAndSelfSignedCert(
       "CN=subject",
       1,
       base::Time::Now(),
       base::Time::Now() + base::TimeDelta::FromDays(1),
+      &raw_key,
       &der_cert));
 
+  scoped_ptr<crypto::RSAPrivateKey> key(raw_key);
+  ASSERT_TRUE(key.get());
+
   scoped_refptr<X509Certificate> cert(X509Certificate::CreateFromBytes(
       der_cert.data(), der_cert.size()));
   ASSERT_TRUE(cert.get());
 
   EXPECT_EQ("subject", cert->subject().GetDisplayName());
   EXPECT_FALSE(cert->HasExpired());
+}
 
-  cert = NULL;
-
+// This test creates a self-signed cert from a private key and then verifies the
+// content of the certificate.
+TEST(X509UtilTest, CreateSelfSignedInternal) {
   const uint8 private_key_info[] = {
     0x30, 0x82, 0x02, 0x78, 0x02, 0x01, 0x00, 0x30,
     0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7,
     0x0d, 0x01, 0x01, 0x01, 0x05, 0x00, 0x04, 0x82,
     0x02, 0x62, 0x30, 0x82, 0x02, 0x5e, 0x02, 0x01,
     0x00, 0x02, 0x81, 0x81, 0x00, 0xb8, 0x7f, 0x2b,
     0x20, 0xdc, 0x7c, 0x9b, 0x0c, 0xdc, 0x51, 0x61,
     0x99, 0x0d, 0x36, 0x0f, 0xd4, 0x66, 0x88, 0x08,
     0x55, 0x84, 0xd5, 0x3a, 0xbf, 0x2b, 0xa4, 0x64,
     0x85, 0x7b, 0x0c, 0x04, 0x13, 0x3f, 0x8d, 0xf4,
@@ skipping 67 matching lines @@
     0xc6, 0xa4, 0x92, 0xd1, 0xce, 0x6c, 0x72, 0xfb,
     0x21, 0xb3, 0x02, 0x87, 0xe4, 0xfd, 0x61, 0xca,
     0x00, 0x42, 0x19, 0xf0, 0xda, 0x5a, 0x53, 0xe3,
     0xb1, 0xc5, 0x15, 0xf3
   };
 
   std::vector<uint8> input;
   input.resize(sizeof(private_key_info));
   memcpy(&input.front(), private_key_info, sizeof(private_key_info));
 
-  private_key.reset(crypto::RSAPrivateKey::CreateFromPrivateKeyInfo(input));
+  scoped_ptr<crypto::RSAPrivateKey> private_key(
+      crypto::RSAPrivateKey::CreateFromPrivateKeyInfo(input));
   ASSERT_TRUE(private_key.get());
 
-  ASSERT_TRUE(x509_util::CreateSelfSignedCert(
+  std::string der_cert;
+  ASSERT_TRUE(x509_util::CreateSelfSignedCertInternal(
       private_key.get(),
+      crypto::HMAC::SHA1,
       "CN=subject",
       1,
       base::Time::Now(),
       base::Time::Now() + base::TimeDelta::FromDays(1),
       &der_cert));
 
-  cert = X509Certificate::CreateFromBytes(der_cert.data(), der_cert.size());
+  scoped_refptr<X509Certificate> cert =
+      X509Certificate::CreateFromBytes(der_cert.data(), der_cert.size());
   ASSERT_TRUE(cert.get());
 
   EXPECT_EQ("subject", cert->subject().GetDisplayName());
   EXPECT_FALSE(cert->HasExpired());
 }
 #endif
 
 }  // namespace x509_util
 
 }  // namespace net