Adjust certificate hash data conversion (#227)

- Adjust adjust handle_get_installed_certificate_ids_req; to use ref. - in CertificateHashDataChain ignore empty childCertificateHashData lists Signed-off-by: Fabian Klemm <[email protected]>
EVerest · Oct 25, 2023 · 9805829 · 9805829
1 parent 47a89bd
commit 9805829
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/ocpp/common/evse_security.cpp b/lib/ocpp/common/evse_security.cpp
@@ -114,7 +114,7 @@ ocpp::v201::CertificateHashDataChain to_ocpp_v201(ocpp::CertificateHashDataChain
     ocpp::v201::CertificateHashDataChain lhs;
     lhs.certificateType = to_ocpp_v201(other.certificateType);
     lhs.certificateHashData = to_ocpp_v201(other.certificateHashData);
-    if (other.childCertificateHashData.has_value()) {
+    if (other.childCertificateHashData.has_value() && !other.childCertificateHashData.value().empty()) {
         std::vector<ocpp::v201::CertificateHashDataType> v;
         for (const auto& certificate_hash_data : other.childCertificateHashData.value()) {
             v.push_back(to_ocpp_v201(certificate_hash_data));

diff --git a/lib/ocpp/v201/charge_point.cpp b/lib/ocpp/v201/charge_point.cpp
@@ -2027,7 +2027,7 @@ void ChargePoint::handle_get_installed_certificate_ids_req(Call<GetInstalledCert
 
     // convert the common type back to the v201 type(s) for the response
     std::vector<CertificateHashDataChain> certificate_hash_data_chain_v201;
-    for (const auto certificate_hash_data_chain_entry : certificate_hash_data_chains) {
+    for (const auto& certificate_hash_data_chain_entry : certificate_hash_data_chains) {
         certificate_hash_data_chain_v201.push_back(
             ocpp::evse_security_conversions::to_ocpp_v201(certificate_hash_data_chain_entry));
     }