Changed to BearSSL for meter decryption on ESP8266 + some minor changes

This commit is contained in:
Gunnar Skjold
2021-01-17 12:34:57 +01:00
parent af8f5a7c24
commit f9597c786e
345 changed files with 129 additions and 175455 deletions

View File

@@ -380,7 +380,6 @@ void AmsWebServer::configMeterHtml() {
}
html.replace("{s}", meterConfig->substituteMissing ? "checked" : "");
html.replace("{u}", meterConfig->sendUnknown ? "checked" : "");
server.setContentLength(html.length() + HEAD_HTML_LEN + FOOT_HTML_LEN);
server.send_P(200, "text/html", HEAD_HTML);
@@ -936,10 +935,9 @@ void AmsWebServer::handleSave() {
String authenticationKeyHex = server.arg("a");
if(!authenticationKeyHex.isEmpty()) {
authenticationKeyHex.replace("0x", "");
fromHex(meterConfig->authenticationKey, encryptionKeyHex, 16);
fromHex(meterConfig->authenticationKey, authenticationKeyHex, 16);
}
meterConfig->substituteMissing = server.hasArg("s") && server.arg("substituteMissing") == "true";
meterConfig->sendUnknown = server.hasArg("u") && server.arg("sendUnknown") == "true";
config->setMeterConfig(*meterConfig);
}