Added support for extra GetKeyPairResult parameter

Signed-off-by: AssemblyJohn <ioan.bogdann@gmail.com>
EVerest · Jan 24, 2024 · f728954 · f728954
1 parent e2077b7
commit f728954
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 2 deletions.
diff --git a/dependencies.yaml b/dependencies.yaml
@@ -66,4 +66,4 @@ everest-utils:
 # setting it here can be misleading since it does not affect the version being used
 libevse-security:
   git: https://github.com/EVerest/libevse-security.git
-  git_tag: v0.4.1
+  git_tag: 90af7a4
diff --git a/lib/staging/ocpp/evse_security_ocpp.cpp b/lib/staging/ocpp/evse_security_ocpp.cpp
@@ -92,6 +92,11 @@ std::optional<ocpp::KeyPair> EvseSecurity::get_key_pair(const ocpp::CertificateS
     }
 }
 
+bool EvseSecurity::update_certificate_links(const ocpp::CertificateSigningUseEnum& certificate_type) {
+    // TODO: Implement if required
+    return false;
+}
+
 std::string EvseSecurity::get_verify_file(const ocpp::CaCertificateType& certificate_type) {
     return this->r_security.call_get_verify_file(conversions::from_ocpp(certificate_type));
 }

diff --git a/lib/staging/ocpp/evse_security_ocpp.hpp b/lib/staging/ocpp/evse_security_ocpp.hpp
@@ -35,6 +35,7 @@ class EvseSecurity : public ocpp::EvseSecurity {
                                                      const std::string& country, const std::string& organization,
                                                      const std::string& common, bool use_tpm) override;
     std::optional<ocpp::KeyPair> get_key_pair(const ocpp::CertificateSigningUseEnum& certificate_type) override;
+    bool update_certificate_links(const ocpp::CertificateSigningUseEnum& certificate_type) override;
     std::string get_verify_file(const ocpp::CaCertificateType& certificate_type) override;
     int get_leaf_expiry_days_count(const ocpp::CertificateSigningUseEnum& certificate_type) override;
 };

diff --git a/modules/EvseSecurity/conversions.cpp b/modules/EvseSecurity/conversions.cpp
@@ -190,6 +190,7 @@ evse_security::KeyPair from_everest(types::evse_security::KeyPair other) {
     evse_security::KeyPair lhs;
     lhs.key = other.key;
     lhs.certificate = other.certificate;
+    lhs.certificate_single = other.certificate_single;
     lhs.password = other.password;
     return lhs;
 }
@@ -393,6 +394,7 @@ types::evse_security::KeyPair to_everest(evse_security::KeyPair other) {
     types::evse_security::KeyPair lhs;
     lhs.key = other.key;
     lhs.certificate = other.certificate;
+    lhs.certificate_single = other.certificate_single;
     lhs.password = other.password;
     return lhs;
 }

diff --git a/types/evse_security.yaml b/types/evse_security.yaml
@@ -176,12 +176,16 @@ types:
     required:
       - key
       - certificate
+      - certificate_single
     properties:
       key:
         description: The path of the PEM or DER encoded private key
         type: string
       certificate:
-        description: The path of the PEM or DER encoded certificate
+        description: The path of the PEM or DER encoded certificate chain
+        type: string
+      certificate_single:
+        description: The path of the PEM or DER encoded single certificate
         type: string
       password:
         description: Specifies the password for the private key if encrypted