From 0c1525b01868928371624ea0f68a672725d98d48 Mon Sep 17 00:00:00 2001
From: Gunnar Skjold <gunnar.skjold@gmail.com>
Date: Fri, 15 Dec 2023 19:04:39 +0100
Subject: [PATCH] Fixed ESP8266 for previous commit

---
 lib/AmsMqttHandler/src/AmsMqttHandler.cpp | 35 ++++++++++++-----------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/lib/AmsMqttHandler/src/AmsMqttHandler.cpp b/lib/AmsMqttHandler/src/AmsMqttHandler.cpp
index f2c5f6bd..d91afc11 100644
--- a/lib/AmsMqttHandler/src/AmsMqttHandler.cpp
+++ b/lib/AmsMqttHandler/src/AmsMqttHandler.cpp
@@ -55,35 +55,38 @@ bool AmsMqttHandler::connect() {
 					mqttSecureClient->setInsecure();
 				}
 
-				if(LittleFS.exists(FILE_MQTT_CERT)) {
-					#if defined(ESP8266)
+				#if defined(ESP8266)
+					if(LittleFS.exists(FILE_MQTT_CERT) && LittleFS.exists(FILE_MQTT_KEY)) {
 						if(debugger->isActive(RemoteDebug::INFO)) debugger->printf_P(PSTR("Found MQTT certificate file (%dkb free heap)\n"), ESP.getFreeHeap());
 						file = LittleFS.open(FILE_MQTT_CERT, (char*) "r");
 						BearSSL::X509List *serverCertList = new BearSSL::X509List(file);
 						file.close();
-						mqttSecureClient->setClientRSACert(serverCertList, serverPrivKey);
-					#elif defined(ESP32)
-						if(debugger->isActive(RemoteDebug::INFO)) debugger->printf_P(PSTR("Found MQTT certificate file (%dkb free heap)\n"), ESP.getFreeHeap());
-						file = LittleFS.open(FILE_MQTT_CERT, (char*) "r");
-						mqttSecureClient->loadCertificate(file, file.size());
-						file.close();
-					#endif
-				}
-				
-				if(LittleFS.exists(FILE_MQTT_KEY)) {
-					#if defined(ESP8266)
+
 						if(debugger->isActive(RemoteDebug::INFO)) debugger->printf_P(PSTR("Found MQTT key file (%dkb free heap)\n"), ESP.getFreeHeap());
 						file = LittleFS.open(FILE_MQTT_KEY, (char*) "r");
 						BearSSL::PrivateKey *serverPrivKey = new BearSSL::PrivateKey(file);
 						file.close();
+
+						if(debugger->isActive(RemoteDebug::INFO)) debugger->printf_P(PSTR("Loading cert and key (%dkb free heap)\n"), ESP.getFreeHeap());
 						mqttSecureClient->setClientRSACert(serverCertList, serverPrivKey);
-					#elif defined(ESP32)
+					}
+				#endif
+
+				#if defined(ESP32)
+					if(LittleFS.exists(FILE_MQTT_CERT)) {
+						if(debugger->isActive(RemoteDebug::INFO)) debugger->printf_P(PSTR("Found MQTT certificate file (%dkb free heap)\n"), ESP.getFreeHeap());
+						file = LittleFS.open(FILE_MQTT_CERT, (char*) "r");
+						mqttSecureClient->loadCertificate(file, file.size());
+						file.close();
+					}
+				
+					if(LittleFS.exists(FILE_MQTT_KEY)) {
 						if(debugger->isActive(RemoteDebug::INFO)) debugger->printf_P(PSTR("Found MQTT key file (%dkb free heap)\n"), ESP.getFreeHeap());
 						file = LittleFS.open(FILE_MQTT_KEY, (char*) "r");
 						mqttSecureClient->loadPrivateKey(file, file.size());
 						file.close();
-					#endif
-				}
+					}
+				#endif
 
 				LittleFS.end();
 			} else {