From 7a6f936a1a3d5b95234ee6d39ec08ac3dea8b6d6 Mon Sep 17 00:00:00 2001 From: Unknown Date: Tue, 11 Dec 2018 08:33:11 +0100 Subject: [PATCH] Sifrovani retezcu je nyni v externi knihovne. --- src/WiFiConfig.cpp | 103 +++++++-------------------------------------- 1 file changed, 16 insertions(+), 87 deletions(-) diff --git a/src/WiFiConfig.cpp b/src/WiFiConfig.cpp index 6ef9c8e..31f0149 100644 --- a/src/WiFiConfig.cpp +++ b/src/WiFiConfig.cpp @@ -1,4 +1,6 @@ /* + * V6.1 - 11.12.2018- Sifrovani retezcu vytazeno mimo WiFiConfig do knihovny encipheredEEPROMStrings (dostupna na gitu) kvuli pristupu i jinych modulu + * * V6.0 - 20.11.2018- Verze i pro ESP32 * * V5.9 - 18.7.2018 - Retezce, ukladane do EEPROM jsou primitivnim zpusobem sifrovany pro ztizeni odhaleni SSID a hesla pri dumpu pameti @@ -78,6 +80,7 @@ #include "WiFiConfig.h" #include #include +#include #include "embHTML.h" #ifdef DEBUG_ESP_PORT @@ -488,17 +491,17 @@ void WiFiConfig::_handleDisplayAP(void) } } s = FPSTR(PAGE_INDEX2); - v = _readString(configBase + offsetof(wificonfigarea_t, ssid), elementSize(wificonfigarea_t, ssid)); + v = EES_readString(configBase + offsetof(wificonfigarea_t, ssid), elementSize(wificonfigarea_t, ssid)); if (v.length()) s.replace(F("{s}"), String(FPSTR(VALUE)) + v + F("'")); else s.replace(F("{s}"), F("placeholder='SSID'")); - v = _readString(configBase + offsetof(wificonfigarea_t, pass), elementSize(wificonfigarea_t, pass)); + v = EES_readString(configBase + offsetof(wificonfigarea_t, pass), elementSize(wificonfigarea_t, pass)); if (v.length()) s.replace(F("{p}"), String(FPSTR(VALUE)) + v + F("'")); else s.replace(F("{p}"), F("placeholder='password'")); - v = _readString(configBase + offsetof(wificonfigarea_t, devname), elementSize(wificonfigarea_t, devname)); + v = EES_readString(configBase + offsetof(wificonfigarea_t, devname), elementSize(wificonfigarea_t, devname)); if (v.length()) s.replace(F("{n}"), String(FPSTR(VALUE)) + v + F("'")); else @@ -555,13 +558,13 @@ void WiFiConfig::_handleSetAP(void) str = server->arg(F("_s")); if (str.length() > 0) { - _storeString(configBase + offsetof(wificonfigarea_t, ssid), elementSize(wificonfigarea_t, ssid), str); + EES_storeString(configBase + offsetof(wificonfigarea_t, ssid), elementSize(wificonfigarea_t, ssid), str); str = server->arg(F("_p")); - _storeString(configBase + offsetof(wificonfigarea_t, pass), elementSize(wificonfigarea_t, pass), str); + EES_storeString(configBase + offsetof(wificonfigarea_t, pass), elementSize(wificonfigarea_t, pass), str); str = server->arg(F("_n")); - _storeString(configBase + offsetof(wificonfigarea_t, devname), elementSize(wificonfigarea_t, devname), str); + EES_storeString(configBase + offsetof(wificonfigarea_t, devname), elementSize(wificonfigarea_t, devname), str); str = server->arg(F("_a")); if (str.length() > 0) @@ -617,10 +620,10 @@ void WiFiConfig::_handleSetAP(void) WiFi.disconnect(); // vsechno odpojime WiFi.persistent(true); // chceme, aby si modul zapamatoval konfiguraci - String s = _readString(configBase + offsetof(wificonfigarea_t, devname), elementSize(wificonfigarea_t, devname)); + String s = EES_readString(configBase + offsetof(wificonfigarea_t, devname), elementSize(wificonfigarea_t, devname)); strcpy(WiFiDeviceName, s.c_str()); - s = _readString(configBase + offsetof(wificonfigarea_t, ssid), elementSize(wificonfigarea_t, ssid)); - String pass = _readString(configBase + offsetof(wificonfigarea_t, pass), elementSize(wificonfigarea_t, pass)); + s = EES_readString(configBase + offsetof(wificonfigarea_t, ssid), elementSize(wificonfigarea_t, ssid)); + String pass = EES_readString(configBase + offsetof(wificonfigarea_t, pass), elementSize(wificonfigarea_t, pass)); switch (EEPROM.read(configBase + offsetof(wificonfigarea_t, mode))) { @@ -758,80 +761,6 @@ wificonfigresult_t WiFiConfig::_setupAP(wificonfig_cb cb) return WCR_TIMEOUT; // nepripojeno, vyprsel timeout konfiguracniho AP } -String WiFiConfig::_readString(unsigned int start, size_t maxlen) -{ - uint8_t key[4]; - unsigned int enciphidx = 0; - String result; - unsigned int top = EEPROM.read(start); - unsigned int i; - - result.reserve(maxlen); - uint32_t cid = ESP_getChipId(); - uint32_t *pkey = (uint32_t *)&key[0]; - *pkey = cid; - DEBUG_MSG("Key = %02X:%02X:%02X:%02X\r\n", key[0], key[1], key[2], key[3]); - if ((top > 0) && (top < (maxlen - 2))) - { - uint8_t b; - for (i = start + 1; i < + start + top + 1; ++i) - { - b = EEPROM.read(i); - - b ^= key[enciphidx]; - ++enciphidx; - enciphidx %= sizeof(key); - - result.concat(char(b)); - } - b = EEPROM.read(i) ^ key[enciphidx]; - if (b != 0) - { - DEBUG_MSG("_readString error! (%s)\r\n", result.c_str()); - result = F(""); // spatna ukoncovaci nula - neplatny retezec - } - } - return result; -} - -bool WiFiConfig::_storeString(unsigned int start, size_t maxlen, String &string) -{ - uint8_t key[4]; - unsigned int enciphidx = 0; - unsigned int si = 0; - unsigned int top; - char c; - bool result = false; // retezec nebyl ulozeny cely (nevesel s do bufferu) - unsigned int i; - - if (string.length() > maxlen - 2) - top = maxlen - 2; - else - { - result = true; // retezec se do urceneho mista vejde - top = string.length(); - } - - uint32_t cid = ESP_getChipId(); - uint32_t *pkey = (uint32_t *)&key[0]; - *pkey = cid; - DEBUG_MSG("Key = %02X:%02X:%02X:%02X\r\n", key[0], key[1], key[2], key[3]); - EEPROM.write(start, (uint8_t)top); // ulozime delku retezce (pouzite pr kontrolu pri vycitani) - for (i = start + 1; i < start + top + 1; ++i) - { - c = string[si]; - c ^= key[enciphidx]; - ++enciphidx; - enciphidx %= sizeof(key); - EEPROM.write(i, c); - ++si; - } - c = 0 ^ key[enciphidx]; - EEPROM.write(i, c); // ukoncovaci a kontrolni nula - - return result; -} - // Testovani, zda se modul pripojil k AP bool WiFiConfig::_testWifi(wificonfig_cb cb) { @@ -841,10 +770,10 @@ bool WiFiConfig::_testWifi(wificonfig_cb cb) // nakonfigurujeme ESP dle nove nastavenych parametru WiFi.disconnect(); // vsechno odpojime - String s = _readString(configBase + offsetof(wificonfigarea_t, devname), elementSize(wificonfigarea_t, devname)); + String s = EES_readString(configBase + offsetof(wificonfigarea_t, devname), elementSize(wificonfigarea_t, devname)); strcpy(WiFiDeviceName, s.c_str()); - s = _readString(configBase + offsetof(wificonfigarea_t, ssid), elementSize(wificonfigarea_t, ssid)); - String pass = _readString(configBase + offsetof(wificonfigarea_t, pass), elementSize(wificonfigarea_t, pass)); + s = EES_readString(configBase + offsetof(wificonfigarea_t, ssid), elementSize(wificonfigarea_t, ssid)); + String pass = EES_readString(configBase + offsetof(wificonfigarea_t, pass), elementSize(wificonfigarea_t, pass)); switch (EEPROM.read(configBase + offsetof(wificonfigarea_t, mode))) { @@ -942,7 +871,7 @@ wificonfigresult_t WiFiConfig::begin(int configarea, int forceConfigure, wificon else #endif { - String s = _readString(configBase + offsetof(wificonfigarea_t, devname), elementSize(wificonfigarea_t, devname)); + String s = EES_readString(configBase + offsetof(wificonfigarea_t, devname), elementSize(wificonfigarea_t, devname)); strcpy(WiFiDeviceName, s.c_str()); switch (EEPROM.read(configBase + offsetof(wificonfigarea_t, mode)))