summaryrefslogtreecommitdiff
path: root/src/components/security_manager/src/crypto_manager_impl.cc
diff options
context:
space:
mode:
authorJackLivio <jack@livio.io>2020-02-17 13:05:54 -0500
committerJackLivio <jack@livio.io>2020-02-17 13:05:54 -0500
commit86dea8793023f986c7c10d7f9e5b7a932d89a49a (patch)
treebf44b0d5b6bf6b6c78dd2d0602b67f05ebe2a17c /src/components/security_manager/src/crypto_manager_impl.cc
parent4310b2dfd5e1078df0df53138a73d49d000c9c62 (diff)
parentece258838a44a5461d718c5eeae380ad11a3769b (diff)
downloadsdl_core-86dea8793023f986c7c10d7f9e5b7a932d89a49a.tar.gz
Merge remote-tracking branch 'origin/develop' into fix/3rd_party_build_issuesfix/3rd_party_build_issues
Diffstat (limited to 'src/components/security_manager/src/crypto_manager_impl.cc')
-rw-r--r--src/components/security_manager/src/crypto_manager_impl.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/components/security_manager/src/crypto_manager_impl.cc b/src/components/security_manager/src/crypto_manager_impl.cc
index cb42d5b46c..48b3119bec 100644
--- a/src/components/security_manager/src/crypto_manager_impl.cc
+++ b/src/components/security_manager/src/crypto_manager_impl.cc
@@ -283,6 +283,7 @@ bool CryptoManagerImpl::Init() {
bool CryptoManagerImpl::OnCertificateUpdated(const std::string& data) {
LOG4CXX_AUTO_TRACE(logger_);
+ sync_primitives::AutoLock lock(crypto_manager_lock_);
if (!context_) {
LOG4CXX_WARN(logger_, "Not initialized");
return false;
@@ -307,6 +308,8 @@ bool CryptoManagerImpl::OnCertificateUpdated(const std::string& data) {
}
SSLContext* CryptoManagerImpl::CreateSSLContext() {
+ LOG4CXX_AUTO_TRACE(logger_);
+ sync_primitives::AutoLock lock(crypto_manager_lock_);
if (NULL == context_) {
return NULL;
}