| Index: net/ssl/client_cert_store_unittest-inl.h
|
| diff --git a/net/ssl/client_cert_store_unittest-inl.h b/net/ssl/client_cert_store_unittest-inl.h
|
| index a0e29dc83b5a732c757687b2f9a17e82b5b0ec47..8aceb10c6c602efdf947cc6c9f12ab067a0b99d2 100644
|
| --- a/net/ssl/client_cert_store_unittest-inl.h
|
| +++ b/net/ssl/client_cert_store_unittest-inl.h
|
| @@ -20,16 +20,14 @@ namespace net {
|
| namespace {
|
|
|
| // "CN=B CA" - DER encoded DN of the issuer of client_1.pem
|
| -const unsigned char kAuthority1DN[] = {
|
| - 0x30, 0x0f, 0x31, 0x0d, 0x30, 0x0b, 0x06, 0x03, 0x55, 0x04, 0x03, 0x0c,
|
| - 0x04, 0x42, 0x20, 0x43, 0x41
|
| -};
|
| +const unsigned char kAuthority1DN[] = {0x30, 0x0f, 0x31, 0x0d, 0x30, 0x0b,
|
| + 0x06, 0x03, 0x55, 0x04, 0x03, 0x0c,
|
| + 0x04, 0x42, 0x20, 0x43, 0x41};
|
|
|
| // "CN=E CA" - DER encoded DN of the issuer of client_2.pem
|
| -unsigned char kAuthority2DN[] = {
|
| - 0x30, 0x0f, 0x31, 0x0d, 0x30, 0x0b, 0x06, 0x03, 0x55, 0x04, 0x03, 0x0c,
|
| - 0x04, 0x45, 0x20, 0x43, 0x41
|
| -};
|
| +unsigned char kAuthority2DN[] = {0x30, 0x0f, 0x31, 0x0d, 0x30, 0x0b,
|
| + 0x06, 0x03, 0x55, 0x04, 0x03, 0x0c,
|
| + 0x04, 0x45, 0x20, 0x43, 0x41};
|
|
|
| } // namespace
|
|
|
| @@ -58,8 +56,8 @@ TYPED_TEST_P(ClientCertStoreTest, EmptyQuery) {
|
| scoped_refptr<SSLCertRequestInfo> request(new SSLCertRequestInfo());
|
|
|
| std::vector<scoped_refptr<X509Certificate> > selected_certs;
|
| - bool rv = this->delegate_.SelectClientCerts(
|
| - certs, *request.get(), &selected_certs);
|
| + bool rv =
|
| + this->delegate_.SelectClientCerts(certs, *request.get(), &selected_certs);
|
| EXPECT_TRUE(rv);
|
| EXPECT_EQ(0u, selected_certs.size());
|
| }
|
| @@ -76,8 +74,8 @@ TYPED_TEST_P(ClientCertStoreTest, AllIssuersAllowed) {
|
| scoped_refptr<SSLCertRequestInfo> request(new SSLCertRequestInfo());
|
|
|
| std::vector<scoped_refptr<X509Certificate> > selected_certs;
|
| - bool rv = this->delegate_.SelectClientCerts(
|
| - certs, *request.get(), &selected_certs);
|
| + bool rv =
|
| + this->delegate_.SelectClientCerts(certs, *request.get(), &selected_certs);
|
| EXPECT_TRUE(rv);
|
| ASSERT_EQ(1u, selected_certs.size());
|
| EXPECT_TRUE(selected_certs[0]->Equals(cert.get()));
|
| @@ -94,11 +92,13 @@ TYPED_TEST_P(ClientCertStoreTest, CertAuthorityFiltering) {
|
| ASSERT_TRUE(cert_2.get());
|
|
|
| std::vector<std::string> authority_1(
|
| - 1, std::string(reinterpret_cast<const char*>(kAuthority1DN),
|
| - sizeof(kAuthority1DN)));
|
| + 1,
|
| + std::string(reinterpret_cast<const char*>(kAuthority1DN),
|
| + sizeof(kAuthority1DN)));
|
| std::vector<std::string> authority_2(
|
| - 1, std::string(reinterpret_cast<const char*>(kAuthority2DN),
|
| - sizeof(kAuthority2DN)));
|
| + 1,
|
| + std::string(reinterpret_cast<const char*>(kAuthority2DN),
|
| + sizeof(kAuthority2DN)));
|
| EXPECT_TRUE(cert_1->IsIssuedByEncoded(authority_1));
|
| EXPECT_FALSE(cert_1->IsIssuedByEncoded(authority_2));
|
| EXPECT_TRUE(cert_2->IsIssuedByEncoded(authority_2));
|
| @@ -111,8 +111,8 @@ TYPED_TEST_P(ClientCertStoreTest, CertAuthorityFiltering) {
|
| request->cert_authorities = authority_1;
|
|
|
| std::vector<scoped_refptr<X509Certificate> > selected_certs;
|
| - bool rv = this->delegate_.SelectClientCerts(
|
| - certs, *request.get(), &selected_certs);
|
| + bool rv =
|
| + this->delegate_.SelectClientCerts(certs, *request.get(), &selected_certs);
|
| EXPECT_TRUE(rv);
|
| ASSERT_EQ(1u, selected_certs.size());
|
| EXPECT_TRUE(selected_certs[0]->Equals(cert_1.get()));
|
|
|