Merge branch 'master' into bugfix/ESP8266HTTPClient

Author: earlephilhower

boards.txt

@@ -761,15 +761,15 @@ esp8285.menu.baud.3000000.upload.speed=3000000
 espduino.name=ESPDuino (ESP-13 Module)
 espduino.build.board=ESP8266_ESP13
 espduino.build.variant=ESPDuino
-espduino.menu.ResetMethod.v2=ESPduino-V2
-espduino.menu.ResetMethod.v2.upload.resetmethod=nodemcu
 espduino.menu.ResetMethod.v1=ESPduino-V1
 espduino.menu.ResetMethod.v1.upload.resetmethod=ck
+espduino.menu.ResetMethod.v2=ESPduino-V2
+espduino.menu.ResetMethod.v2.upload.resetmethod=nodemcu
+espduino.menu.UploadTool.espota=OTA
+espduino.menu.UploadTool.espota.upload.tool=espota
 espduino.menu.UploadTool.esptool=Serial
 espduino.menu.UploadTool.esptool.upload.tool=esptool
 espduino.menu.UploadTool.esptool.upload.verbose=--trace
-espduino.menu.UploadTool.espota=OTA
-espduino.menu.UploadTool.espota.upload.tool=espota
 espduino.upload.tool=esptool
 espduino.upload.maximum_data_size=81920
 espduino.upload.wait_for_upload_port=true
@@ -4592,20 +4592,20 @@ wifinfo.build.board=WIFINFO
 wifinfo.build.variant=wifinfo
 wifinfo.menu.ESPModule.ESP07192=ESP07 (1M/192K SPIFFS)
 wifinfo.menu.ESPModule.ESP07192.build.board=ESP8266_ESP07
-wifinfo.menu.ESPModule.ESP07192.build.flash_size=1M
 wifinfo.menu.ESPModule.ESP07192.build.flash_ld=eagle.flash.1m192.ld
-wifinfo.menu.ESPModule.ESP07192.build.spiffs_start=0xCB000
-wifinfo.menu.ESPModule.ESP07192.build.spiffs_end=0xFB000
+wifinfo.menu.ESPModule.ESP07192.build.flash_size=1M
 wifinfo.menu.ESPModule.ESP07192.build.spiffs_blocksize=4096
+wifinfo.menu.ESPModule.ESP07192.build.spiffs_end=0xFB000
+wifinfo.menu.ESPModule.ESP07192.build.spiffs_start=0xCB000
 wifinfo.menu.ESPModule.ESP07192.upload.maximum_size=827376
 wifinfo.menu.ESPModule.ESP12=ESP12 (4M/1M SPIFFS)
 wifinfo.menu.ESPModule.ESP12.build.board=ESP8266_ESP12
-wifinfo.menu.ESPModule.ESP12.build.flash_size=4M
 wifinfo.menu.ESPModule.ESP12.build.flash_ld=eagle.flash.4m1m.ld
-wifinfo.menu.ESPModule.ESP12.build.spiffs_start=0x300000
-wifinfo.menu.ESPModule.ESP12.build.spiffs_end=0x3FB000
+wifinfo.menu.ESPModule.ESP12.build.flash_size=4M
 wifinfo.menu.ESPModule.ESP12.build.spiffs_blocksize=8192
+wifinfo.menu.ESPModule.ESP12.build.spiffs_end=0x3FB000
 wifinfo.menu.ESPModule.ESP12.build.spiffs_pagesize=256
+wifinfo.menu.ESPModule.ESP12.build.spiffs_start=0x300000
 wifinfo.menu.ESPModule.ESP12.upload.maximum_size=1044464
 wifinfo.upload.tool=esptool
 wifinfo.upload.maximum_data_size=81920
@@ -4839,16 +4839,16 @@ arduino-esp8266.name=Arduino
 arduino-esp8266.build.board=ESP8266_ARDUINO
 arduino-esp8266.menu.BoardModel.primo=Primo
 arduino-esp8266.menu.BoardModel.primo.build.board=ESP8266_ARDUINO_PRIMO
-arduino-esp8266.menu.BoardModel.primo.build.variant=arduino_spi
 arduino-esp8266.menu.BoardModel.primo.build.extra_flags=-DF_CRYSTAL=40000000 -DESP8266
-arduino-esp8266.menu.BoardModel.unowifideved=Uno WiFi
-arduino-esp8266.menu.BoardModel.unowifideved.build.board=ESP8266_ARDUINO_UNOWIFI
-arduino-esp8266.menu.BoardModel.unowifideved.build.variant=arduino_uart
-arduino-esp8266.menu.BoardModel.unowifideved.build.extra_flags=-DF_CRYSTAL=40000000 -DESP8266
+arduino-esp8266.menu.BoardModel.primo.build.variant=arduino_spi
 arduino-esp8266.menu.BoardModel.starottodeved=Star OTTO
