Merge branch 'master' into to_2.5.0-4

Author: earlephilhower

cores/esp8266/AddrList.h

@@ -167,8 +167,6 @@ class AddressListIterator
     bool operator== (AddressListIterator& o) { return netIf.equal(*o); }
     bool operator!= (AddressListIterator& o) { return !netIf.equal(*o); }
 
-    AddressListIterator& operator= (const AddressListIterator& o) { netIf = o.netIf; return *this; }
-
     AddressListIterator operator++ (int)
     {
         AddressListIterator ret = *this;

cores/esp8266/Arduino.h

@@ -159,7 +159,7 @@ void ets_intr_unlock();
 // level 15 will disable ALL interrupts,
 // level 0 will enable ALL interrupts,
 //
-#define xt_rsil(level) (__extension__({uint32_t state; __asm__ __volatile__("rsil %0," __STRINGIFY(level) : "=a" (state)); state;}))
+#define xt_rsil(level) (__extension__({uint32_t state; __asm__ __volatile__("rsil %0," __STRINGIFY(level) : "=a" (state) :: "memory"); state;}))
 #define xt_wsr_ps(state)  __asm__ __volatile__("wsr %0,ps; isync" :: "a" (state) : "memory")
 
 #define interrupts() xt_rsil(0)

cores/esp8266/IPAddress.h

@@ -136,6 +136,7 @@ class IPAddress: public Printable {
         // Overloaded copy operators to allow initialisation of IPAddress objects from other types
         IPAddress& operator=(const uint8_t *address);
         IPAddress& operator=(uint32_t address);
+        IPAddress& operator=(const IPAddress&) = default;
 
         virtual size_t printTo(Print& p) const;
         String toString() const;

cores/esp8266/WString.h

@@ -82,6 +82,12 @@ class String {
                 return 0;
             }
         }
+        inline void clear(void) {
+            setLen(0);
+        }
+        inline bool isEmpty(void) const {
+            return length() == 0;
+        }
 
         // creates a copy of the assigned value.  if the value is null or
         // invalid, or if the memory allocation fails, the string will be

cores/esp8266/core_esp8266_postmortem.cpp

@@ -52,6 +52,13 @@ static void uart0_write_char_d(char c);
 static void uart1_write_char_d(char c);
 static void print_stack(uint32_t start, uint32_t end);
 
+// using numbers different from "REASON_" in user_interface.h (=0..6)
+enum rst_reason_sw
+{
+    REASON_USER_SWEXCEPTION_RST = 254
+};
+static int s_user_reset_reason = REASON_DEFAULT_RST;
+
 // From UMM, the last caller of a malloc/realloc/calloc which failed:
 extern void *umm_last_fail_alloc_addr;
 extern int umm_last_fail_alloc_size;
@@ -86,24 +93,20 @@ void __wrap_system_restart_local() {
     register uint32_t sp asm("a1");
     uint32_t sp_dump = sp;
 
-    if (gdb_present()) {
-        /* When GDBStub is present, exceptions are handled by GDBStub,
-           but Soft WDT will still call this function.
-           Trigger an exception to break into GDB.
-           TODO: check why gdb_do_break() or asm("break.n 0") do not
-           break into GDB here. */
-        raise_exception();
-    }
-
     struct rst_info rst_info;
     memset(&rst_info, 0, sizeof(rst_info));
-    system_rtc_mem_read(0, &rst_info, sizeof(rst_info));
-    if (rst_info.reason != REASON_SOFT_WDT_RST &&
-        rst_info.reason != REASON_EXCEPTION_RST &&
-        rst_info.reason != REASON_WDT_RST)
+    if (s_user_reset_reason == REASON_DEFAULT_RST)
     {
-        return;
+        system_rtc_mem_read(0, &rst_info, sizeof(rst_info));
+        if (rst_info.reason != REASON_SOFT_WDT_RST &&
+            rst_info.reason != REASON_EXCEPTION_RST &&
+            rst_info.reason != REASON_WDT_RST)
+        {
+            rst_info.reason = REASON_DEFAULT_RST;
+        }
     }
+    else
+        rst_info.reason = s_user_reset_reason;
 
     // TODO:  ets_install_putc1 definition is wrong in ets_sys.h, need cast
     ets_install_putc1((void *)&uart_write_char_d);
@@ -128,6 +131,9 @@ void __wrap_system_restart_local() {
     else if (rst_info.reason == REASON_SOFT_WDT_RST) {
         ets_printf_P(PSTR("\nSoft WDT reset\n"));
     }
+    else {
+        ets_printf_P(PSTR("\nGeneric Reset\n"));
+    }
 
     uint32_t cont_stack_start = (uint32_t) &(g_pcont->stack);
     uint32_t cont_stack_end = (uint32_t) g_pcont->stack_end;
@@ -222,7 +228,13 @@ static void uart1_write_char_d(char c) {
 }
 
 static void raise_exception() {
-    __asm__ __volatile__ ("syscall");
+    if (gdb_present())
+        __asm__ __volatile__ ("syscall"); // triggers GDB when enabled
+
+    s_user_reset_reason = REASON_USER_SWEXCEPTION_RST;
+    ets_printf_P(PSTR("\nUser exception (panic/abort/assert)"));
+    __wrap_system_restart_local();
+
     while (1); // never reached, needed to satisfy "noreturn" attribute
 }
 

cores/esp8266/core_esp8266_wiring_digital.cpp

@@ -252,7 +252,7 @@ extern void initPins() {
 
 extern void pinMode(uint8_t pin, uint8_t mode) __attribute__ ((weak, alias("__pinMode")));
 extern void digitalWrite(uint8_t pin, uint8_t val) __attribute__ ((weak, alias("__digitalWrite")));
-extern int digitalRead(uint8_t pin) __attribute__ ((weak, alias("__digitalRead")));
+extern int digitalRead(uint8_t pin) __attribute__ ((weak, alias("__digitalRead"), nothrow));
 extern void attachInterrupt(uint8_t pin, voidFuncPtr handler, int mode) __attribute__ ((weak, alias("__attachInterrupt")));
 extern void attachInterruptArg(uint8_t pin, voidFuncPtrArg handler, void* arg, int mode) __attribute__((weak, alias("__attachInterruptArg")));
 extern void detachInterrupt(uint8_t pin) __attribute__ ((weak, alias("__detachInterrupt")));

cores/esp8266/umm_malloc/umm_malloc_cfg.h

@@ -91,7 +91,7 @@ void* realloc_loc (void* p, size_t s, const char* file, int line);
  #define UMM_BEST_FIT
 
 /* Start addresses and the size of the heap */
-extern char _heap_start;
+extern char _heap_start[];
 #define UMM_MALLOC_CFG__HEAP_ADDR   ((uint32_t)&_heap_start)
 #define UMM_MALLOC_CFG__HEAP_SIZE   ((size_t)(0x3fffc000 - UMM_MALLOC_CFG__HEAP_ADDR))
 

doc/esp8266wifi/bearssl-client-secure-class.rst

@@ -109,7 +109,7 @@ See the `BearSSL_CertStore` example for full details as the `BearSSL::CertStore`
 Supported Crypto
 ~~~~~~~~~~~~~~~~
 
-Please see the `BearSSL website <htps://bearssl.org>`__ for detailed cryptographic information.  In general, TLS 1.2, TLS 1.1, and TLS 1.0 are supported with RSA and Elliptic Curve keys and a very rich set of hashing and symmetric encryption codes.  Please note that Elliptic Curve (EC) key operations take a significant amount of time.
+Please see the `BearSSL website <https://bearssl.org>`__ for detailed cryptographic information.  In general, TLS 1.2, TLS 1.1, and TLS 1.0 are supported with RSA and Elliptic Curve keys and a very rich set of hashing and symmetric encryption codes.  Please note that Elliptic Curve (EC) key operations take a significant amount of time.
 
 
 BearSSL::WiFiClientSecure Class
@@ -139,6 +139,8 @@ setFingerprint(const uint8_t fp[20]) / setFingerprint(const char \*fpStr)
 
 Verify the SHA1 fingerprint of the certificate returned matches this one.  If the server certificate changes, it will fail.  If an array of 20 bytes are sent in, it is assumed they are the binary SHA1 values.  If a `char*` string is passed in, it is parsed as a series of human-readable hex values separated by spaces or colons (e.g. `setFingerprint("00:01:02:03:...:1f");`)
 
+This fingerprint is calcuated on the raw X509 certificate served by the server.  In very rare cases, these certificates have certain encodings which should be normalized before taking a fingerprint (but in order to preserve memory BearSSL does not do this normalization since it would need RAM for an entire copy of the cert), and the fingerprint BearSSL calculates will not match the fingerprint OpenSSL calculates.  In this case, you can enable SSL debugging and get a dump of BearSSL's calculated fingerprint and use that one in your code, or use full certificate validation.  See the `original issue and debug here <https://github.com/esp8266/Arduino/issues/6209>`__.
+
 setTrustAnchors(BearSSL::X509List \*ta)
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 

libraries/ESP8266SdFat

@@ -473,7 +473,7 @@ extern "C" int __ax_port_read(int fd, uint8_t* buffer, size_t count)
     }
     return cb;
 }
-extern "C" void ax_port_read() __attribute__ ((weak, alias("__ax_port_read")));
+extern "C" int ax_port_read(int fd, uint8_t* buffer, size_t count) __attribute__ ((weak, alias("__ax_port_read")));
 
 extern "C" int __ax_port_write(int fd, uint8_t* buffer, size_t count)
 {
@@ -489,15 +489,15 @@ extern "C" int __ax_port_write(int fd, uint8_t* buffer, size_t count)
     }
     return cb;
 }
-extern "C" void ax_port_write() __attribute__ ((weak, alias("__ax_port_write")));
+extern "C" int ax_port_write(int fd, uint8_t* buffer, size_t count) __attribute__ ((weak, alias("__ax_port_write")));
 
 extern "C" int __ax_get_file(const char *filename, uint8_t **buf)
 {
     (void) filename;
     *buf = 0;
     return 0;
 }
-extern "C" void ax_get_file() __attribute__ ((weak, alias("__ax_get_file")));
+extern "C" int ax_get_file(const char *filename, uint8_t **buf) __attribute__ ((weak, alias("__ax_get_file")));
 
 extern "C" void __ax_wdt_feed()
 {

libraries/ESP8266WiFi/src/WiFiClientSecureAxTLS.cpp

@@ -654,6 +654,13 @@ extern "C" {
     if (!xc->done_cert) {
       br_sha1_update(&xc->sha1_cert, buf, len);
       br_x509_decoder_push(&xc->ctx, (const void*)buf, len);
+#ifdef DEBUG_ESP_SSL
+      DEBUG_BSSL("CERT: ");
+      for (size_t i=0; i<len; i++) {
+        DEBUG_ESP_PORT.printf_P(PSTR("%02x "), buf[i] & 0xff);
+      }
+      DEBUG_ESP_PORT.printf_P(PSTR("\n"));
+#endif
     }
   }
 
@@ -676,7 +683,24 @@ extern "C" {
     char res[20];
     br_sha1_out(&xc->sha1_cert, res);
     if (xc->match_fingerprint && memcmp(res, xc->match_fingerprint, sizeof(res))) {
+#ifdef DEBUG_ESP_SSL
       DEBUG_BSSL("insecure_end_chain: Received cert FP doesn't match\n");
+      char buff[3 * sizeof(res) + 1]; // 3 chars per byte XX_, and null
+      buff[0] = 0;
+      for (size_t i=0; i<sizeof(res); i++) {
+        char hex[4]; // XX_\0
+        snprintf(hex, sizeof(hex), "%02x ", xc->match_fingerprint[i] & 0xff);
+        strlcat(buff, hex, sizeof(buff));
+      }
+      DEBUG_BSSL("insecure_end_chain: expected %s\n", buff);
+      buff[0] =0;
+      for (size_t i=0; i<sizeof(res); i++) {
+        char hex[4]; // XX_\0
+        snprintf(hex, sizeof(hex), "%02x ", res[i] & 0xff);
+        strlcat(buff, hex, sizeof(buff));
+      }
+      DEBUG_BSSL("insecure_end_chain: received %s\n", buff);
+#endif
       return BR_ERR_X509_NOT_TRUSTED;
     }
 

libraries/ESP8266WiFi/src/WiFiClientSecureBearSSL.cpp

@@ -37,6 +37,8 @@ class WiFiClientSecure : public WiFiClient {
     WiFiClientSecure(const WiFiClientSecure &rhs);
     ~WiFiClientSecure() override;
 
+    WiFiClientSecure& operator=(const WiFiClientSecure&) = default; // The shared-ptrs handle themselves automatically
+
     int connect(IPAddress ip, uint16_t port) override;
     int connect(const String& host, uint16_t port) override;
     int connect(const char* name, uint16_t port) override;

libraries/ESP8266WiFi/src/WiFiClientSecureBearSSL.h

@@ -62,6 +62,8 @@ class WiFiServerSecure : public WiFiServer {
     void setServerKeyAndCert(const uint8_t *key, int keyLen, const uint8_t *cert, int certLen);
     void setServerKeyAndCert_P(const uint8_t *key, int keyLen, const uint8_t *cert, int certLen);
 
+    WiFiServerSecure& operator=(const WiFiServerSecure&) = default;
+
   using ClientType = WiFiClientSecure;
 
   private:

libraries/ESP8266WiFi/src/WiFiServerSecureBearSSL.h

@@ -900,7 +900,7 @@ void ATTR_GDBINIT gdbstub_set_uart_isr_callback(void (*func)(void*, uint8_t), vo
 
 
 //gdbstub initialization routine.
-void ATTR_GDBINIT gdbstub_init() {
+void gdbstub_init() {
 #if GDBSTUB_REDIRECT_CONSOLE_OUTPUT
 	os_install_putc1(gdbstub_semihost_putchar1);
 #endif
@@ -923,4 +923,4 @@ bool ATTR_GDBEXTERNFN gdb_present() {
 }
 
 void ATTR_GDBFN gdb_do_break() { gdbstub_do_break(); }
-void ATTR_GDBINIT gdb_init() __attribute__((alias("gdbstub_init")));
+void gdb_init() __attribute__((alias("gdbstub_init")));

libraries/GDBStub/src/internal/gdbstub.c

@@ -156,7 +156,7 @@ new_json=package_esp8266com_index.json
 
 set +e
 # Merge the old and new, then drop any obsolete package versions
-python ../../merge_packages.py $new_json $old_json | python ../../drop_versions.py - platforms 1.6.5-947-g39819f0 2.5.0-beta1 2.5.0-beta2 2.5.0-beta3 2.4.0-rc1 2.4.0-rc2 >tmp && mv tmp $new_json && rm $old_json
+python ../../merge_packages.py $new_json $old_json | python ../../drop_versions.py - tools 1.20.0-26-gb404fb9 >tmp && mv tmp $new_json && rm $old_json
 
 # Verify the JSON file can be read, fail if it's not OK
 set -e

package/build_boards_manager_package.sh

@@ -4,12 +4,13 @@
 from __future__ import print_function
 import json
 import sys
+from collections import OrderedDict
 
 def load_package(filename):
     if filename == "-":
-        pkg = json.load(sys.stdin)['packages'][0]
+        pkg = json.load(sys.stdin, object_pairs_hook=OrderedDict)['packages'][0]
     else:
-        pkg = json.load(open(filename))['packages'][0]
+        pkg = json.load(open(filename), object_pairs_hook=OrderedDict)['packages'][0]
     print("Loaded package {0} from {1}".format(pkg['name'], filename), file=sys.stderr)
     print("{0} platform(s), {1} tools".format(len(pkg['platforms']), len(pkg['tools'])), file=sys.stderr)
     return pkg

package/drop_versions.py

@@ -129,6 +129,8 @@ SECTIONS
 
     *(.text.app_entry*)  /* The main startup code */
 
+    *(.text.gdbstub*, .text.gdb_init)    /* Any GDB hooks */
+
     /* all functional callers are placed in IRAM (including SPI/IRQ callbacks/etc) here */
     *(.text._ZNKSt8functionIF*EE*)  /* std::function<any(...)>::operator()() const */
   } >iram1_0_seg :iram1_0_phdr