| 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 "net/cert/cert_database.h" | 5 #include "net/cert/cert_database.h" |
| 6 | 6 |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "base/observer_list_threadsafe.h" | 8 #include "base/observer_list_threadsafe.h" |
| 9 #include "net/base/net_errors.h" | 9 #include "net/base/net_errors.h" |
| 10 #include "net/ssl/openssl_client_key_store.h" | |
| 11 | 10 |
| 12 namespace net { | 11 namespace net { |
| 13 | 12 |
| 14 CertDatabase::CertDatabase() | 13 CertDatabase::CertDatabase() |
| 15 : observer_list_(new base::ObserverListThreadSafe<Observer>) { | 14 : observer_list_(new base::ObserverListThreadSafe<Observer>) { |
| 16 } | 15 } |
| 17 | 16 |
| 18 CertDatabase::~CertDatabase() {} | 17 CertDatabase::~CertDatabase() {} |
| 19 | 18 |
| 20 int CertDatabase::CheckUserCert(X509Certificate* cert) { | 19 int CertDatabase::CheckUserCert(X509Certificate* cert) { |
| (...skipping 11 matching lines...) Expand all Loading... |
| 32 | 31 |
| 33 int CertDatabase::AddUserCert(X509Certificate* cert) { | 32 int CertDatabase::AddUserCert(X509Certificate* cert) { |
| 34 // This method is only used by the content SSLAddCertHandler which is | 33 // This method is only used by the content SSLAddCertHandler which is |
| 35 // never used on Android. | 34 // never used on Android. |
| 36 NOTIMPLEMENTED(); | 35 NOTIMPLEMENTED(); |
| 37 return ERR_NOT_IMPLEMENTED; | 36 return ERR_NOT_IMPLEMENTED; |
| 38 } | 37 } |
| 39 | 38 |
| 40 void CertDatabase::OnAndroidKeyStoreChanged() { | 39 void CertDatabase::OnAndroidKeyStoreChanged() { |
| 41 NotifyObserversOfCertAdded(NULL); | 40 NotifyObserversOfCertAdded(NULL); |
| 42 // Dump the OpenSSLClientKeyStore to drop references to now disconnected | |
| 43 // PrivateKeys stored in the in-memory key store. Note: this assumes that | |
| 44 // every SSLClientAuthCache is dumped as part of notifying | |
| 45 // OnCertAdded. Otherwise client auth decisions will be silently converted to | |
| 46 // no-certificate decisions. See https://crbug.com/382696 | |
| 47 OpenSSLClientKeyStore::GetInstance()->Flush(); | |
| 48 } | 41 } |
| 49 | 42 |
| 50 void CertDatabase::OnAndroidKeyChainChanged() { | 43 void CertDatabase::OnAndroidKeyChainChanged() { |
| 51 observer_list_->Notify(FROM_HERE, &Observer::OnCACertChanged, | 44 observer_list_->Notify(FROM_HERE, &Observer::OnCACertChanged, |
| 52 scoped_refptr<X509Certificate>()); | 45 scoped_refptr<X509Certificate>()); |
| 53 } | 46 } |
| 54 | 47 |
| 55 } // namespace net | 48 } // namespace net |
| OLD | NEW |