jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-23 10:46:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make TLS resilient to NTP failure

Browse Source
This commit is contained in:
Stephan Hadinger 2020-11-06 21:37:38 +01:00
parent 8f76f8197a
commit 32ea8e503d
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tasmota/WiFiClientSecureLightBearSSL.cpp
View File

@ -69,6 +69,7 @@ void _Log_heap_size(const char *msg) {
// get UTC time from Tasmota // get UTC time from Tasmota
extern uint32_t UtcTime(void); extern uint32_t UtcTime(void);
extern uint32_t CfgTime(void);
// Stack thunked versions of calls // Stack thunked versions of calls
// Initially in BearSSLHelpers.h // Initially in BearSSLHelpers.h
@ -921,6 +922,8 @@ bool WiFiClientSecure_light::_connectSSL(const char* hostName) {
br_x509_minimal_set_hash(x509_minimal, br_sha256_ID, &br_sha256_vtable); br_x509_minimal_set_hash(x509_minimal, br_sha256_ID, &br_sha256_vtable);
br_ssl_engine_set_x509(_eng, &x509_minimal->vtable); br_ssl_engine_set_x509(_eng, &x509_minimal->vtable);
uint32_t now = UtcTime(); uint32_t now = UtcTime();
uint32_t cfg_time = CfgTime();
if (cfg_time > now) { now = cfg_time; }
br_x509_minimal_set_time(x509_minimal, now / 86400 + 719528, now % 86400); br_x509_minimal_set_time(x509_minimal, now / 86400 + 719528, now % 86400);
#else #else

5
tasmota/settings.ino
View File

@ -613,6 +613,11 @@ void SettingsLoad(void) {
RtcSettingsLoad(); RtcSettingsLoad();
} }
// Used in TLS - returns the timestamp of the last Flash settings write
uint32_t CfgTime(void) {
return Settings.cfg_timestamp;
}
void EspErase(uint32_t start_sector, uint32_t end_sector) void EspErase(uint32_t start_sector, uint32_t end_sector)
{ {
bool serial_output = (LOG_LEVEL_DEBUG_MORE <= TasmotaGlobal.seriallog_level); bool serial_output = (LOG_LEVEL_DEBUG_MORE <= TasmotaGlobal.seriallog_level);