Merge remote-tracking branch 'upstream/master' into arduino-3

Author: willmmiles

examples/regex_patterns/build_opt.h

@@ -0,0 +1 @@
+-DASYNCWEBSERVER_REGEX=1

src/AsyncEventSource.cpp

@@ -19,6 +19,11 @@
 */
 #include "Arduino.h"
 #include "AsyncEventSource.h"
+#ifdef ESP32
+#if ESP_IDF_VERSION_MAJOR >= 5
+#include "rom/ets_sys.h"
+#endif
+#endif
 
 static String generateEventMessage(const char *message, const char *event, uint32_t id, uint32_t reconnect){
   String ev = "";

src/AsyncWebSocket.cpp

@@ -28,6 +28,11 @@
 #else
 #include <Hash.h>
 #endif
+#ifdef ESP32
+#if ESP_IDF_VERSION_MAJOR >= 5
+#include "rom/ets_sys.h"
+#endif
+#endif
 
 #ifdef ASYNCWEBSERVER_DEBUG_TRACE
 #define DEBUG_PRINTFP(fmt, ...) Serial.printf_P(PSTR("[%u]{%d}" fmt "\n"), (unsigned) millis(), ESP.getFreeHeap(), ##__VA_ARGS__)
@@ -829,7 +834,7 @@ void AsyncWebSocketClient::binary(AsyncWebSocketMessageBuffer* buffer)
 
 IPAddress AsyncWebSocketClient::remoteIP() {
     if(!_client) {
-        return IPAddress((uint32_t)0);
+        return IPAddress((uint32_t)0U);
     }
     return _client->remoteIP();
 }
@@ -1231,9 +1236,15 @@ AsyncWebSocketResponse::AsyncWebSocketResponse(const String& key, AsyncWebSocket
   (String&)key += FPSTR(WS_STR_UUID);
   mbedtls_sha1_context ctx;
   mbedtls_sha1_init(&ctx);
+#if ESP_IDF_VERSION_MAJOR < 5
   mbedtls_sha1_starts_ret(&ctx);
   mbedtls_sha1_update_ret(&ctx, (const unsigned char*)key.c_str(), key.length());
   mbedtls_sha1_finish_ret(&ctx, hash);
+#else
+  mbedtls_sha1_starts(&ctx);
+  mbedtls_sha1_update(&ctx, (const unsigned char*)key.c_str(), key.length());
+  mbedtls_sha1_finish(&ctx, hash);
+#endif
   mbedtls_sha1_free(&ctx);
 #endif
   base64_encodestate _state;

src/WebAuthentication.cpp

@@ -68,9 +68,15 @@ static bool getMD5(uint8_t * data, uint16_t len, char * output){//33 bytes or mo
   uint8_t _buf[16] = {0};
 #ifdef ESP32
   mbedtls_md5_init(&_ctx);
+#if ESP_IDF_VERSION_MAJOR < 5
   mbedtls_md5_starts_ret(&_ctx);
   mbedtls_md5_update_ret(&_ctx, data, len);
   mbedtls_md5_finish_ret(&_ctx, _buf);
+#else
+  mbedtls_md5_starts(&_ctx);
+  mbedtls_md5_update(&_ctx, data, len);
+  mbedtls_md5_finish(&_ctx, _buf);
+#endif
 #else
   MD5Init(&_ctx);
   MD5Update(&_ctx, data, len);