include/Configuration.h: rename MQTT_MAX_ROOT_CA_CERT_STRLEN

rename const MQTT_MAX_ROOT_CA_CERT_STRLEN to more generic name MQTT_MAX_CERT_STRLEN Signed-off-by: Martin Dummer <martin.dummer@gmx.net>
tbnobody · Apr 12, 2023 · bea0a73 · bea0a73
1 parent d920726
commit bea0a73
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/include/Configuration.h b/include/Configuration.h
@@ -19,7 +19,7 @@
 #define MQTT_MAX_PASSWORD_STRLEN 64
 #define MQTT_MAX_TOPIC_STRLEN 32
 #define MQTT_MAX_LWTVALUE_STRLEN 20
-#define MQTT_MAX_ROOT_CA_CERT_STRLEN 2560
+#define MQTT_MAX_CERT_STRLEN 2560
 
 #define INV_MAX_NAME_STRLEN 31
 #define INV_MAX_COUNT 10
@@ -89,10 +89,10 @@ struct CONFIG_T {
     char Mqtt_Hass_Topic[MQTT_MAX_TOPIC_STRLEN + 1];
     bool Mqtt_Hass_IndividualPanels;
     bool Mqtt_Tls;
-    char Mqtt_RootCaCert[MQTT_MAX_ROOT_CA_CERT_STRLEN + 1];
+    char Mqtt_RootCaCert[MQTT_MAX_CERT_STRLEN + 1];
     bool Mqtt_TlsCertLogin;
-    char Mqtt_ClientCert[MQTT_MAX_ROOT_CA_CERT_STRLEN + 1];
-    char Mqtt_ClientKey[MQTT_MAX_ROOT_CA_CERT_STRLEN + 1];
+    char Mqtt_ClientCert[MQTT_MAX_CERT_STRLEN + 1];
+    char Mqtt_ClientKey[MQTT_MAX_CERT_STRLEN + 1];
 
     char Mqtt_Hostname[MQTT_MAX_HOSTNAME_STRLEN + 1];
 

diff --git a/src/WebApi_mqtt.cpp b/src/WebApi_mqtt.cpp
@@ -220,12 +220,12 @@ void WebApiMqttClass::onMqttAdminPost(AsyncWebServerRequest* request)
             return;
         }
 
-        if (root["mqtt_root_ca_cert"].as<String>().length() > MQTT_MAX_ROOT_CA_CERT_STRLEN
-                || root["mqtt_client_cert"].as<String>().length() > MQTT_MAX_ROOT_CA_CERT_STRLEN
-                || root["mqtt_client_key"].as<String>().length() > MQTT_MAX_ROOT_CA_CERT_STRLEN) {
-            retMsg["message"] = "Certificates must not be longer than " STR(MQTT_MAX_ROOT_CA_CERT_STRLEN) " characters!";
+        if (root["mqtt_root_ca_cert"].as<String>().length() > MQTT_MAX_CERT_STRLEN
+                || root["mqtt_client_cert"].as<String>().length() > MQTT_MAX_CERT_STRLEN
+                || root["mqtt_client_key"].as<String>().length() > MQTT_MAX_CERT_STRLEN) {
+            retMsg["message"] = "Certificates must not be longer than " STR(MQTT_MAX_CERT_STRLEN) " characters!";
             retMsg["code"] = WebApiError::MqttCertificateLength;
-            retMsg["param"]["max"] = MQTT_MAX_ROOT_CA_CERT_STRLEN;
+            retMsg["param"]["max"] = MQTT_MAX_CERT_STRLEN;
             response->setLength();
             request->send(response);
             return;