Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/ISSUE_TEMPLATE/Issue-report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ body:
- latest stable Release (if not listed below)
- latest development Release Candidate (RC-X)
- latest master (checkout manually)
- v3.3.2
- v3.3.2
- v3.3.1
- v3.3.0
- v3.2.1
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ jobs:
- name: Checkout repository
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
token: ${{ secrets.TOOLS_UPLOAD_PAT }}
ref: ${{ github.event.release.target_commitish }}
fetch-depth: 0

Expand All @@ -33,5 +34,5 @@ jobs:

- name: Build Release
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GITHUB_TOKEN: ${{ secrets.TOOLS_UPLOAD_PAT }}
run: bash ./.github/scripts/on-release.sh
2 changes: 1 addition & 1 deletion .gitlab/workflows/common.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ stages:

variables:
ESP_IDF_VERSION: "5.5"
ESP_ARDUINO_VERSION: "3.3.1"
ESP_ARDUINO_VERSION: "3.3.2"

#############
# `default` #
Expand Down
14 changes: 14 additions & 0 deletions cores/esp32/HEXBuilder.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
*/

#include "HEXBuilder.h"
#include <ctype.h>

static uint8_t hex_char_to_byte(uint8_t c) {
return (c >= 'a' && c <= 'f') ? (c - ((uint8_t)'a' - 0xa))
Expand All @@ -26,6 +27,19 @@ static uint8_t hex_char_to_byte(uint8_t c) {
: 0x10; // unknown char is 16
}

bool HEXBuilder::isHexString(const char *str, size_t len) {
for (size_t i = 0; i < len; i++) {
if (isxdigit(str[i]) == 0) {
return false;
}
}
return true;
}

bool HEXBuilder::isHexString(String str) {
return isHexString(str.c_str(), str.length());
}

size_t HEXBuilder::hex2bytes(unsigned char *out, size_t maxlen, String &in) {
return hex2bytes(out, maxlen, in.c_str());
}
Expand Down
3 changes: 3 additions & 0 deletions cores/esp32/HEXBuilder.h
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,8 @@ class HEXBuilder {

static String bytes2hex(const unsigned char *in, size_t len);
static size_t bytes2hex(char *out, size_t maxlen, const unsigned char *in, size_t len);

static bool isHexString(const char *str, size_t len);
static bool isHexString(String str);
};
#endif
2 changes: 1 addition & 1 deletion cores/esp32/esp_arduino_version.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ extern "C" {
/** Minor version number (x.X.x) */
#define ESP_ARDUINO_VERSION_MINOR 3
/** Patch version number (x.x.X) */
#define ESP_ARDUINO_VERSION_PATCH 1
#define ESP_ARDUINO_VERSION_PATCH 2

/**
* Macro to convert ARDUINO version number into an integer
Expand Down
2 changes: 1 addition & 1 deletion docs/conf_common.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

# Used for substituting variables in the documentation
rst_prolog = """
.. |version| replace:: 3.3.1
.. |version| replace:: 3.3.2
.. |idf_version| replace:: 5.5
"""

Expand Down
2 changes: 1 addition & 1 deletion libraries/ArduinoOTA/library.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name=ArduinoOTA
version=3.3.1
version=3.3.2
author=Ivan Grokhotkov and Hristo Gochkov
maintainer=Hristo Gochkov <hristo@espressif.com>
sentence=Enables Over The Air upgrades, via wifi and espota.py UDP request/TCP download.
Expand Down
21 changes: 21 additions & 0 deletions libraries/ArduinoOTA/src/ArduinoOTA.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
#include "ArduinoOTA.h"
#include "NetworkClient.h"
#include "ESPmDNS.h"
#include "HEXBuilder.h"
#include "SHA2Builder.h"
#include "PBKDF2_HMACBuilder.h"
#include "Update.h"
Expand Down Expand Up @@ -86,6 +87,26 @@ ArduinoOTAClass &ArduinoOTAClass::setPassword(const char *password) {

ArduinoOTAClass &ArduinoOTAClass::setPasswordHash(const char *password) {
if (_state == OTA_IDLE && password) {
size_t len = strlen(password);
bool is_hex = HEXBuilder::isHexString(password, len);

if (!is_hex) {
log_e("Invalid password hash. Expected hex string (0-9, a-f, A-F).");
return *this;
}

if (len == 32) {
// Warn if MD5 hash is detected (32 hex characters)
log_w("MD5 password hash detected. MD5 is deprecated and insecure.");
log_w("Please use setPassword() with plain text or setPasswordHash() with SHA256 hash (64 chars).");
log_w("To generate SHA256: echo -n 'yourpassword' | sha256sum");
} else if (len == 64) {
log_i("Using SHA256 password hash.");
} else {
log_e("Invalid password hash length. Expected 32 (deprecated MD5) or 64 (SHA256) characters.");
return *this;
}

// Store the pre-hashed password directly
_password.clear();
_password = password;
Expand Down
2 changes: 1 addition & 1 deletion libraries/AsyncUDP/library.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name=ESP32 Async UDP
version=3.3.1
version=3.3.2
author=Me-No-Dev
maintainer=Me-No-Dev
sentence=Async UDP Library for ESP32
Expand Down
2 changes: 1 addition & 1 deletion libraries/BLE/library.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name=BLE
version=3.3.1
version=3.3.2
author=Neil Kolban <kolban1@kolban.com>
maintainer=lucasssvaz
sentence=BLE functions for ESP32
Expand Down
2 changes: 1 addition & 1 deletion libraries/BluetoothSerial/library.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name=BluetoothSerial
version=3.3.1
version=3.3.2
author=Evandro Copercini
maintainer=Evandro Copercini
sentence=Simple UART to Classical Bluetooth bridge for ESP32
Expand Down
2 changes: 1 addition & 1 deletion libraries/DNSServer/library.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name=DNSServer
version=3.3.1
version=3.3.2
author=Kristijan Novoselić
maintainer=Kristijan Novoselić, <kristijan.novoselic@gmail.com>
sentence=A simple DNS server for ESP32.
Expand Down
2 changes: 1 addition & 1 deletion libraries/EEPROM/library.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name=EEPROM
version=3.3.1
version=3.3.2
author=Ivan Grokhotkov
maintainer=Paolo Becchi <pbecchi@aerobusiness.it>
sentence=Enables reading and writing data a sequential, addressable FLASH storage
Expand Down
2 changes: 1 addition & 1 deletion libraries/ESP32/library.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name=ESP32
version=3.3.1
version=3.3.2
author=Hristo Gochkov, Ivan Grokhtkov
maintainer=Hristo Gochkov <hristo@espressif.com>
sentence=ESP32 sketches examples
Expand Down
2 changes: 1 addition & 1 deletion libraries/ESP_I2S/library.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name=ESP_I2S
version=3.3.1
version=3.3.2
author=me-no-dev
maintainer=me-no-dev
sentence=Library for ESP I2S communication
Expand Down
2 changes: 1 addition & 1 deletion libraries/ESP_NOW/library.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name=ESP_NOW
version=3.3.1
version=3.3.2
author=me-no-dev
maintainer=P-R-O-C-H-Y
sentence=Library for ESP_NOW
Expand Down
2 changes: 1 addition & 1 deletion libraries/ESP_SR/library.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name=ESP_SR
version=3.3.1
version=3.3.2
author=me-no-dev
maintainer=me-no-dev
sentence=Library for ESP Sound Recognition
Expand Down
2 changes: 1 addition & 1 deletion libraries/ESPmDNS/library.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name=ESPmDNS
version=3.3.1
version=3.3.2
author=Hristo Gochkov, Ivan Grokhtkov
maintainer=Hristo Gochkov <hristo@espressif.com>
sentence=ESP32 mDNS Library
Expand Down
2 changes: 1 addition & 1 deletion libraries/Ethernet/library.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name=Ethernet
version=3.3.1
version=3.3.2
author=Hristo Gochkov
maintainer=Hristo Gochkov <hristo@espressif.com>
sentence=Enables network connection (local and Internet) using the ESP32 Ethernet.
Expand Down
2 changes: 1 addition & 1 deletion libraries/FFat/library.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name=FFat
version=3.3.1
version=3.3.2
author=Hristo Gochkov, Ivan Grokhtkov, Larry Bernstone
maintainer=Hristo Gochkov <hristo@espressif.com>
sentence=ESP32 FAT on Flash File System
Expand Down
2 changes: 1 addition & 1 deletion libraries/FS/library.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name=FS
version=3.3.1
version=3.3.2
author=Hristo Gochkov, Ivan Grokhtkov
maintainer=Hristo Gochkov <hristo@espressif.com>
sentence=ESP32 File System
Expand Down
2 changes: 1 addition & 1 deletion libraries/HTTPClient/library.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name=HTTPClient
version=3.3.1
version=3.3.2
author=Markus Sattler
maintainer=Markus Sattler
sentence=HTTP Client for ESP32
Expand Down
2 changes: 1 addition & 1 deletion libraries/HTTPUpdate/library.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name=HTTPUpdate
version=3.3.1
version=3.3.2
author=Markus Sattler
maintainer=Markus Sattler
sentence=Http Update for ESP32
Expand Down
2 changes: 1 addition & 1 deletion libraries/HTTPUpdateServer/library.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name=HTTPUpdateServer
version=3.3.1
version=3.3.2
author=Hristo Kapanakov
maintainer=
sentence=Simple HTTP Update server based on the WebServer
Expand Down
2 changes: 1 addition & 1 deletion libraries/Hash/library.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name=Hash
version=3.3.1
version=3.3.2
author=lucasssvaz
maintainer=lucasssvaz
sentence=Bundle of hashing functions for the ESP32
Expand Down
2 changes: 1 addition & 1 deletion libraries/Insights/library.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name=ESP Insights
version=3.3.1
version=3.3.2
author=Sanket Wadekar <sanket.wadekar@espressif.com>
maintainer=Sanket Wadekar <sanket.wadekar@espressif.com>
sentence=ESP Insights
Expand Down
2 changes: 1 addition & 1 deletion libraries/LittleFS/library.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name=LittleFS
version=3.3.1
version=3.3.2
author=
maintainer=
sentence=LittleFS for esp32
Expand Down
2 changes: 1 addition & 1 deletion libraries/Matter/library.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name=Matter
version=3.3.1
version=3.3.2
author=Rodrigo Garcia | GitHub @SuGlider
maintainer=Rodrigo Garcia <Rodrigo.Garcia@espressif.com>
sentence=Library for supporting Matter environment on ESP32.
Expand Down
2 changes: 1 addition & 1 deletion libraries/NetBIOS/library.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name=NetBIOS
version=3.3.1
version=3.3.2
author=Pablo@xpablo.cz
maintainer=Hristo Gochkov<hristo@espressif.com>
sentence=Enables NBNS (NetBIOS) name resolution.
Expand Down
2 changes: 1 addition & 1 deletion libraries/Network/library.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name=Networking
version=3.3.1
version=3.3.2
author=Hristo Gochkov
maintainer=Hristo Gochkov <hristo@espressif.com>
sentence=General network management library.
Expand Down
2 changes: 1 addition & 1 deletion libraries/NetworkClientSecure/library.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name=NetworkClientSecure
version=3.3.1
version=3.3.2
author=Evandro Luis Copercini
maintainer=Github Community
sentence=Enables secure network connection (local and Internet) using the ESP32 built-in WiFi.
Expand Down
2 changes: 1 addition & 1 deletion libraries/OpenThread/library.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name=OpenThread
version=3.3.1
version=3.3.2
author=Rodrigo Garcia | GitHub @SuGlider
maintainer=Rodrigo Garcia <Rodrigo.Garcia@espressif.com>
sentence=Library for OpenThread Network on ESP32.
Expand Down
2 changes: 1 addition & 1 deletion libraries/PPP/library.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name=PPP
version=3.3.1
version=3.3.2
author=Hristo Gochkov
maintainer=Hristo Gochkov <hristo@espressif.com>
sentence=Enables network connection using GSM Modem.
Expand Down
2 changes: 1 addition & 1 deletion libraries/Preferences/library.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name=Preferences
version=3.3.1
version=3.3.2
author=Hristo Gochkov
maintainer=Hristo Gochkov <hristo@espressif.com>
sentence=Provides friendly access to ESP32's Non-Volatile Storage
Expand Down
2 changes: 1 addition & 1 deletion libraries/RainMaker/library.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name=ESP RainMaker
version=3.3.1
version=3.3.2
author=Sweety Mhaiske <switi.mhaiske@espressif.com>
maintainer=Hristo Gochkov <hristo@espressif.com>
sentence=ESP RainMaker Support
Expand Down
2 changes: 1 addition & 1 deletion libraries/SD/library.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name=SD
version=3.3.1
version=3.3.2
author=Arduino, SparkFun
maintainer=Arduino <info@arduino.cc>
sentence=Enables reading and writing on SD cards. For all Arduino boards.
Expand Down
2 changes: 1 addition & 1 deletion libraries/SD_MMC/library.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name=SD_MMC
version=3.3.1
version=3.3.2
author=Hristo Gochkov, Ivan Grokhtkov
maintainer=Hristo Gochkov <hristo@espressif.com>
sentence=ESP32 SDMMC File System
Expand Down
2 changes: 1 addition & 1 deletion libraries/SPI/library.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name=SPI
version=3.3.1
version=3.3.2
author=Hristo Gochkov
maintainer=Hristo Gochkov <hristo@espressif.com>
sentence=Enables the communication with devices that use the Serial Peripheral Interface (SPI) Bus. For all Arduino boards, BUT Arduino DUE.
Expand Down
2 changes: 1 addition & 1 deletion libraries/SPIFFS/library.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name=SPIFFS
version=3.3.1
version=3.3.2
author=Hristo Gochkov, Ivan Grokhtkov
maintainer=Hristo Gochkov <hristo@espressif.com>
sentence=ESP32 SPIFFS File System
Expand Down
2 changes: 1 addition & 1 deletion libraries/SimpleBLE/library.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name=SimpleBLE
version=3.3.1
version=3.3.2
author=Hristo Gochkov
maintainer=Hristo Gochkov <hristo@espressif.com>
sentence=Provides really simple BLE advertizer with just on and off
Expand Down
2 changes: 1 addition & 1 deletion libraries/TFLiteMicro/library.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name=TFLite Micro
version=3.3.1
version=3.3.2
author=Sanket Wadekar
maintainer=Sanket Wadekar
sentence=TensorFlow Lite for Microcontrollers
Expand Down
2 changes: 1 addition & 1 deletion libraries/Ticker/library.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name=Ticker
version=3.3.1
version=3.3.2
author=Bert Melis
maintainer=Hristo Gochkov <hristo@espressif.com>
sentence=Allows to call functions with a given interval.
Expand Down
2 changes: 1 addition & 1 deletion libraries/USB/library.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name=USB
version=3.3.1
version=3.3.2
author=Hristo Gochkov
maintainer=Hristo Gochkov <hristo@espressif.com>
sentence=ESP32S2 USB Library
Expand Down
2 changes: 1 addition & 1 deletion libraries/Update/library.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name=Update
version=3.3.1
version=3.3.2
author=Hristo Gochkov
maintainer=Hristo Gochkov <hristo@espressif.com>
sentence=ESP32 Sketch Update Library
Expand Down
2 changes: 1 addition & 1 deletion libraries/WebServer/library.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name=WebServer
version=3.3.1
version=3.3.2
author=Ivan Grokhotkov
maintainer=Ivan Grokhtkov <ivan@esp8266.com>
sentence=Simple web server library
Expand Down
2 changes: 1 addition & 1 deletion libraries/WiFi/library.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name=WiFi
version=3.3.1
version=3.3.2
author=Hristo Gochkov
maintainer=Hristo Gochkov <hristo@espressif.com>
sentence=Enables network connection (local and Internet) using the ESP32 built-in WiFi.
Expand Down
Loading