From b23558cc3321416ffeb5c7ec7f8cc51b60219551 Mon Sep 17 00:00:00 2001 From: pietfried Date: Wed, 5 Jun 2024 13:14:32 +0200 Subject: [PATCH 1/2] Checking if private key password is empty and passing std::nullopt to EvseSecurity ctor in this case Signed-off-by: pietfried --- modules/EvseSecurity/main/evse_securityImpl.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/modules/EvseSecurity/main/evse_securityImpl.cpp b/modules/EvseSecurity/main/evse_securityImpl.cpp index f3269d7a4..1fe255101 100644 --- a/modules/EvseSecurity/main/evse_securityImpl.cpp +++ b/modules/EvseSecurity/main/evse_securityImpl.cpp @@ -18,8 +18,14 @@ void evse_securityImpl::init() { certs_path / this->mod->config.csms_leaf_key_directory, certs_path / this->mod->config.secc_leaf_cert_directory, certs_path / this->mod->config.secc_leaf_key_directory}; + + std::optional private_key_password = std::nullopt; + if (!this->mod->config.private_key_password.empty()) { + private_key_password = this->mod->config.private_key_password; + } + this->evse_security = - std::make_unique(file_paths, this->mod->config.private_key_password); + std::make_unique(file_paths, private_key_password); } void evse_securityImpl::ready() { From ff5ec2ae03c0d9623173bef50a793dbec67e163f Mon Sep 17 00:00:00 2001 From: Kai-Uwe Hermann Date: Thu, 6 Jun 2024 16:13:51 +0200 Subject: [PATCH 2/2] clang-format Signed-off-by: Kai-Uwe Hermann --- modules/EvseSecurity/main/evse_securityImpl.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/modules/EvseSecurity/main/evse_securityImpl.cpp b/modules/EvseSecurity/main/evse_securityImpl.cpp index 1fe255101..050782928 100644 --- a/modules/EvseSecurity/main/evse_securityImpl.cpp +++ b/modules/EvseSecurity/main/evse_securityImpl.cpp @@ -18,14 +18,13 @@ void evse_securityImpl::init() { certs_path / this->mod->config.csms_leaf_key_directory, certs_path / this->mod->config.secc_leaf_cert_directory, certs_path / this->mod->config.secc_leaf_key_directory}; - + std::optional private_key_password = std::nullopt; if (!this->mod->config.private_key_password.empty()) { private_key_password = this->mod->config.private_key_password; } - - this->evse_security = - std::make_unique(file_paths, private_key_password); + + this->evse_security = std::make_unique(file_paths, private_key_password); } void evse_securityImpl::ready() {