Removed USE_WEBCLIENT and default USE_WEBCLIENT_HTTPS (#23132)

This commit is contained in:
s-hadinger 2025-03-10 22:37:27 +01:00 committed by GitHub
parent 7b8d2fe93d
commit f305113d6d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
11 changed files with 3 additions and 44 deletions

View File

@ -283,7 +283,6 @@ BERRY_LOCAL bclass_array be_class_table = {
&be_native_class(AXP2102),
#endif // USE_I2C
&be_native_class(md5),
#ifdef USE_WEBCLIENT
&be_native_class(udp),
&be_native_class(webclient),
&be_native_class(tcpclient),
@ -291,7 +290,6 @@ BERRY_LOCAL bclass_array be_class_table = {
#ifdef USE_BERRY_DEBUG
&be_native_class(webserver_async), // include only when USE_BERRY_DEBUG is enabled
#endif // USE_BERRY_DEBUG
#endif // USE_WEBCLIENT
#ifdef USE_BERRY_TCPSERVER
&be_native_class(tcpserver),
#endif // USE_BERRY_TCPSERVER

View File

@ -6,8 +6,6 @@
*******************************************************************/
#include "be_constobj.h"
#ifdef USE_WEBCLIENT
extern int wc_tcp_init(bvm *vm);
extern int wc_tcp_deinit(bvm *vm);
@ -44,5 +42,3 @@ class be_class_tcpclient (scope: global, name: tcpclient) {
readbytes, func(wc_tcp_readbytes)
}
@const_object_info_end */
#endif // USE_WEBCLIENT

View File

@ -5,8 +5,6 @@
*******************************************************************/
#include "be_constobj.h"
#ifdef USE_WEBCLIENT
extern int wc_tcpasync_init(bvm *vm);
extern int wc_tcpasync_deinit(bvm *vm);
@ -42,5 +40,3 @@ class be_class_tcpclientasync (scope: global, name: tcpclientasync) {
readbytes, func(wc_tcpasync_readbytes)
}
@const_object_info_end */
#endif // USE_WEBCLIENT

View File

@ -7,8 +7,6 @@
#include "be_constobj.h"
#include "be_mapping.h"
#ifdef USE_WEBCLIENT
extern int be_udp_read(struct bvm *vm);
extern void *be_udp_init_ntv(void);
@ -53,5 +51,3 @@ class be_class_udp (scope: global, name: udp) {
close, ctype_func(be_udp_stop_ntv)
}
@const_object_info_end */
#endif // USE_WEBCLIENT

View File

@ -6,8 +6,6 @@
*******************************************************************/
#include "be_constobj.h"
#ifdef USE_WEBCLIENT
extern int wc_init(bvm *vm);
extern int wc_deinit(bvm *vm);
extern int wc_urlencode(bvm *vm);
@ -72,5 +70,3 @@ class be_class_webclient (scope: global, name: webclient) {
get_bytes, func(wc_getbytes)
}
@const_object_info_end */
#endif // USE_WEBCLIENT

View File

@ -1005,8 +1005,7 @@
#undef USE_PING
#undef USE_AUTOCONF
#undef USE_BERRY
//#undef USE_WEBCLIENT
//#undef USE_WEBCLIENT_HTTPS
#undef USE_WEBCLIENT_HTTPS
#endif // FIRMWARE_MINICUSTOM

View File

@ -183,8 +183,6 @@
#define USE_TLS
#define USE_WEBSERVER
#define USE_WEBCLIENT
#define USE_WEBCLIENT_HTTPS
#undef USE_ESP32_WDT // disable watchdog on SAFEBOOT until more testing is done
@ -302,8 +300,6 @@
#undef USE_HOME_ASSISTANT
#define USE_TASMOTA_DISCOVERY // Enable Tasmota Discovery support (+2k code)
#define USE_WEBCLIENT_HTTPS
#define USE_I2S
#define USE_SPI
#define USE_LVGL
@ -509,8 +505,6 @@
#undef USE_HOME_ASSISTANT
#define USE_TASMOTA_DISCOVERY // Enable Tasmota Discovery support (+2k code)
#define USE_WEBCLIENT_HTTPS
#define USE_ZIGBEE
#define USE_TCP_BRIDGE

View File

@ -1200,9 +1200,8 @@
// #define USE_BERRY_DEBUG // Compile Berry bytecode with line number information, makes exceptions easier to debug. Adds +8% of memory consumption for compiled code
// #define UBE_BERRY_DEBUG_GC // Print low-level GC metrics
// #define USE_BERRY_INT64 // Add 64 bits integer support (+1.7KB Flash)
#define USE_WEBCLIENT // Enable `webclient` to make HTTP/HTTPS requests.
// #define USE_WEBCLIENT_HTTPS // Enable HTTPS outgoing requests based on BearSSL (much ligher then mbedTLS, 42KB vs 150KB) in insecure mode (no verification of server's certificate)
// Note that only one cipher is enabled: ECDHE_RSA_WITH_AES_128_GCM_SHA256 which is very commonly used and highly secure
#define USE_WEBCLIENT_HTTPS // Enable HTTPS outgoing requests based on BearSSL (much ligher then mbedTLS, 42KB vs 150KB) in insecure mode (no verification of server's certificate)
// Note that only two ciphers are enabled: ECDHE_RSA_WITH_AES_128_GCM_SHA256, ECDHE_ECDSA_WITH_AES_128_GCM_SHA256
#define USE_BERRY_WEBCLIENT_USERAGENT "TasmotaClient" // default user-agent used, can be changed with `wc.set_useragent()`
#define USE_BERRY_WEBCLIENT_TIMEOUT 2000 // Default timeout in milliseconds
#define USE_BERRY_LEDS_PANEL // Add button to dynamically load the Leds Panel from a bec file online

View File

@ -21,8 +21,6 @@
#ifdef USE_BERRY
#ifdef USE_WEBCLIENT
#include <berry.h>
// #include "be_sys.h"
#include <lwip/sockets.h>
@ -580,5 +578,4 @@ extern "C" {
}
#endif // USE_WEBCLIENT
#endif // USE_BERRY

View File

@ -21,14 +21,6 @@
#ifdef USE_BERRY
#ifdef USE_WEBCLIENT
// extern int be_udp_init(bvm *vm);
// extern int be_udp_deinit(bvm *vm);
// extern int be_udp_begin(bvm *vm);
// extern int be_udp_begin_mcast(bvm *vm);
#include <Arduino.h>
#include <WiFiUdp.h>
#include "be_mapping.h"
@ -151,5 +143,4 @@ extern "C" {
}
}
#endif // USE_WEBCLIENT
#endif // USE_BERRY

View File

@ -21,8 +21,6 @@
#ifdef USE_BERRY
#ifdef USE_WEBCLIENT
#include <berry.h>
#include "HttpClientLight.h"
#include "be_sys.h"
@ -750,5 +748,4 @@ extern "C" {
}
}
#endif // USE_WEBCLIENT
#endif // USE_BERRY