Support EC certs in OriginBoundCertService and OriginBoundCertStore.

chrome/browser/net/sqlite_origin_bound_cert_store_unittest.cc

Index: chrome/browser/net/sqlite_origin_bound_cert_store_unittest.cc
diff --git a/chrome/browser/net/sqlite_origin_bound_cert_store_unittest.cc b/chrome/browser/net/sqlite_origin_bound_cert_store_unittest.cc
index 1b68962deb5026e9544d578b23025fa4b69cd747..04ae42a5a4c89b1b9c96004320cf6e75d49702d1 100644
--- a/chrome/browser/net/sqlite_origin_bound_cert_store_unittest.cc
+++ b/chrome/browser/net/sqlite_origin_bound_cert_store_unittest.cc
@@ -11,6 +11,7 @@
 #include "chrome/browser/net/sqlite_origin_bound_cert_store.h"
 #include "chrome/common/chrome_constants.h"
 #include "content/test/test_browser_thread.h"
+#include "sql/statement.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using content::BrowserThread;
@@ -33,7 +34,8 @@ class SQLiteOriginBoundCertStoreTest : public testing::Test {
     // Make sure the store gets written at least once.
     store_->AddOriginBoundCert(
         net::DefaultOriginBoundCertStore::OriginBoundCert(
-            "https://encrypted.google.com:8443", "a", "b"));
+            "https://encrypted.google.com:8443",
+            net::ORIGIN_BOUND_RSA_CERT, "a", "b"));
   }
 
   content::TestBrowserThread db_thread_;
