increase certificate size if psram is available (#741)

Author: technyon

clion/CMakeLists.txt

@@ -61,6 +61,7 @@ set(SRCFILES
         ../src/SerialReader.cpp
         ../src/util/NukiHelper.cpp
         ../src/util/NukiOpenerHelper.cpp
+        ../src/util/CertUtil.h
 )
 
 file(GLOB_RECURSE SRCFILESREC

src/PreferencesKeys.h

@@ -6,6 +6,7 @@
 #include "FS.h"
 #include "SPIFFS.h"
 #include "RestartReason.h"
+#include "util/CertUtil.h"
 
 #ifndef CONFIG_IDF_TARGET_ESP32H2
 #include <WiFi.h>
@@ -431,13 +432,22 @@ inline void initPreferences(Preferences* preferences)
         {
             Log->println("Migration 9.07");
 
-            char ca[2200] = {0};
-            char cert[2200] = {0};
-            char key[2200] = {0};
+            int size = certSize();
 
-            size_t caLength = preferences->getString(preference_mqtt_ca, ca, 2200);
-            size_t crtLength = preferences->getString(preference_mqtt_crt, cert, 2200);
-            size_t keyLength = preferences->getString(preference_mqtt_key, key, 2200);
+            char ca[size];
+            char cert[size];
+            char key[size];
+
+            for (int i = 0; i < certSize(); i++)
+            {
+                ca[i] = 0;
+                cert[i] = 0;
+                key[i] = 0;
+            }
+
+            size_t caLength = preferences->getString(preference_mqtt_ca, ca, size);
+            size_t crtLength = preferences->getString(preference_mqtt_crt, cert, size);
+            size_t keyLength = preferences->getString(preference_mqtt_key, key, size);
 
             if (caLength > 1)
             {

src/WebCfgServer.cpp

@@ -3,6 +3,7 @@
 #include "PreferencesKeys.h"
 #include "Logger.h"
 #include "RestartReason.h"
+#include "util/CertUtil.h"
 #include <esp_task_wdt.h>
 #include "FS.h"
 #include "SPIFFS.h"
@@ -5585,14 +5586,14 @@ esp_err_t WebCfgServer::buildMqttSSLConfigHtml(PsychicRequest *request, PsychicR
                 file.close();
                 ca[filesize] = '\0';
 
-                printTextarea(&response, "MQTTCA", "MQTT SSL CA Certificate", "*", 2200, true, true);
+                printTextarea(&response, "MQTTCA", "MQTT SSL CA Certificate", "*", certSize(), true, true);
                 found = true;
             }
         }
 
         if (!found)
         {
-            printTextarea(&response, "MQTTCA", "MQTT SSL CA Certificate", "", 2200, true, true);
+            printTextarea(&response, "MQTTCA", "MQTT SSL CA Certificate", "", certSize(), true, true);
         }
     }
     else if (type == 1)
@@ -5620,14 +5621,14 @@ esp_err_t WebCfgServer::buildMqttSSLConfigHtml(PsychicRequest *request, PsychicR
                 file.close();
                 cert[filesize] = '\0';
 
-                printTextarea(&response, "MQTTCRT", "MQTT SSL Client Certificate", "*", 2200, true, true);
+                printTextarea(&response, "MQTTCRT", "MQTT SSL Client Certificate", "*", certSize(), true, true);
                 found = true;
             }
         }
 
         if (!found)
         {
-            printTextarea(&response, "MQTTCRT", "MQTT SSL Client Certificate", "", 2200, true, true);
+            printTextarea(&response, "MQTTCRT", "MQTT SSL Client Certificate", "", certSize(), true, true);
         }
     }
     else
@@ -5655,14 +5656,14 @@ esp_err_t WebCfgServer::buildMqttSSLConfigHtml(PsychicRequest *request, PsychicR
                 file.close();
                 key[filesize] = '\0';
 
-                printTextarea(&response, "MQTTKEY", "MQTT SSL Client Key", "*", 2200, true, true);
+                printTextarea(&response, "MQTTKEY", "MQTT SSL Client Key", "*", certSize(), true, true);
                 found = true;
             }
         }
 
         if (!found)
         {
-            printTextarea(&response, "MQTTKEY", "MQTT SSL Client Key", "", 2200, true, true);
+            printTextarea(&response, "MQTTKEY", "MQTT SSL Client Key", "", certSize(), true, true);
         }
     }
     response.print("</table>");
@@ -5744,14 +5745,14 @@ esp_err_t WebCfgServer::buildHttpSSLConfigHtml(PsychicRequest *request, PsychicR
                 file.close();
                 key[filesize] = '\0';
 
-                printTextarea(&response, "HTTPKEY", "HTTP SSL Key", "*", 2200, true, true);
+                printTextarea(&response, "HTTPKEY", "HTTP SSL Key", "*", certSize(), true, true);
                 found = true;
             }
         }
 
         if (!found)
         {
-            printTextarea(&response, "HTTPKEY", "HTTP SSL Key", "", 2200, true, true);
+            printTextarea(&response, "HTTPKEY", "HTTP SSL Key", "", certSize(), true, true);
         }
     }
     else

src/util/CertUtil.h

@@ -0,0 +1,18 @@
+#pragma once
+
+#if defined(CONFIG_SOC_SPIRAM_SUPPORTED) && defined(CONFIG_SPIRAM)
+#include "esp_psram.h"
+#endif
+
+inline int certSize()
+{
+#if defined(CONFIG_SOC_SPIRAM_SUPPORTED) && defined(CONFIG_SPIRAM)
+    if(esp_psram_get_size() > 0)
+    {
+        return 8000;
+    }
+    return 2200;
+#endif
+
+    return 2200;
+}