github.com/UtilitechAS.amsreader-firmware
1
0
Fork 0
mirror of https://github.com/UtilitechAS/amsreader-firmware.git synced 2026-01-21 02:17:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Disabled MQTT SSL for ESP8266

Browse Source
This commit is contained in:
Gunnar Skjold 2022-06-04 09:55:25 +02:00
parent 07614226b3
commit 2617956b38
3 changed files with 31 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/AmsToMqttBridge.ino
View File

@ -1312,6 +1312,8 @@ void MQTT_connect() {
}
#if defined(ESP8266)
mqttSecureClient->setBufferSizes(512, 512);
debugE("ESP8266 does not have enough RAM to SSL");
return;
#endif
if(LittleFS.begin()) {
@ -1333,10 +1335,15 @@ void MQTT_connect() {
if(LittleFS.exists(FILE_MQTT_CERT) && LittleFS.exists(FILE_MQTT_KEY)) {
#if defined(ESP8266)
debugI("Found MQTT certificate file");
file = LittleFS.open(FILE_MQTT_CERT, "r");
BearSSL::X509List *serverCertList = new BearSSL::X509List(file);
debugI("Found MQTT key file");
file = LittleFS.open(FILE_MQTT_KEY, "r");
BearSSL::PrivateKey *serverPrivKey = new BearSSL::PrivateKey(file);
debugD("Setting client certificates");
mqttSecureClient->setClientRSACert(serverCertList, serverPrivKey);
#elif defined(ESP32)
debugI("Found MQTT certificate file");
@ -1349,6 +1356,7 @@ void MQTT_connect() {
#endif
}
LittleFS.end();
debugD("MQTT SSL setup complete");
}
mqttClient = mqttSecureClient;
} else if(mqttClient == NULL) {

39
src/web/AmsWebServer.cpp
View File

@ -497,24 +497,29 @@ void AmsWebServer::configMqttHtml() {
}
html.replace("{f255}", mqtt.payloadFormat == 255 ? "selected" : "");
html.replace("{s}", mqtt.ssl ? "checked" : "");
#if defined(ESP8266)
html.replace("{sd}", "d-none");
#elif
html.replace("{sd}", "");
html.replace("{s}", mqtt.ssl ? "checked" : "");
if(LittleFS.begin()) {
html.replace("{dcu}", LittleFS.exists(FILE_MQTT_CA) ? "none" : "");
html.replace("{dcf}", LittleFS.exists(FILE_MQTT_CA) ? "" : "none");
html.replace("{deu}", LittleFS.exists(FILE_MQTT_CERT) ? "none" : "");
html.replace("{def}", LittleFS.exists(FILE_MQTT_CERT) ? "" : "none");
html.replace("{dku}", LittleFS.exists(FILE_MQTT_KEY) ? "none" : "");
html.replace("{dkf}", LittleFS.exists(FILE_MQTT_KEY) ? "" : "none");
LittleFS.end();
} else {
html.replace("{dcu}", "");
html.replace("{dcf}", "none");
html.replace("{deu}", "");
html.replace("{def}", "none");
html.replace("{dku}", "");
html.replace("{dkf}", "none");
}
if(LittleFS.begin()) {
html.replace("{dcu}", LittleFS.exists(FILE_MQTT_CA) ? "none" : "");
html.replace("{dcf}", LittleFS.exists(FILE_MQTT_CA) ? "" : "none");
html.replace("{deu}", LittleFS.exists(FILE_MQTT_CERT) ? "none" : "");
html.replace("{def}", LittleFS.exists(FILE_MQTT_CERT) ? "" : "none");
html.replace("{dku}", LittleFS.exists(FILE_MQTT_KEY) ? "none" : "");
html.replace("{dkf}", LittleFS.exists(FILE_MQTT_KEY) ? "" : "none");
LittleFS.end();
} else {
html.replace("{dcu}", "");
html.replace("{dcf}", "none");
html.replace("{deu}", "");
html.replace("{def}", "none");
html.replace("{dku}", "");
html.replace("{dkf}", "none");
}
#endif
server.setContentLength(html.length() + HEAD_HTML_LEN + FOOT_HTML_LEN);
server.send_P(200, MIME_HTML, HEAD_HTML);

2
web/mqtt.html
View File

@ -74,7 +74,7 @@
</div>
</div>
</div>
<div class="my-3 p-3 bg-white rounded shadow">
<div class="my-3 p-3 bg-white rounded shadow {sd}">
<div class="row">
<div class="col-md-2">
<label class="m-2"><input id="s" type="checkbox" name="s" value="true" {s}/> SSL</label>