-arduino-esp8266.menu.BoardModel.starottodeved.build.variant=arduino_uart
 arduino-esp8266.menu.BoardModel.starottodeved.build.board=ESP8266_ARDUINO_STAR_OTTO
 arduino-esp8266.menu.BoardModel.starottodeved.build.extra_flags=-DF_CRYSTAL=40000000 -DESP8266
+arduino-esp8266.menu.BoardModel.starottodeved.build.variant=arduino_uart
+arduino-esp8266.menu.BoardModel.unowifideved=Uno WiFi
+arduino-esp8266.menu.BoardModel.unowifideved.build.board=ESP8266_ARDUINO_UNOWIFI
+arduino-esp8266.menu.BoardModel.unowifideved.build.extra_flags=-DF_CRYSTAL=40000000 -DESP8266
+arduino-esp8266.menu.BoardModel.unowifideved.build.variant=arduino_uart
 arduino-esp8266.upload.tool=esptool
 arduino-esp8266.upload.maximum_data_size=81920
 arduino-esp8266.upload.wait_for_upload_port=true

cores/esp8266/Print.cpp

@@ -45,7 +45,7 @@ size_t Print::write(const uint8_t *buffer, size_t size) {
 
     size_t n = 0;
     while (size--) {
-        size_t ret = write(*buffer++);
+        size_t ret = write(pgm_read_byte(buffer++));
         if (ret == 0) {
             // Write of last byte didn't complete, abort additional processing
             break;

cores/esp8266/Print.h

@@ -56,7 +56,7 @@ class Print {
         size_t write(const char *str) {
             if(str == NULL)
                 return 0;
-            return write((const uint8_t *) str, strlen(str));
+            return write((const uint8_t *) str, strlen_P(str));
         }
         virtual size_t write(const uint8_t *buffer, size_t size);
         size_t write(const char *buffer, size_t size) {

cores/esp8266/Updater.cpp

@@ -1,5 +1,4 @@
 #include "Updater.h"
-#include "Arduino.h"
 #include "eboot_command.h"
 #include <esp8266_peri.h>
 
@@ -11,10 +10,10 @@
 #endif
 
 #if ARDUINO_SIGNING
-  #include "../../libraries/ESP8266WiFi/src/BearSSLHelpers.h"
-  static BearSSL::PublicKey signPubKey(signing_pubkey);
-  static BearSSL::HashSHA256 hash;
-  static BearSSL::SigningVerifier sign(&signPubKey);
+namespace esp8266 {
+  extern UpdaterHashClass& updaterSigningHash;
+  extern UpdaterVerifyClass& updaterSigningVerifier;
+}
 #endif
 
 extern "C" {
@@ -39,7 +38,7 @@ UpdaterClass::UpdaterClass()
 , _progress_callback(nullptr)
 {
 #if ARDUINO_SIGNING
-  installSignature(&hash, &sign);
+  installSignature(&esp8266::updaterSigningHash, &esp8266::updaterSigningVerifier);
 #endif
 }
 

cores/esp8266/uart.cpp

@@ -495,7 +495,7 @@ uart_write(uart_t* uart, const char* buf, size_t size)
     size_t ret = size;
     const int uart_nr = uart->uart_nr;
     while (size--)
-        uart_do_write_char(uart_nr, *buf++);
+        uart_do_write_char(uart_nr, pgm_read_byte(buf++));
 
     return ret;
 }

doc/eclipse/makefile.init

@@ -14,7 +14,7 @@ ESP8266_BASE      = $(ARDUINO_BASE)/hardware/esp8266com/esp8266
 ESP8266_TOOLS     = $(ESP8266_BASE)/tools
 XTENSA_TOOLS_ROOT = $(ESP8266_TOOLS)/xtensa-lx106-elf/bin
 
-PYTHON_BIN        = python
+PYTHON_BIN        = python3
 ESPTOOL_PY_BIN    = $(ESP8266_TOOLS)/esptool.py
 ESPOTA_PY_BIN     = $(ESP8266_TOOLS)/espota.py
 ESPTOOL_BIN       = $(ESP8266_TOOLS)/esptool/esptool.exe

doc/installing.rst

@@ -43,7 +43,7 @@ Prerequisites
 
 -  Arduino 1.6.8 (or newer, current working version is 1.8.5)
 -  git
--  Python 2.7 (https://python.org)
+-  Python 3.x (https://python.org)
 -  terminal, console, or command prompt (depending on your OS)
 -  Internet connection
 
@@ -110,7 +110,7 @@ Instructions - Windows 10
    .. code:: bash
 
        cd esp8266/tools
-       python get.py
+       python3 get.py
 
 -  Restart Arduino
 
@@ -184,7 +184,7 @@ Instructions - Other OS
    .. code:: bash
 
        cd esp8266/tools
-       python get.py
+       python3 get.py
 
 -  Restart Arduino
 

doc/ota_updates/readme.rst

@@ -193,7 +193,7 @@ Instructions below show configuration of OTA on NodeMCU 1.0 (ESP-12E Module) boa
    -  esp8266/Arduino platform package 2.0.0 or newer - for instructions
       follow
       https://github.com/esp8266/Arduino#installing-with-boards-manager
-   -  Python 2.7 - https://www.python.org/
+   -  Python 3.x - https://www.python.org/
 
       **Note:** Windows users should select “Add python.exe to Path”
       (see below – this option is not selected by default).

libraries/ESP8266HTTPClient/examples/BasicHttpsClient/BasicHttpsClient.ino

@@ -13,8 +13,8 @@
 #include <ESP8266HTTPClient.h>
 
 #include <WiFiClientSecureBearSSL.h>
-// Fingerprint for demo URL, expires on June 2, 2019, needs to be updated well before this date
-const uint8_t fingerprint[20] = {0x5A, 0xCF, 0xFE, 0xF0, 0xF1, 0xA6, 0xF4, 0x5F, 0xD2, 0x11, 0x11, 0xC6, 0x1D, 0x2F, 0x0E, 0xBC, 0x39, 0x8D, 0x50, 0xE0};
+// Fingerprint for demo URL, expires on June 2, 2021, needs to be updated well before this date
+const uint8_t fingerprint[20] = {0x40, 0xaf, 0x00, 0x6b, 0xec, 0x90, 0x22, 0x41, 0x8e, 0xa3, 0xad, 0xfa, 0x1a, 0xe8, 0x25, 0x41, 0x1d, 0x1a, 0x54, 0xb3};
 
 ESP8266WiFiMulti WiFiMulti;
 

libraries/ESP8266WiFi/examples/BearSSL_CertStore/certs-from-mozilla.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 # This script pulls the list of Mozilla trusted certificate authorities
 # from the web at the "mozurl" below, parses the file to grab the PEM
@@ -7,16 +7,18 @@
 # and use them for your outgoing SSL connections.
 #
 # Script by Earle F. Philhower, III.  Released to the public domain.
-
+from __future__ import print_function
 import csv
 import os
+import sys
 from subprocess import Popen, PIPE, call
-import urllib2
 try:
-    # for Python 2.x
+    from urllib.request import urlopen
+except:
+    from urllib2 import urlopen
+try:
     from StringIO import StringIO
-except ImportError:
-    # for Python 3.x
+except:
     from io import StringIO
 
 # Mozilla's URL for the CSV file with included PEM certs
@@ -25,9 +27,12 @@
 # Load the manes[] and pems[] array from the URL
 names = []
 pems = []
-response = urllib2.urlopen(mozurl)
+response = urlopen(mozurl)
 csvData = response.read()
-csvReader = csv.reader(StringIO(csvData))
+if sys.version_info[0] > 2:
+    csvData = csvData.decode('utf-8')
+csvFile = StringIO(csvData)
+csvReader = csv.reader(csvFile)
 for row in csvReader:
     names.append(row[0]+":"+row[1]+":"+row[2])
     pems.append(row[30])
@@ -46,10 +51,10 @@
 for i in range(0, len(pems)):
     certName = "data/ca_%03d.der" % (idx);
     thisPem = pems[i].replace("'", "")
-    print names[i] + " -> " + certName
+    print(names[i] + " -> " + certName)
     ssl = Popen(['openssl','x509','-inform','PEM','-outform','DER','-out', certName], shell = False, stdin = PIPE)
     pipe = ssl.stdin
-    pipe.write(thisPem)
+    pipe.write(thisPem.encode('utf-8'))
     pipe.close()
     ssl.wait()
     if os.path.exists(certName):

libraries/ESP8266WiFi/examples/RangeExtender-NAPT/RangeExtender-NAPT.ino

@@ -0,0 +1,97 @@
+
+// NAPT example released to public domain
+
+#if LWIP_FEATURES && !LWIP_IPV6
+
+#define HAVE_NETDUMP 0
+
+#ifndef STASSID
+#define STASSID "mynetwork"
+#define STAPSK  "mynetworkpassword"
+#endif
+
+#include <ESP8266WiFi.h>
+#include <lwip/napt.h>
+#include <lwip/dns.h>
+#include <dhcpserver.h>
+
+#define NAPT 1000
+#define NAPT_PORT 10
+
+#if HAVE_NETDUMP
+
+#include <NetDump.h>
+
+void dump(int netif_idx, const char* data, size_t len, int out, int success) {
+  (void)success;
+  Serial.print(out ? F("out ") : F(" in "));
+  Serial.printf("%d ", netif_idx);
+
+  // optional filter example: if (netDump_is_ARP(data))
+  {
+    netDump(Serial, data, len);
+    //netDumpHex(Serial, data, len);
+  }
+}
+#endif
+
+void setup() {
+  Serial.begin(115200);
+  Serial.printf("\n\nNAPT Range extender\n");
+  Serial.printf("Heap on start: %d\n", ESP.getFreeHeap());
+
+#if HAVE_NETDUMP
+  phy_capture = dump;
+#endif
+
+  // first, connect to STA so we can get a proper local DNS server
+  WiFi.mode(WIFI_STA);
+  WiFi.begin(STASSID, STAPSK);
+  while (WiFi.status() != WL_CONNECTED) {
+    Serial.print('.');
+    delay(500);
+  }
+  Serial.printf("\nSTA: %s (dns: %s / %s)\n",
+                WiFi.localIP().toString().c_str(),
+                WiFi.dnsIP(0).toString().c_str(),
+                WiFi.dnsIP(1).toString().c_str());
+
+  // give DNS servers to AP side
+  dhcps_set_dns(0, WiFi.dnsIP(0));
+  dhcps_set_dns(1, WiFi.dnsIP(1));
+
+  WiFi.softAPConfig(  // enable AP, with android-compatible google domain
+    IPAddress(172, 217, 28, 254),
+    IPAddress(172, 217, 28, 254),
+    IPAddress(255, 255, 255, 0));
+  WiFi.softAP(STASSID "extender", STAPSK);
+  Serial.printf("AP: %s\n", WiFi.softAPIP().toString().c_str());
+
+  Serial.printf("Heap before: %d\n", ESP.getFreeHeap());
+  err_t ret = ip_napt_init(NAPT, NAPT_PORT);
+  Serial.printf("ip_napt_init(%d,%d): ret=%d (OK=%d)\n", NAPT, NAPT_PORT, (int)ret, (int)ERR_OK);
+  if (ret == ERR_OK) {
+    ret = ip_napt_enable_no(SOFTAP_IF, 1);
+    Serial.printf("ip_napt_enable_no(SOFTAP_IF): ret=%d (OK=%d)\n", (int)ret, (int)ERR_OK);
+    if (ret == ERR_OK) {
+      Serial.printf("WiFi Network '%s' with same password is now NATed behind '%s'\n", STASSID "extender", STASSID);
+    }
+  }
+  Serial.printf("Heap after napt init: %d\n", ESP.getFreeHeap());
+  if (ret != ERR_OK) {
+    Serial.printf("NAPT initialization failed\n");
+  }
+}
+
+#else
+
+void setup() {
+  Serial.begin(115200);
+  Serial.printf("\n\nNAPT not supported in this configuration\n");
+}
+
+#endif
+
+void loop() {
+}
+

libraries/ESP8266WiFi/src/BearSSLHelpers.cpp

@@ -20,6 +20,7 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
+#include "BearSSLHelpers.h"
 #include <memory>
 #include <vector>
 #include <bearssl/bearssl.h>
@@ -28,7 +29,10 @@
 #include <string.h>
 #include <Arduino.h>
 #include <StackThunk.h>
-#include "BearSSLHelpers.h"
+#include <Updater_Signing.h>
+#ifndef ARDUINO_SIGNING
+  #define ARDUINO_SIGNING 0
+#endif
 
 namespace brssl {
   // Code here is pulled from brssl sources, with the copyright and license
@@ -901,3 +905,17 @@ make_stack_thunk(br_ssl_engine_sendrec_buf);
 #endif
 
 };
+
+#if ARDUINO_SIGNING
+namespace {
+  static BearSSL::PublicKey signingPubKey(signing_pubkey);
+  static BearSSL::HashSHA256 __signingHash;
+  static BearSSL::SigningVerifier __signingVerifier(&signingPubKey);
+};
+
+namespace esp8266 {
+  UpdaterHashClass& updaterSigningHash = __signingHash;
+  UpdaterVerifyClass& updaterSigningVerifier = __signingVerifier;
+};
+#endif
+

libraries/ESP8266WiFi/src/BearSSLHelpers.h

@@ -26,7 +26,6 @@
 #include <bearssl/bearssl.h>
 #include <Updater.h>
 
-
 // Internal opaque structures, not needed by user applications
 namespace brssl {
   class public_key;

libraries/ESP8266WiFi/src/include/ClientContext.h

@@ -609,9 +609,10 @@ class ClientContext
         (void) err;
         (void) pcb;
         assert(pcb == _pcb);
-        assert(_delaying);
-        _delaying = false;
-        esp_schedule(); // break current delay()
+        if (_delaying) {
+            _delaying = false;
+            esp_schedule(); // break current delay()
+        }
         return ERR_OK;
     }