Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1769)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/net/sqlite_origin_bound_cert_store_unittest.cc

Issue 9617039: Change Origin bound certs -> Domain bound certs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: explanitory comment Created 8 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« chrome/browser/net/sqlite_origin_bound_cert_store.cc ('K') | « chrome/browser/net/sqlite_origin_bound_cert_store.cc ('k') | net/base/default_origin_bound_cert_store.h » ('j') | net/base/default_origin_bound_cert_store.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 208bef1d353f4daefde81bd243aabdddddfb5186..fe31f6b6e578b4ad529405ef38373f71c9ec0b6a 100644
--- a/chrome/browser/net/sqlite_origin_bound_cert_store_unittest.cc
+++ b/chrome/browser/net/sqlite_origin_bound_cert_store_unittest.cc
@@ -68,7 +68,7 @@ class SQLiteOriginBoundCertStoreTest : public testing::Test {
// Make sure the store gets written at least once.
store_->AddOriginBoundCert(
net::DefaultOriginBoundCertStore::OriginBoundCert(
- "https://encrypted.google.com:8443",
+ "google.com",
net::CLIENT_CERT_RSA_SIGN,
base::Time::FromInternalValue(1),
base::Time::FromInternalValue(2),
@@ -115,7 +115,7 @@ TEST_F(SQLiteOriginBoundCertStoreTest, RemoveOnDestruction) {
TEST_F(SQLiteOriginBoundCertStoreTest, TestPersistence) {
store_->AddOriginBoundCert(
net::DefaultOriginBoundCertStore::OriginBoundCert(
- "https://www.google.com/",
+ "foo.com",
net::CLIENT_CERT_ECDSA_SIGN,
base::Time::FromInternalValue(3),
base::Time::FromInternalValue(4),
@@ -146,13 +146,13 @@ TEST_F(SQLiteOriginBoundCertStoreTest, TestPersistence) {
rsa_cert = certs[1];
ec_cert = certs[0];
}
- ASSERT_STREQ("https://encrypted.google.com:8443", rsa_cert->origin().c_str());
+ ASSERT_STREQ("google.com", rsa_cert->domain().c_str());
ASSERT_EQ(net::CLIENT_CERT_RSA_SIGN, rsa_cert->type());
ASSERT_STREQ("a", rsa_cert->private_key().c_str());
ASSERT_STREQ("b", rsa_cert->cert().c_str());
ASSERT_EQ(1, rsa_cert->creation_time().ToInternalValue());
ASSERT_EQ(2, rsa_cert->expiration_time().ToInternalValue());
- ASSERT_STREQ("https://www.google.com/", ec_cert->origin().c_str());
+ ASSERT_STREQ("foo.com", ec_cert->domain().c_str());
ASSERT_EQ(net::CLIENT_CERT_ECDSA_SIGN, ec_cert->type());
ASSERT_STREQ("c", ec_cert->private_key().c_str());
ASSERT_STREQ("d", ec_cert->cert().c_str());
@@ -200,14 +200,14 @@ TEST_F(SQLiteOriginBoundCertStoreTest, TestUpgradeV1) {
sql::Statement add_smt(db.GetUniqueStatement(
"INSERT INTO origin_bound_certs (origin, private_key, cert) "
"VALUES (?,?,?)"));
- add_smt.BindString(0, "https://www.google.com:443");
+ add_smt.BindString(0, "google.com");
add_smt.BindBlob(1, key_data.data(), key_data.size());
add_smt.BindBlob(2, cert_data.data(), cert_data.size());
ASSERT_TRUE(add_smt.Run());
ASSERT_TRUE(db.Execute(
"INSERT INTO \"origin_bound_certs\" VALUES("
- "'https://foo.com',X'AA',X'BB');"
+ "'foo.com',X'AA',X'BB');"
));
}
@@ -224,14 +224,14 @@ TEST_F(SQLiteOriginBoundCertStoreTest, TestUpgradeV1) {
ASSERT_TRUE(store_->Load(&certs.get()));
ASSERT_EQ(2U, certs.size());
- ASSERT_STREQ("https://www.google.com:443", certs[0]->origin().c_str());
+ ASSERT_STREQ("google.com", certs[0]->domain().c_str());
ASSERT_EQ(net::CLIENT_CERT_RSA_SIGN, certs[0]->type());
ASSERT_EQ(GetTestCertExpirationTime(),
certs[0]->expiration_time());
ASSERT_EQ(key_data, certs[0]->private_key());
ASSERT_EQ(cert_data, certs[0]->cert());
- ASSERT_STREQ("https://foo.com", certs[1]->origin().c_str());
+ ASSERT_STREQ("foo.com", certs[1]->domain().c_str());
ASSERT_EQ(net::CLIENT_CERT_RSA_SIGN, certs[1]->type());
// Undecodable cert, expiration time will be uninitialized.
ASSERT_EQ(base::Time(), certs[1]->expiration_time());
@@ -287,7 +287,7 @@ TEST_F(SQLiteOriginBoundCertStoreTest, TestUpgradeV2) {
sql::Statement add_smt(db.GetUniqueStatement(
"INSERT INTO origin_bound_certs (origin, private_key, cert, cert_type) "
"VALUES (?,?,?,?)"));
- add_smt.BindString(0, "https://www.google.com:443");
+ add_smt.BindString(0, "google.com");
add_smt.BindBlob(1, key_data.data(), key_data.size());
add_smt.BindBlob(2, cert_data.data(), cert_data.size());
add_smt.BindInt64(3, 1);
@@ -295,7 +295,7 @@ TEST_F(SQLiteOriginBoundCertStoreTest, TestUpgradeV2) {
ASSERT_TRUE(db.Execute(
"INSERT INTO \"origin_bound_certs\" VALUES("
- "'https://foo.com',X'AA',X'BB',64);"
+ "'foo.com',X'AA',X'BB',64);"
));
}
@@ -312,14 +312,14 @@ TEST_F(SQLiteOriginBoundCertStoreTest, TestUpgradeV2) {
ASSERT_TRUE(store_->Load(&certs.get()));
ASSERT_EQ(2U, certs.size());
- ASSERT_STREQ("https://www.google.com:443", certs[0]->origin().c_str());
+ ASSERT_STREQ("google.com", certs[0]->domain().c_str());
ASSERT_EQ(net::CLIENT_CERT_RSA_SIGN, certs[0]->type());
ASSERT_EQ(GetTestCertExpirationTime(),
certs[0]->expiration_time());
ASSERT_EQ(key_data, certs[0]->private_key());
ASSERT_EQ(cert_data, certs[0]->cert());
- ASSERT_STREQ("https://foo.com", certs[1]->origin().c_str());
+ ASSERT_STREQ("foo.com", certs[1]->domain().c_str());
ASSERT_EQ(net::CLIENT_CERT_ECDSA_SIGN, certs[1]->type());
// Undecodable cert, expiration time will be uninitialized.
ASSERT_EQ(base::Time(), certs[1]->expiration_time());
@@ -376,7 +376,7 @@ TEST_F(SQLiteOriginBoundCertStoreTest, TestUpgradeV3) {
sql::Statement add_smt(db.GetUniqueStatement(
"INSERT INTO origin_bound_certs (origin, private_key, cert, cert_type, "
"expiration_time) VALUES (?,?,?,?,?)"));
- add_smt.BindString(0, "https://www.google.com:443");
+ add_smt.BindString(0, "google.com");
add_smt.BindBlob(1, key_data.data(), key_data.size());
add_smt.BindBlob(2, cert_data.data(), cert_data.size());
add_smt.BindInt64(3, 1);
@@ -385,7 +385,7 @@ TEST_F(SQLiteOriginBoundCertStoreTest, TestUpgradeV3) {
ASSERT_TRUE(db.Execute(
"INSERT INTO \"origin_bound_certs\" VALUES("
- "'https://foo.com',X'AA',X'BB',64,2000);"
+ "'foo.com',X'AA',X'BB',64,2000);"
));
}
@@ -402,7 +402,7 @@ TEST_F(SQLiteOriginBoundCertStoreTest, TestUpgradeV3) {
ASSERT_TRUE(store_->Load(&certs.get()));
ASSERT_EQ(2U, certs.size());
- ASSERT_STREQ("https://www.google.com:443", certs[0]->origin().c_str());
+ ASSERT_STREQ("google.com", certs[0]->domain().c_str());
ASSERT_EQ(net::CLIENT_CERT_RSA_SIGN, certs[0]->type());
ASSERT_EQ(1000, certs[0]->expiration_time().ToInternalValue());
ASSERT_EQ(GetTestCertCreationTime(),
@@ -410,7 +410,7 @@ TEST_F(SQLiteOriginBoundCertStoreTest, TestUpgradeV3) {
ASSERT_EQ(key_data, certs[0]->private_key());
ASSERT_EQ(cert_data, certs[0]->cert());
- ASSERT_STREQ("https://foo.com", certs[1]->origin().c_str());
+ ASSERT_STREQ("foo.com", certs[1]->domain().c_str());
ASSERT_EQ(net::CLIENT_CERT_ECDSA_SIGN, certs[1]->type());
ASSERT_EQ(2000, certs[1]->expiration_time().ToInternalValue());
// Undecodable cert, creation time will be uninitialized.
@@ -449,12 +449,12 @@ TEST_F(SQLiteOriginBoundCertStoreTest, TestFlush) {
// Write some certs, so the DB will have to expand by several KB.
for (char c = 'a'; c < 'z'; ++c) {
- std::string origin(1, c);
+ std::string domain(1, c);
std::string private_key(1000, c);
std::string cert(1000, c);
store_->AddOriginBoundCert(
net::DefaultOriginBoundCertStore::OriginBoundCert(
- origin,
+ domain,
net::CLIENT_CERT_RSA_SIGN,
base::Time(),
base::Time(),
« chrome/browser/net/sqlite_origin_bound_cert_store.cc ('K') | « chrome/browser/net/sqlite_origin_bound_cert_store.cc ('k') | net/base/default_origin_bound_cert_store.h » ('j') | net/base/default_origin_bound_cert_store.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698