| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 "net/base/test_root_certs.h" | 5 #include "net/base/test_root_certs.h" |
| 6 | 6 |
| 7 #include <openssl/err.h> | |
| 8 #include <openssl/x509v3.h> | |
| 9 | |
| 10 #include "base/location.h" | 7 #include "base/location.h" |
| 11 #include "base/logging.h" | 8 #include "base/logging.h" |
| 12 #include "crypto/openssl_util.h" | 9 #include "net/android/network_library.h" |
| 13 #include "net/base/x509_certificate.h" | 10 #include "net/base/x509_certificate.h" |
| 14 | 11 |
| 15 namespace net { | 12 namespace net { |
| 16 | 13 |
| 17 bool TestRootCerts::Add(X509Certificate* certificate) { | 14 bool TestRootCerts::Add(X509Certificate* certificate) { |
| 18 if (!X509_STORE_add_cert(X509Certificate::cert_store(), | 15 std::string cert_bytes; |
| 19 certificate->os_cert_handle())) { | 16 X509Certificate::X509Certificate::GetDEREncoded( |
| 20 unsigned long error_code = ERR_peek_error(); | 17 certificate->os_cert_handle(), &cert_bytes); |
| 21 if (ERR_GET_LIB(error_code) != ERR_LIB_X509 || | 18 net::android::AddTestRootCertificate( |
| 22 ERR_GET_REASON(error_code) != X509_R_CERT_ALREADY_IN_HASH_TABLE) { | 19 reinterpret_cast<const uint8*>(cert_bytes.data()), cert_bytes.size()); |
| 23 crypto::ClearOpenSSLERRStack(FROM_HERE); | |
| 24 return false; | |
| 25 } | |
| 26 ERR_clear_error(); | |
| 27 } | |
| 28 | |
| 29 empty_ = false; | |
| 30 return true; | 20 return true; |
| 31 } | 21 } |
| 32 | 22 |
| 33 void TestRootCerts::Clear() { | 23 void TestRootCerts::Clear() { |
| 34 if (empty_) | 24 if (empty_) |
| 35 return; | 25 return; |
| 36 | 26 |
| 37 X509Certificate::ResetCertStore(); | 27 net::android::ClearTestRootCertificates(); |
| 38 empty_ = true; | 28 empty_ = true; |
| 39 } | 29 } |
| 40 | 30 |
| 41 bool TestRootCerts::IsEmpty() const { | 31 bool TestRootCerts::IsEmpty() const { |
| 42 return empty_; | 32 return empty_; |
| 43 } | 33 } |
| 44 | 34 |
| 45 TestRootCerts::~TestRootCerts() {} | 35 TestRootCerts::~TestRootCerts() {} |
| 46 | 36 |
| 47 void TestRootCerts::Init() { | 37 void TestRootCerts::Init() { |
| 48 empty_ = true; | 38 empty_ = true; |
| 49 } | 39 } |
| 50 | 40 |
| 51 } // namespace net | 41 } // namespace net |
| OLD | NEW |