Merge branch 'master' into esp32-s3-support

Author: me-no-dev

Diff for: libraries/HTTPClient/src/HTTPClient.cpp

@@ -1645,7 +1645,7 @@ void HTTPClient::setCookie(String date, String headerValue)
 	for (auto c = _cookieJar->begin(); c != _cookieJar->end(); ++c) {
         if (c->domain == cookie.domain && c->name == cookie.name) {
             // when evaluating, max-age takes precedence over expires if both are defined
-            if (cookie.max_age.valid && ((cookie.date + cookie.max_age.duration) < now_gmt || cookie.max_age.duration <= 0)
+            if ((cookie.max_age.valid && ((cookie.date + cookie.max_age.duration) < now_gmt)) || cookie.max_age.duration <= 0
             || (!cookie.max_age.valid && cookie.expires.valid && cookie.expires.date < now_gmt)) {
                 _cookieJar->erase(c);
                 c--;
@@ -1671,7 +1671,7 @@ bool HTTPClient::generateCookieString(String *cookieString)
     bool found = false;
 
  	for (auto c = _cookieJar->begin(); c != _cookieJar->end(); ++c) {
-        if (c->max_age.valid && ((c->date + c->max_age.duration) < now_gmt) || (!c->max_age.valid && c->expires.valid && c->expires.date < now_gmt)) {
+        if ((c->max_age.valid && ((c->date + c->max_age.duration) < now_gmt)) || (!c->max_age.valid && c->expires.valid && c->expires.date < now_gmt)) {
             _cookieJar->erase(c);
             c--;
         } else if (_host.indexOf(c->domain) >= 0 && (!c->secure || _secure) ) {
@@ -1684,5 +1684,3 @@ bool HTTPClient::generateCookieString(String *cookieString)
     }
     return found;
 }
-
-

Diff for: libraries/WiFiClientSecure/src/ssl_client.cpp

@@ -20,7 +20,7 @@
 #include "esp_crt_bundle.h"
 #include "WiFi.h"
 
-#ifndef MBEDTLS_KEY_EXCHANGE__SOME__PSK_ENABLED
+#if !defined(MBEDTLS_KEY_EXCHANGE__SOME__PSK_ENABLED) && !defined(MBEDTLS_KEY_EXCHANGE_SOME_PSK_ENABLED)
 #  warning "Please configure IDF framework to include mbedTLS -> Enable pre-shared-key ciphersuites and activate at least one cipher"
 #else