diff --git a/config/v201/component_config/standardized/InternalCtrlr.json b/config/v201/component_config/standardized/InternalCtrlr.json index 45d77cca0..d743ad569 100644 --- a/config/v201/component_config/standardized/InternalCtrlr.json +++ b/config/v201/component_config/standardized/InternalCtrlr.json @@ -771,8 +771,8 @@ "default": "60", "type": "integer" }, - "AllowCSMSRootCertInstallWhenSecurityProfile1": { - "variable_name": "AllowCSMSRootCertInstallWhenSecurityProfile1", + "AllowCSMSRootCertInstallWithUnsecureConnection": { + "variable_name": "AllowCSMSRootCertInstallWithUnsecureConnection", "characteristics": { "supportsMonitoring": true, "dataType": "boolean" @@ -787,8 +787,8 @@ "default": true, "type": "boolean" }, - "AllowMFRootCertInstallWhenSecurityProfile1": { - "variable_name": "AllowMFRootCertInstallWhenSecurityProfile1", + "AllowMFRootCertInstallWithUnsecureConnection": { + "variable_name": "AllowMFRootCertInstallWithUnsecureConnection", "characteristics": { "supportsMonitoring": true, "dataType": "boolean" diff --git a/include/ocpp/v201/ctrlr_component_variables.hpp b/include/ocpp/v201/ctrlr_component_variables.hpp index 5172d29f1..6f3dad8bb 100644 --- a/include/ocpp/v201/ctrlr_component_variables.hpp +++ b/include/ocpp/v201/ctrlr_component_variables.hpp @@ -201,8 +201,8 @@ extern const ComponentVariable& MaxCertificateChainSize; extern const ComponentVariable& UpdateCertificateSymlinks; extern const RequiredComponentVariable& OrganizationName; extern const RequiredComponentVariable& SecurityProfile; -extern const ComponentVariable& AllowCSMSRootCertInstallWhenSecurityProfile1; -extern const ComponentVariable& AllowMFRootCertInstallWhenSecurityProfile1; +extern const ComponentVariable& AllowCSMSRootCertInstallWithUnsecureConnection; +extern const ComponentVariable& AllowMFRootCertInstallWithUnsecureConnection; extern const ComponentVariable& ACPhaseSwitchingSupported; extern const ComponentVariable& SmartChargingCtrlrAvailable; extern const ComponentVariable& SmartChargingCtrlrEnabled; diff --git a/lib/ocpp/v201/charge_point.cpp b/lib/ocpp/v201/charge_point.cpp index e90f8cbf1..d460eab74 100644 --- a/lib/ocpp/v201/charge_point.cpp +++ b/lib/ocpp/v201/charge_point.cpp @@ -3597,12 +3597,12 @@ bool ChargePoint::should_allow_certificate_install(InstallCertificateUseEnum cer switch (cert_type) { case InstallCertificateUseEnum::CSMSRootCertificate: return this->device_model - ->get_optional_value(ControllerComponentVariables::AllowCSMSRootCertInstallWhenSecurityProfile1) + ->get_optional_value(ControllerComponentVariables::AllowCSMSRootCertInstallWithUnsecureConnection) .value_or(true); case InstallCertificateUseEnum::ManufacturerRootCertificate: return this->device_model - ->get_optional_value(ControllerComponentVariables::AllowMFRootCertInstallWhenSecurityProfile1) + ->get_optional_value(ControllerComponentVariables::AllowMFRootCertInstallWithUnsecureConnection) .value_or(true); default: return true; @@ -3618,8 +3618,8 @@ void ChargePoint::handle_install_certificate_req(Call if (!should_allow_certificate_install(msg.certificateType)) { response.status = InstallCertificateStatusEnum::Rejected; response.statusInfo = StatusInfo(); - response.statusInfo->reasonCode = "LowSecurityProfile"; - response.statusInfo->additionalInfo = "CertificateInstallationNotAllowedWhenSecurityProfile1"; + response.statusInfo->reasonCode = "UnsecureConnection"; + response.statusInfo->additionalInfo = "CertificateInstallationNotAllowedWithUnsecureConnection"; } else { const auto result = this->evse_security->install_ca_certificate( msg.certificate.get(), ocpp::evse_security_conversions::from_ocpp_v201(msg.certificateType)); diff --git a/lib/ocpp/v201/ctrlr_component_variables.cpp b/lib/ocpp/v201/ctrlr_component_variables.cpp index b3c115e3a..474abb1dc 100644 --- a/lib/ocpp/v201/ctrlr_component_variables.cpp +++ b/lib/ocpp/v201/ctrlr_component_variables.cpp @@ -359,18 +359,18 @@ const ComponentVariable& ResumeTransactionsOnBoot = { "ResumeTransactionsOnBoot", }), }; -const ComponentVariable& AllowCSMSRootCertInstallWhenSecurityProfile1 = { +const ComponentVariable& AllowCSMSRootCertInstallWithUnsecureConnection = { ControllerComponents::InternalCtrlr, std::nullopt, std::optional({ - "AllowCSMSRootCertInstallWhenSecurityProfile1", + "AllowCSMSRootCertInstallWithUnsecureConnection", }), }; -const ComponentVariable& AllowMFRootCertInstallWhenSecurityProfile1 = { +const ComponentVariable& AllowMFRootCertInstallWithUnsecureConnection = { ControllerComponents::InternalCtrlr, std::nullopt, std::optional({ - "AllowMFRootCertInstallWhenSecurityProfile1", + "AllowMFRootCertInstallWithUnsecureConnection", }), }; const ComponentVariable& AlignedDataCtrlrEnabled = {