From ef7c26ac42d538762dc7444a01d57081d20e53fb Mon Sep 17 00:00:00 2001
From: David Gauchard <gauchard@laas.fr>
Date: Sat, 18 Jul 2020 23:12:22 +0200
Subject: [PATCH 1/7] hotfix: 2.7.2=>2.7.3 eboot: disable "Verify the copy"

---
 README.md                   |   4 ++--
 bootloaders/eboot/eboot.c   |   4 +++-
 bootloaders/eboot/eboot.elf | Bin 35800 -> 35612 bytes
 package.json                |   2 +-
 platform.txt                |   4 ++--
 5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 6b085aa5c9..f333e8623c 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@ Arduino core for ESP8266 WiFi chip
 
 # Quick links
 
-- [Latest release documentation](https://arduino-esp8266.readthedocs.io/en/2.7.1/)
+- [Latest release documentation](https://arduino-esp8266.readthedocs.io/en/2.7.3/)
 - [Current "git version" documentation](https://arduino-esp8266.readthedocs.io/en/latest/)
 - [Install git version](https://arduino-esp8266.readthedocs.io/en/latest/installing.html#using-git-version) ([sources](doc/installing.rst#using-git-version))
 
@@ -36,7 +36,7 @@ Starting with 1.6.4, Arduino allows installation of third-party platform package
 #### Latest release [![Latest release](https://img.shields.io/github/release/esp8266/Arduino.svg)](https://github.com/esp8266/Arduino/releases/latest/)
 Boards manager link: `https://arduino.esp8266.com/stable/package_esp8266com_index.json`
 
-Documentation: [https://arduino-esp8266.readthedocs.io/en/2.7.1/](https://arduino-esp8266.readthedocs.io/en/2.7.1/)
+Documentation: [https://arduino-esp8266.readthedocs.io/en/2.7.3/](https://arduino-esp8266.readthedocs.io/en/2.7.3/)
 
 ### Using git version
 [![Linux build status](https://travis-ci.org/esp8266/Arduino.svg)](https://travis-ci.org/esp8266/Arduino)
diff --git a/bootloaders/eboot/eboot.c b/bootloaders/eboot/eboot.c
index be67b0b6fe..0a38a88416 100644
--- a/bootloaders/eboot/eboot.c
+++ b/bootloaders/eboot/eboot.c
@@ -230,6 +230,7 @@ int main()
 
         ets_putc('0'+res); ets_putc('\n');
 
+/** disabled in 2.7.3
         // Verify the copy
         ets_putc('c'); ets_putc('m'); ets_putc('p'); ets_putc(':');
         if (res == 0) {
@@ -237,8 +238,9 @@ int main()
             res = copy_raw(cmd.args[0], cmd.args[1], cmd.args[2], true);
             ets_wdt_enable();
             }
-
         ets_putc('0'+res); ets_putc('\n');
+**/
+
         if (res == 0) {
             cmd.action = ACTION_LOAD_APP;
             cmd.args[0] = cmd.args[1];
diff --git a/bootloaders/eboot/eboot.elf b/bootloaders/eboot/eboot.elf
index 60329d847e6307f2211d8c762ff1a6f68c4da0d7..c6e56d7d1406ae0773c229c174a80d9e363f9199 100755
GIT binary patch
delta 11382
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

delta 11749
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

diff --git a/package.json b/package.json
index 5629afd636..235db02b9c 100644
--- a/package.json
+++ b/package.json
@@ -2,5 +2,5 @@
     "name": "framework-arduinoespressif8266",
     "description": "Arduino Wiring-based Framework (ESP8266 Core)",
     "url": "https://github.com/esp8266/Arduino",
-    "version": "2.7.2"
+    "version": "2.7.3"
 }
diff --git a/platform.txt b/platform.txt
index 26d83fa654..2f0e8cb14a 100644
--- a/platform.txt
+++ b/platform.txt
@@ -5,8 +5,8 @@
 # For more info:
 # https://github.com/arduino/Arduino/wiki/Arduino-IDE-1.5-3rd-party-Hardware-specification
 
-name=ESP8266 Boards (2.7.2)
-version=2.7.2
+name=ESP8266 Boards (2.7.3)
+version=2.7.3
 
 # These will be removed by the packager script when doing a JSON release
 runtime.tools.xtensa-lx106-elf-gcc.path={runtime.platform.path}/tools/xtensa-lx106-elf

From 5337f93522fd1b2e24c6c0259adc3d51995b98aa Mon Sep 17 00:00:00 2001
From: David Gauchard <gauchard@laas.fr>
Date: Sun, 19 Jul 2020 00:04:02 +0200
Subject: [PATCH 2/7] backport #7433

---
 boards.txt          | 71 +++++++++++++++++++++++++++++++++++++++++++--
 doc/boards.rst      |  2 +-
 tools/boards.txt.py |  5 ++--
 3 files changed, 73 insertions(+), 5 deletions(-)

diff --git a/boards.txt b/boards.txt
index 3d2c355c29..8279cd5c53 100644
--- a/boards.txt
+++ b/boards.txt
@@ -5458,9 +5458,76 @@ gen4iod.menu.ssl.all.build.sslflags=
 gen4iod.menu.ssl.basic=Basic SSL ciphers (lower ROM use)
 gen4iod.menu.ssl.basic.build.sslflags=-DBEARSSL_SSL_BASIC
 gen4iod.upload.resetmethod=--before default_reset --after hard_reset
-gen4iod.build.flash_mode=dio
-gen4iod.build.flash_flags=-DFLASHMODE_DIO
+gen4iod.menu.FlashMode.dout=DOUT (compatible)
+gen4iod.menu.FlashMode.dout.build.flash_mode=dout
+gen4iod.menu.FlashMode.dout.build.flash_flags=-DFLASHMODE_DOUT
+gen4iod.menu.FlashMode.dio=DIO
+gen4iod.menu.FlashMode.dio.build.flash_mode=dio
+gen4iod.menu.FlashMode.dio.build.flash_flags=-DFLASHMODE_DIO
+gen4iod.menu.FlashMode.qout=QOUT
+gen4iod.menu.FlashMode.qout.build.flash_mode=qout
+gen4iod.menu.FlashMode.qout.build.flash_flags=-DFLASHMODE_QOUT
+gen4iod.menu.FlashMode.qio=QIO (fast)
+gen4iod.menu.FlashMode.qio.build.flash_mode=qio
+gen4iod.menu.FlashMode.qio.build.flash_flags=-DFLASHMODE_QIO
 gen4iod.build.flash_freq=80
+gen4iod.menu.eesz.2M64=2MB (FS:64KB OTA:~992KB)
+gen4iod.menu.eesz.2M64.build.flash_size=2M
+gen4iod.menu.eesz.2M64.build.flash_size_bytes=0x200000
+gen4iod.menu.eesz.2M64.build.flash_ld=eagle.flash.2m64.ld
+gen4iod.menu.eesz.2M64.build.spiffs_pagesize=256
+gen4iod.menu.eesz.2M64.upload.maximum_size=1044464
+gen4iod.menu.eesz.2M64.build.rfcal_addr=0x1FC000
+gen4iod.menu.eesz.2M64.build.spiffs_start=0x1F0000
+gen4iod.menu.eesz.2M64.build.spiffs_end=0x1FB000
+gen4iod.menu.eesz.2M64.build.spiffs_blocksize=4096
+gen4iod.menu.eesz.2M128=2MB (FS:128KB OTA:~960KB)
+gen4iod.menu.eesz.2M128.build.flash_size=2M
+gen4iod.menu.eesz.2M128.build.flash_size_bytes=0x200000
+gen4iod.menu.eesz.2M128.build.flash_ld=eagle.flash.2m128.ld
+gen4iod.menu.eesz.2M128.build.spiffs_pagesize=256
+gen4iod.menu.eesz.2M128.upload.maximum_size=1044464
+gen4iod.menu.eesz.2M128.build.rfcal_addr=0x1FC000
+gen4iod.menu.eesz.2M128.build.spiffs_start=0x1E0000
+gen4iod.menu.eesz.2M128.build.spiffs_end=0x1FB000
+gen4iod.menu.eesz.2M128.build.spiffs_blocksize=4096
+gen4iod.menu.eesz.2M256=2MB (FS:256KB OTA:~896KB)
+gen4iod.menu.eesz.2M256.build.flash_size=2M
+gen4iod.menu.eesz.2M256.build.flash_size_bytes=0x200000
+gen4iod.menu.eesz.2M256.build.flash_ld=eagle.flash.2m256.ld
+gen4iod.menu.eesz.2M256.build.spiffs_pagesize=256
+gen4iod.menu.eesz.2M256.upload.maximum_size=1044464
+gen4iod.menu.eesz.2M256.build.rfcal_addr=0x1FC000
+gen4iod.menu.eesz.2M256.build.spiffs_start=0x1C0000
+gen4iod.menu.eesz.2M256.build.spiffs_end=0x1FB000
+gen4iod.menu.eesz.2M256.build.spiffs_blocksize=4096
+gen4iod.menu.eesz.2M512=2MB (FS:512KB OTA:~768KB)
+gen4iod.menu.eesz.2M512.build.flash_size=2M
+gen4iod.menu.eesz.2M512.build.flash_size_bytes=0x200000
+gen4iod.menu.eesz.2M512.build.flash_ld=eagle.flash.2m512.ld
+gen4iod.menu.eesz.2M512.build.spiffs_pagesize=256
+gen4iod.menu.eesz.2M512.upload.maximum_size=1044464
+gen4iod.menu.eesz.2M512.build.rfcal_addr=0x1FC000
+gen4iod.menu.eesz.2M512.build.spiffs_start=0x180000
+gen4iod.menu.eesz.2M512.build.spiffs_end=0x1FA000
+gen4iod.menu.eesz.2M512.build.spiffs_blocksize=8192
+gen4iod.menu.eesz.2M1M=2MB (FS:1MB OTA:~512KB)
+gen4iod.menu.eesz.2M1M.build.flash_size=2M
+gen4iod.menu.eesz.2M1M.build.flash_size_bytes=0x200000
+gen4iod.menu.eesz.2M1M.build.flash_ld=eagle.flash.2m1m.ld
+gen4iod.menu.eesz.2M1M.build.spiffs_pagesize=256
+gen4iod.menu.eesz.2M1M.upload.maximum_size=1044464
+gen4iod.menu.eesz.2M1M.build.rfcal_addr=0x1FC000
+gen4iod.menu.eesz.2M1M.build.spiffs_start=0x100000
+gen4iod.menu.eesz.2M1M.build.spiffs_end=0x1FA000
+gen4iod.menu.eesz.2M1M.build.spiffs_blocksize=8192
+gen4iod.menu.eesz.2M=2MB (FS:none OTA:~1019KB)
+gen4iod.menu.eesz.2M.build.flash_size=2M
+gen4iod.menu.eesz.2M.build.flash_size_bytes=0x200000
+gen4iod.menu.eesz.2M.build.flash_ld=eagle.flash.2m.ld
+gen4iod.menu.eesz.2M.build.spiffs_pagesize=256
+gen4iod.menu.eesz.2M.upload.maximum_size=1044464
+gen4iod.menu.eesz.2M.build.rfcal_addr=0x1FC000
 gen4iod.menu.eesz.512K32=512KB (FS:32KB OTA:~230KB)
 gen4iod.menu.eesz.512K32.build.flash_size=512K
 gen4iod.menu.eesz.512K32.build.flash_size_bytes=0x80000
diff --git a/doc/boards.rst b/doc/boards.rst
index 7ab98e2513..9c94b63120 100644
--- a/doc/boards.rst
+++ b/doc/boards.rst
@@ -413,7 +413,7 @@ Datasheet and associated downloads can be found on the 4D Systems product page.
 
 The gen4-IoD range can be programmed using the Arduino IDE and also the 4D Systems Workshop4 IDE, which incorporates many additional graphics benefits. GFX4d library is available, along with a number of demo applications.
 
-- Product page: http://www.4dsystems.com.au/product/gen4-IoD
+- Product page: https://4dsystems.com.au/products/iot-display-modules
 
 Digistump Oak
 -------------
diff --git a/tools/boards.txt.py b/tools/boards.txt.py
index 8263191495..30f2a9bbe5 100755
--- a/tools/boards.txt.py
+++ b/tools/boards.txt.py
@@ -759,8 +759,9 @@
             },
         'macro': [
             'resetmethod_nodemcu',
-            'flashmode_dio',
+            'flashmode_menu',
             'flashfreq_80',
+            '2M',
             '512K',
             ],
         'desc': [ 'gen4-IoD Range of ESP8266 powered Display Modules by 4D Systems.',
@@ -771,7 +772,7 @@
                   '',
                   'The gen4-IoD range can be programmed using the Arduino IDE and also the 4D Systems Workshop4 IDE, which incorporates many additional graphics benefits. GFX4d library is available, along with a number of demo applications.',
                   '',
-                  '- Product page: http://www.4dsystems.com.au/product/gen4-IoD',
+                  '- Product page: https://4dsystems.com.au/products/iot-display-modules',
                   ],
     }),
     ( 'oak', {

From 7f9863674fe0722595d23e20a294c313bcd64d7f Mon Sep 17 00:00:00 2001
From: David Gauchard <gauchard@laas.fr>
Date: Sun, 19 Jul 2020 00:04:36 +0200
Subject: [PATCH 3/7] backport #7434

---
 libraries/LittleFS/src/LittleFS.cpp |  1 +
 tests/host/fs/test_fs.inc           | 22 ++++++++++++++++++++++
 2 files changed, 23 insertions(+)

diff --git a/libraries/LittleFS/src/LittleFS.cpp b/libraries/LittleFS/src/LittleFS.cpp
index b85075112e..7fd4351fcb 100644
--- a/libraries/LittleFS/src/LittleFS.cpp
+++ b/libraries/LittleFS/src/LittleFS.cpp
@@ -87,6 +87,7 @@ FileImplPtr LittleFSImpl::open(const char* path, OpenMode openMode, AccessMode a
         // a directory whose name we are carrying around but which cannot be read or written
         return std::make_shared<LittleFSFileImpl>(this, path, nullptr, flags, creation);
     } else if (rc == 0) {
+        lfs_file_sync(&_lfs, fd.get());
         return std::make_shared<LittleFSFileImpl>(this, path, fd, flags, creation);
     } else {
         DEBUGV("LittleFSDirImpl::openFile: rc=%d fd=%p path=`%s` openMode=%d accessMode=%d err=%d\n",
diff --git a/tests/host/fs/test_fs.inc b/tests/host/fs/test_fs.inc
index 0a2cc423fc..683f3a99ba 100644
--- a/tests/host/fs/test_fs.inc
+++ b/tests/host/fs/test_fs.inc
@@ -198,6 +198,28 @@ TEST_CASE(TESTPRE "seek() pase EOF returns error (#7323)", TESTPAT)
     f.close();
 }
 
+TEST_CASE(TESTPRE "Rewriting file frees space immediately (#7426)", TESTPAT)
+{
+    FS_MOCK_DECLARE(64, 8, 512, "");
+    REQUIRE(FSTYPE.begin());
+    FSInfo inf;
+    FSTYPE.info(inf);
+    // Calculate the size to write per-FS, due to differing overheads
+    int kbToWrite = (inf.totalBytes - inf.usedBytes - 8192) / 1024;
+    // Create and overwrite a file >50% of spaceA (48/64K)
+    for (auto x = 0; x < 2; x++) {
+        auto f = FSTYPE.open("/file1.bin", "w");
+        REQUIRE(f);
+        uint8_t buff[1024];
+        memset(buff, 0xaa, 1024);
+        for (auto i = 0; i < kbToWrite; i++) {
+            REQUIRE(f.write(buff, 1024));
+        }
+        f.close();
+        FSTYPE.info(inf);
+    }
+}
+
 #ifdef FS_HAS_DIRS
 
 #if FSTYPE != SDFS

From 59bbfc70610c68e2728175cd5ac9f0519bb10992 Mon Sep 17 00:00:00 2001
From: David Gauchard <gauchard@laas.fr>
Date: Sun, 19 Jul 2020 00:07:13 +0200
Subject: [PATCH 4/7] backport #7464

---
 libraries/ESP8266WiFi/src/WiFiClientSecureBearSSL.cpp | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/libraries/ESP8266WiFi/src/WiFiClientSecureBearSSL.cpp b/libraries/ESP8266WiFi/src/WiFiClientSecureBearSSL.cpp
index 773f68cfdc..89621b3671 100644
--- a/libraries/ESP8266WiFi/src/WiFiClientSecureBearSSL.cpp
+++ b/libraries/ESP8266WiFi/src/WiFiClientSecureBearSSL.cpp
@@ -96,11 +96,8 @@ void WiFiClientSecure::_clearAuthenticationSettings() {
   _use_fingerprint = false;
   _use_self_signed = false;
   _knownkey = nullptr;
-  _sk = nullptr;
   _ta = nullptr;
   _axtls_ta = nullptr;
-  _axtls_chain = nullptr;
-  _axtls_sk = nullptr;
 }
 
 

From 59499c73611c9c338cae97fb0c1fca5894653e1f Mon Sep 17 00:00:00 2001
From: David Gauchard <gauchard@laas.fr>
Date: Mon, 27 Jul 2020 00:09:26 +0200
Subject: [PATCH 5/7] backport #7486

---
 libraries/ESP8266WiFi/src/ESP8266WiFiGeneric.cpp | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/libraries/ESP8266WiFi/src/ESP8266WiFiGeneric.cpp b/libraries/ESP8266WiFi/src/ESP8266WiFiGeneric.cpp
index 41d771fb6a..2a5f96cb5d 100644
--- a/libraries/ESP8266WiFi/src/ESP8266WiFiGeneric.cpp
+++ b/libraries/ESP8266WiFi/src/ESP8266WiFiGeneric.cpp
@@ -233,6 +233,16 @@ void ESP8266WiFiGenericClass::_eventCallback(void* arg)
         WiFiClient::stopAll();
     }
 
+    if (event->event == EVENT_STAMODE_AUTHMODE_CHANGE) {
+        auto& src = event->event_info.auth_change;
+        if ((src.old_mode != AUTH_OPEN) && (src.new_mode == AUTH_OPEN)) {
+            // CVE-2020-12638 workaround.  When we get a change to AUTH_OPEN from any other mode, drop the WiFi link because it's a downgrade attack
+            // TODO - When upgrading to 3.x.x with fix, remove this code
+            DEBUG_WIFI("WIFI_EVENT_STAMODE_AUTHMODE_CHANGE from encrypted(%d) to AUTH_OPEN, potential downgrade attack. Reconnecting WiFi. See CVE-2020-12638 for more details\n", src.old_mode);
+            WiFi.reconnect();  // Disconnects from STA and then reconnects
+        }
+    }
+
     for(auto it = std::begin(sCbEventList); it != std::end(sCbEventList); ) {
         WiFiEventHandler &handler = *it;
         if (handler->canExpire() && handler.unique()) {

From 4ac1608573b52f92a797c78db5e76b4c3b7feb34 Mon Sep 17 00:00:00 2001
From: David Gauchard <gauchard@laas.fr>
Date: Mon, 27 Jul 2020 00:10:09 +0200
Subject: [PATCH 6/7] backport #7487

---
 cores/esp8266/Updater.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cores/esp8266/Updater.cpp b/cores/esp8266/Updater.cpp
index 351a57746b..03bc5c3f8f 100644
--- a/cores/esp8266/Updater.cpp
+++ b/cores/esp8266/Updater.cpp
@@ -35,6 +35,7 @@ UpdaterClass::UpdaterClass()
 , _startAddress(0)
 , _currentAddress(0)
 , _command(U_FLASH)
+, _ledPin(-1)
 , _hash(nullptr)
 , _verify(nullptr)
 , _progress_callback(nullptr)

From 5d3af165522042a48f6db9b0b920fcb5ad16a69d Mon Sep 17 00:00:00 2001
From: David Gauchard <gauchard@laas.fr>
Date: Mon, 27 Jul 2020 00:10:32 +0200
Subject: [PATCH 7/7] backport #7488

---
 cores/esp8266/heap.cpp               | 2 +-
 cores/esp8266/umm_malloc/umm_local.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cores/esp8266/heap.cpp b/cores/esp8266/heap.cpp
index 2001579ef0..3f549716f4 100644
--- a/cores/esp8266/heap.cpp
+++ b/cores/esp8266/heap.cpp
@@ -164,7 +164,7 @@ void ICACHE_RAM_ATTR print_loc(size_t size, const char* file, int line)
         if (inISR && (uint32_t)file >= 0x40200000) {
             DEBUG_HEAP_PRINTF("File: %p", file);
         } else if (!inISR && (uint32_t)file >= 0x40200000) {
-            char buf[ets_strlen(file)] __attribute__ ((aligned(4)));
+            char buf[ets_strlen(file) + 1] __attribute__((aligned(4)));
             ets_strcpy(buf, file);
             DEBUG_HEAP_PRINTF(buf);
         } else {
diff --git a/cores/esp8266/umm_malloc/umm_local.c b/cores/esp8266/umm_malloc/umm_local.c
index 8f83f4b4ac..392ef13c8f 100644
--- a/cores/esp8266/umm_malloc/umm_local.c
+++ b/cores/esp8266/umm_malloc/umm_local.c
@@ -206,7 +206,7 @@ int ICACHE_FLASH_ATTR umm_info_safe_printf_P(const char *fmt, ...) {
       the PROGMEM address must be word (4 bytes) aligned. The destination
       address for ets_memcpy must also be word-aligned.
     */
-    char ram_buf[ets_strlen(fmt)] __attribute__ ((aligned(4)));
+    char ram_buf[ets_strlen(fmt) + 1] __attribute__((aligned(4)));
     ets_strcpy(ram_buf, fmt);
     va_list argPtr;
     va_start(argPtr, fmt);