@@ -74,6 +76,10 @@ TEST_F(SQLiteOriginBoundCertStoreTest, RemoveOnDestruction) {
 
 // Test if data is stored as expected in the SQLite database.
 TEST_F(SQLiteOriginBoundCertStoreTest, TestPersistence) {
+  store_->AddOriginBoundCert(
+      net::DefaultOriginBoundCertStore::OriginBoundCert(
+          "https://www.google.com/", net::ORIGIN_BOUND_EC_CERT, "c", "d"));
+
   std::vector<net::DefaultOriginBoundCertStore::OriginBoundCert*> certs;
   // Replace the store effectively destroying the current one and forcing it
   // to write it's data to disk. Then we can see if after loading it again it
@@ -89,12 +95,27 @@ TEST_F(SQLiteOriginBoundCertStoreTest, TestPersistence) {
 
   // Reload and test for persistence
   ASSERT_TRUE(store_->Load(&certs));
-  ASSERT_EQ(1U, certs.size());
-  ASSERT_STREQ("https://encrypted.google.com:8443", certs[0]->origin().c_str());
-  ASSERT_STREQ("a", certs[0]->private_key().c_str());
-  ASSERT_STREQ("b", certs[0]->cert().c_str());
+  ASSERT_EQ(2U, certs.size());
+  net::DefaultOriginBoundCertStore::OriginBoundCert* ec_cert;
+  net::DefaultOriginBoundCertStore::OriginBoundCert* rsa_cert;
+  if (net::ORIGIN_BOUND_RSA_CERT == certs[0]->type()) {
+    rsa_cert = certs[0];
+    ec_cert = certs[1];
+  } else {
+    rsa_cert = certs[1];
+    ec_cert = certs[0];
+  }
+  ASSERT_STREQ("https://encrypted.google.com:8443", rsa_cert->origin().c_str());
+  ASSERT_EQ(net::ORIGIN_BOUND_RSA_CERT, rsa_cert->type());
+  ASSERT_STREQ("a", rsa_cert->private_key().c_str());
+  ASSERT_STREQ("b", rsa_cert->cert().c_str());
+  ASSERT_STREQ("https://www.google.com/", ec_cert->origin().c_str());
+  ASSERT_EQ(net::ORIGIN_BOUND_EC_CERT, ec_cert->type());
+  ASSERT_STREQ("c", ec_cert->private_key().c_str());
+  ASSERT_STREQ("d", ec_cert->cert().c_str());
 
   // Now delete the cert and check persistence again.
+  store_->DeleteOriginBoundCert(*certs[1]);
   store_->DeleteOriginBoundCert(*certs[0]);
   store_ = NULL;
   // Make sure we wait until the destructor has run.
@@ -109,6 +130,69 @@ TEST_F(SQLiteOriginBoundCertStoreTest, TestPersistence) {
   ASSERT_EQ(0U, certs.size());
 }
 
+TEST_F(SQLiteOriginBoundCertStoreTest, TestUpgrade) {
+  // Reset the store.  We'll be using a different database for this test.
+  store_ = NULL;
+
+  FilePath v1_db_path(temp_dir_.path().AppendASCII("v1db"));
+
+  // Create a version 1 database.
+  {
+    sql::Connection db;
+    ASSERT_TRUE(db.Open(v1_db_path));
+    ASSERT_TRUE(db.Execute(
+        "CREATE TABLE meta(key LONGVARCHAR NOT NULL UNIQUE PRIMARY KEY,"
+            "value LONGVARCHAR);"
+        "INSERT INTO \"meta\" VALUES('version','1');"
+        "INSERT INTO \"meta\" VALUES('last_compatible_version','1');"
+        "CREATE TABLE origin_bound_certs ("
+            "origin TEXT NOT NULL UNIQUE PRIMARY KEY,"
+            "private_key BLOB NOT NULL,cert BLOB NOT NULL);"
+        "INSERT INTO \"origin_bound_certs\" VALUES("
+            "'https://google.com',X'AA',X'BB');"
+        "INSERT INTO \"origin_bound_certs\" VALUES("
+            "'https://foo.com',X'CC',X'DD');"
+        ));
+  }
+
+  std::vector<net::DefaultOriginBoundCertStore::OriginBoundCert*> certs;
+  store_ = new SQLiteOriginBoundCertStore(v1_db_path);
+
+  // Load the database and ensure the certs can be read and are marked as RSA.
+  ASSERT_TRUE(store_->Load(&certs));
+  ASSERT_EQ(2U, certs.size());
+  ASSERT_STREQ("https://google.com", certs[0]->origin().c_str());
+  ASSERT_EQ(net::ORIGIN_BOUND_RSA_CERT, certs[0]->type());
+  ASSERT_STREQ("\xaa", certs[0]->private_key().c_str());
+  ASSERT_STREQ("\xbb", certs[0]->cert().c_str());
+  ASSERT_STREQ("https://foo.com", certs[1]->origin().c_str());
+  ASSERT_EQ(net::ORIGIN_BOUND_RSA_CERT, certs[1]->type());
+  ASSERT_STREQ("\xcc", certs[1]->private_key().c_str());
+  ASSERT_STREQ("\xdd", certs[1]->cert().c_str());
+
+  STLDeleteContainerPointers(certs.begin(), certs.end());
+  certs.clear();
+
+  store_ = NULL;
+  // Make sure we wait until the destructor has run.
+  scoped_refptr<base::ThreadTestHelper> helper(
+      new base::ThreadTestHelper(
+          BrowserThread::GetMessageLoopProxyForThread(BrowserThread::DB)));
+  ASSERT_TRUE(helper->Run());
+
+  // Verify the database version is updated.
+  {
+    sql::Connection db;
+    ASSERT_TRUE(db.Open(v1_db_path));
+    sql::Statement smt(db.GetUniqueStatement(
+        "SELECT value FROM meta WHERE key = \"version\""));
+    ASSERT_TRUE(smt);
+    ASSERT_TRUE(smt.Step());
+    EXPECT_EQ(2, smt.ColumnInt(0));
+    EXPECT_FALSE(smt.Step());
+  }
+}
+
 // Test that we can force the database to be written by calling Flush().
 TEST_F(SQLiteOriginBoundCertStoreTest, TestFlush) {
   // File timestamps don't work well on all platforms, so we'll determine
@@ -124,9 +208,11 @@ TEST_F(SQLiteOriginBoundCertStoreTest, TestFlush) {
     std::string private_key(1000, c);
     std::string cert(1000, c);
     store_->AddOriginBoundCert(
-        net::DefaultOriginBoundCertStore::OriginBoundCert(origin,
-                                                          private_key,
-                                                          cert));
+        net::DefaultOriginBoundCertStore::OriginBoundCert(
+            origin,
+            net::ORIGIN_BOUND_RSA_CERT,
+            private_key,
+            cert));
   }
 
   // Call Flush() and wait until the DB thread is idle.