Added CreateOriginBound method to x509_certificate.h.

net/base/x509_certificate_unittest.cc

 // 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.
 
+#include <cert.h>
+#include <secoid.h>
+
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/pickle.h"
 #include "base/sha1.h"
 #include "base/string_number_conversions.h"
 #include "base/string_split.h"
 #include "crypto/rsa_private_key.h"
 #include "net/base/asn1_util.h"
 #include "net/base/cert_status_flags.h"
@@ skipping 1097 matching lines @@
   private_key.reset(crypto::RSAPrivateKey::CreateFromPrivateKeyInfo(input));
   ASSERT_TRUE(private_key.get());
 
   cert = X509Certificate::CreateSelfSigned(
       private_key.get(), "CN=subject", 1, base::TimeDelta::FromDays(1));
 
   EXPECT_EQ("subject", cert->subject().GetDisplayName());
   EXPECT_FALSE(cert->HasExpired());
 }
 
+// This test creates an origin-bound cert from a private key and
+// then verifies the content of the certificate.
+TEST(X509CertificateTest, CreateOriginBound) {
+  SECItem ob_cert_oid = { siDEROID, NULL, 0 };
+  SECItem* expected;
+  SECItem actual = {siBuffer, NULL, 0};

[wtc, 2011/08/19 18:18:08]

Add spaces after '{' and before '}'.

[mdietz, 2011/08/22 20:09:00]

Done.

+  SECOidTag ob_cert_oid_tag;
+  SECStatus ok;
+  PRBool result;

[wtc, 2011/08/19 18:18:08]

This is C++ code, so please declare variables when they're
first used.

[mdietz, 2011/08/22 20:09:00]

Done.

+
+  // Origin Bound Cert OID
+  static const char oid_string[] = "1.3.6.1.4.1.11129.2.1.6";
+
+  // Sample ASCII weborigin
+  std::string origin = "http://weborigin.com:443";
+
+  // Create object neccissary for extension lookup call
+  SECItem extension_object = {siAsciiString,
+                              (unsigned char*)origin.data(),
+                              origin.size()};

[wtc, 2011/08/19 18:18:08]

Please format this as follows:
  SECItem extension_object = {
    siAsciiString,
    (unsigned char*)origin.data(),
    origin.size()
  };

[mdietz, 2011/08/22 20:09:00]

Done.

+
+  scoped_ptr<crypto::RSAPrivateKey> private_key(
+      crypto::RSAPrivateKey::Create(1024));
+  scoped_refptr<X509Certificate> cert =
+      X509Certificate::CreateOriginBound(private_key.get(),
+                                         "CN=subject",
+                                         origin, 1,
+                                         base::TimeDelta::FromDays(1));
+
+  EXPECT_EQ("subject", cert->subject().GetDisplayName());

[wtc, 2011/08/19 18:18:08]

Change "subject" to "anonymous.invalid".

[mdietz, 2011/08/22 20:09:00]

Just removed subject since it's no longer passed as a parameter to
CreateOriginBound().

On 2011/08/19 18:18:08, wtc wrote:

[wtc, 2011/08/23 01:32:21]

Right, but it is useful to verify that the subject in
the generated cert matches the subject name recommended
in Dirk's Internet-Draft.

+  EXPECT_FALSE(cert->HasExpired());
+
+  // IA5Encode and arena allocate SECItem
+  expected = SEC_ASN1EncodeItem(cert->os_cert_handle()->arena, NULL,

[wtc, 2011/08/19 18:18:08]

We should call PORT_NewArena() early and use 'arena' instead
of cert->os_cert_handle()->arena here.

Move the PORT_FreeArena() call to the end of this unit test.
We cannot free 'arena' while 'expected' and 'ob_cert_oid'
are still in use.

[mdietz, 2011/08/22 20:09:00]

Done.

+                                &extension_object,
+                                SEC_ASN1_GET(SEC_IA5StringTemplate));
+
+  ASSERT_NE(static_cast<SECItem*>(NULL), expected);
+
+  // Create OID SECItem
+  PLArenaPool* arena = PORT_NewArena(DER_DEFAULT_CHUNKSIZE);
+  ok = SEC_StringToOID(arena, &ob_cert_oid,
+                       oid_string, NULL);
+  PORT_FreeArena(arena, PR_FALSE);
+
+  ASSERT_EQ(SECSuccess, ok);
+
+  ob_cert_oid_tag = SECOID_FindOIDTag(&ob_cert_oid);
+
+  ASSERT_NE(SEC_OID_UNKNOWN, ob_cert_oid_tag);
+
+  // Lookup Origin Bound Cert extension in generated cert
+  ok = CERT_FindCertExtension(cert->os_cert_handle(),
+                              ob_cert_oid_tag,
+                              &actual);
+  ASSERT_EQ(SECSuccess, ok);
+
+  // Compare expected and actual extension values
+  result = SECITEM_ItemsAreEqual(expected, &actual);
+  ASSERT_TRUE(result);

[wtc, 2011/08/19 18:18:08]

Add
  SECITEM_FreeItem(&actual, PR_FALSE);
otherwise 'actual' is leaked.

[mdietz, 2011/08/22 20:09:00]

Done.

+}
+
 TEST(X509CertificateTest, GetDEREncoded) {
   scoped_ptr<crypto::RSAPrivateKey> private_key(
       crypto::RSAPrivateKey::Create(1024));
   scoped_refptr<X509Certificate> cert =
       X509Certificate::CreateSelfSigned(
           private_key.get(), "CN=subject", 0, base::TimeDelta::FromDays(1));
 
   std::string der_cert;
   EXPECT_TRUE(cert->GetDEREncoded(&der_cert));
   EXPECT_FALSE(der_cert.empty());
@@ skipping 241 matching lines @@
   }
 
   EXPECT_EQ(test_data.expected, X509Certificate::VerifyHostname(
       test_data.hostname, common_name, dns_names, ip_addressses));
 }
 
 INSTANTIATE_TEST_CASE_P(, X509CertificateNameVerifyTest,
                         testing::ValuesIn(kNameVerifyTestData));
 
 }  // namespace net