| OLD | NEW | 
|     1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |     1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 
|     2 // Use of this source code is governed by a BSD-style license that can be |     2 // Use of this source code is governed by a BSD-style license that can be | 
|     3 // found in the LICENSE file. |     3 // found in the LICENSE file. | 
|     4  |     4  | 
|     5 #include <cert.h> |     5 #include <cert.h> | 
|     6 #include <certdb.h> |     6 #include <certdb.h> | 
|     7 #include <pk11pub.h> |     7 #include <pk11pub.h> | 
|     8  |     8  | 
|     9 #include <algorithm> |     9 #include <algorithm> | 
|    10  |    10  | 
| (...skipping 551 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|   562                                   flags, |   562                                   flags, | 
|   563                                   NULL, |   563                                   NULL, | 
|   564                                   empty_cert_list_, |   564                                   empty_cert_list_, | 
|   565                                   &verify_result); |   565                                   &verify_result); | 
|   566   EXPECT_EQ(OK, error); |   566   EXPECT_EQ(OK, error); | 
|   567   EXPECT_EQ(0U, verify_result.cert_status); |   567   EXPECT_EQ(0U, verify_result.cert_status); | 
|   568 } |   568 } | 
|   569  |   569  | 
|   570 TEST_F(CertDatabaseNSSTest, ImportServerCert_SelfSigned) { |   570 TEST_F(CertDatabaseNSSTest, ImportServerCert_SelfSigned) { | 
|   571   CertificateList certs; |   571   CertificateList certs; | 
|   572   ASSERT_TRUE(ReadCertIntoList("punycodetest.der", &certs)); |   572   ASSERT_TRUE(ReadCertIntoList("punycodetest.pem", &certs)); | 
|   573  |   573  | 
|   574   NSSCertDatabase::ImportCertFailureList failed; |   574   NSSCertDatabase::ImportCertFailureList failed; | 
|   575   EXPECT_TRUE(cert_db_->ImportServerCert(certs, NSSCertDatabase::TRUST_DEFAULT, |   575   EXPECT_TRUE(cert_db_->ImportServerCert(certs, NSSCertDatabase::TRUST_DEFAULT, | 
|   576                                          &failed)); |   576                                          &failed)); | 
|   577  |   577  | 
|   578   EXPECT_EQ(0U, failed.size()); |   578   EXPECT_EQ(0U, failed.size()); | 
|   579  |   579  | 
|   580   CertificateList cert_list = ListCerts(); |   580   CertificateList cert_list = ListCerts(); | 
|   581   ASSERT_EQ(1U, cert_list.size()); |   581   ASSERT_EQ(1U, cert_list.size()); | 
|   582   scoped_refptr<X509Certificate> puny_cert(cert_list[0]); |   582   scoped_refptr<X509Certificate> puny_cert(cert_list[0]); | 
| (...skipping 10 matching lines...) Expand all  Loading... | 
|   593                                   flags, |   593                                   flags, | 
|   594                                   NULL, |   594                                   NULL, | 
|   595                                   empty_cert_list_, |   595                                   empty_cert_list_, | 
|   596                                   &verify_result); |   596                                   &verify_result); | 
|   597   EXPECT_EQ(ERR_CERT_AUTHORITY_INVALID, error); |   597   EXPECT_EQ(ERR_CERT_AUTHORITY_INVALID, error); | 
|   598   EXPECT_EQ(CERT_STATUS_AUTHORITY_INVALID, verify_result.cert_status); |   598   EXPECT_EQ(CERT_STATUS_AUTHORITY_INVALID, verify_result.cert_status); | 
|   599 } |   599 } | 
|   600  |   600  | 
|   601 TEST_F(CertDatabaseNSSTest, ImportServerCert_SelfSigned_Trusted) { |   601 TEST_F(CertDatabaseNSSTest, ImportServerCert_SelfSigned_Trusted) { | 
|   602   CertificateList certs; |   602   CertificateList certs; | 
|   603   ASSERT_TRUE(ReadCertIntoList("punycodetest.der", &certs)); |   603   ASSERT_TRUE(ReadCertIntoList("punycodetest.pem", &certs)); | 
|   604  |   604  | 
|   605   NSSCertDatabase::ImportCertFailureList failed; |   605   NSSCertDatabase::ImportCertFailureList failed; | 
|   606   EXPECT_TRUE(cert_db_->ImportServerCert(certs, NSSCertDatabase::TRUSTED_SSL, |   606   EXPECT_TRUE(cert_db_->ImportServerCert(certs, NSSCertDatabase::TRUSTED_SSL, | 
|   607                                          &failed)); |   607                                          &failed)); | 
|   608  |   608  | 
|   609   EXPECT_EQ(0U, failed.size()); |   609   EXPECT_EQ(0U, failed.size()); | 
|   610  |   610  | 
|   611   CertificateList cert_list = ListCerts(); |   611   CertificateList cert_list = ListCerts(); | 
|   612   ASSERT_EQ(1U, cert_list.size()); |   612   ASSERT_EQ(1U, cert_list.size()); | 
|   613   scoped_refptr<X509Certificate> puny_cert(cert_list[0]); |   613   scoped_refptr<X509Certificate> puny_cert(cert_list[0]); | 
| (...skipping 404 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  1018   EXPECT_EQ(NSSCertDatabase::TRUST_DEFAULT, |  1018   EXPECT_EQ(NSSCertDatabase::TRUST_DEFAULT, | 
|  1019             cert_db_->GetCertTrust(certs2[0].get(), SERVER_CERT)); |  1019             cert_db_->GetCertTrust(certs2[0].get(), SERVER_CERT)); | 
|  1020  |  1020  | 
|  1021   new_certs = ListCerts(); |  1021   new_certs = ListCerts(); | 
|  1022   ASSERT_EQ(2U, new_certs.size()); |  1022   ASSERT_EQ(2U, new_certs.size()); | 
|  1023   EXPECT_STRNE(new_certs[0]->os_cert_handle()->nickname, |  1023   EXPECT_STRNE(new_certs[0]->os_cert_handle()->nickname, | 
|  1024                new_certs[1]->os_cert_handle()->nickname); |  1024                new_certs[1]->os_cert_handle()->nickname); | 
|  1025 } |  1025 } | 
|  1026  |  1026  | 
|  1027 }  // namespace net |  1027 }  // namespace net | 
| OLD | NEW |