mirrors
/
Tasmota
mirror of https://github.com/arendst/Tasmota.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix tls time with new NTP client

This commit is contained in:
Stephan Hadinger 2020-11-06 18:27:43 +01:00
parent fa7fdbd51a
commit a2b11520fe
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/lib_ssl/bearssl-esp8266/src/t_inner.h
View File

@ -433,7 +433,9 @@
*/ */
#ifndef BR_USE_UNIX_TIME #ifndef BR_USE_UNIX_TIME
#if defined __unix__ || defined __linux__ || defined ESP8266 || defined ESP32\ /*#if defined __unix__ || defined __linux__ || defined ESP8266 || defined ESP32\*/
// Tasmota now uses its own NTP client so we need to pass explicitly the current time
#if defined __unix__ || defined __linux__ || defined ESP32\
|| defined _POSIX_SOURCE || defined _POSIX_C_SOURCE \ || defined _POSIX_SOURCE || defined _POSIX_C_SOURCE \
|| (defined __APPLE__ && defined __MACH__) || (defined __APPLE__ && defined __MACH__)
#define BR_USE_UNIX_TIME 1 #define BR_USE_UNIX_TIME 1

6
tasmota/WiFiClientSecureLightBearSSL.cpp
View File

@ -67,6 +67,9 @@ void _Log_heap_size(const char *msg) {
#define LOG_HEAP_SIZE(a) #define LOG_HEAP_SIZE(a)
#endif #endif
// get UTC time from Tasmota
extern uint32_t UtcTime(void);
// Stack thunked versions of calls // Stack thunked versions of calls
// Initially in BearSSLHelpers.h // Initially in BearSSLHelpers.h
extern "C" { extern "C" {
@ -179,7 +182,6 @@ void WiFiClientSecure_light::_clear() {
_eng = nullptr; _eng = nullptr;
_iobuf_in = nullptr; _iobuf_in = nullptr;
_iobuf_out = nullptr; _iobuf_out = nullptr;
_now = 0; // You can override or ensure time() is correct w/configTime
setBufferSizes(1024, 1024); // reasonable minimum setBufferSizes(1024, 1024); // reasonable minimum
_handshake_done = false; _handshake_done = false;
_last_error = 0; _last_error = 0;
@ -918,6 +920,8 @@ bool WiFiClientSecure_light::_connectSSL(const char* hostName) {
br_x509_minimal_set_rsa(x509_minimal, br_ssl_engine_get_rsavrfy(_eng)); br_x509_minimal_set_rsa(x509_minimal, br_ssl_engine_get_rsavrfy(_eng));
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();
br_x509_minimal_set_time(x509_minimal, now / 86400 + 719528, now % 86400);
#else #else
x509_insecure = (br_x509_pubkeyfingerprint_context*) malloc(sizeof(br_x509_pubkeyfingerprint_context)); x509_insecure = (br_x509_pubkeyfingerprint_context*) malloc(sizeof(br_x509_pubkeyfingerprint_context));

1
tasmota/WiFiClientSecureLightBearSSL.h
View File

@ -112,7 +112,6 @@ class WiFiClientSecure_light : public WiFiClient {
br_ssl_engine_context *_eng; // &_sc->eng, to allow for client or server contexts br_ssl_engine_context *_eng; // &_sc->eng, to allow for client or server contexts
std::shared_ptr<unsigned char> _iobuf_in; std::shared_ptr<unsigned char> _iobuf_in;
std::shared_ptr<unsigned char> _iobuf_out; std::shared_ptr<unsigned char> _iobuf_out;
time_t _now;
int _iobuf_in_size; int _iobuf_in_size;
int _iobuf_out_size; int _iobuf_out_size;
bool _handshake_done; bool _handshake_done;