Merge branch 'master' into ivankravets-patch-5

Author: earlephilhower

.gitmodules

@@ -1,3 +1,6 @@
 [submodule "lwip2"]
 	path = tools/sdk/lwip2/builder
 	url = https://github.com/d-a-v/esp82xx-nonos-linklayer.git
+[submodule "tools/sdk/ssl/bearssl"]
+	path = tools/sdk/ssl/bearssl
+	url = https://github.com/earlephilhower/bearssl-esp8266

README.md

@@ -35,10 +35,11 @@ Documentation: [https://arduino-esp8266.readthedocs.io/en/2.4.1/](https://arduin
 
 - Install the current upstream Arduino IDE at the 1.8 level or later. The current version is at the [Arduino website](http://www.arduino.cc/en/main/software).
 - Go to Arduino application directory
-  - For Mac OS X normally: 
-  ```bash
-  cd /Applications/Arduino.app/Contents/Java
-  ```
+  - For Mac OS X, it is `Arduino.app` showing as the Arduino icon.  
+    This location may be your `~/Downloads`, `~/Desktop` or even `/Applications`.
+    ```bash
+    cd <application-directory>/Arduino.app/Contents/Java
+    ```
 - Clone this repository into hardware/esp8266com/esp8266 directory (or clone it elsewhere and create a symlink)
 ```bash
 cd hardware

boards.txt

@@ -4245,3 +4245,224 @@ wifiduino.menu.UploadSpeed.460800.upload.speed=460800
 wifiduino.menu.UploadSpeed.512000.windows=512000
 wifiduino.menu.UploadSpeed.512000.upload.speed=512000
 
+##############################################################
+wifi_slot.name=Amperka WiFi Slot
+wifi_slot.build.board=AMPERKA_WIFI_SLOT
+wifi_slot.build.variant=wifi_slot
+wifi_slot.upload.tool=esptool
+wifi_slot.upload.maximum_data_size=81920
+wifi_slot.upload.wait_for_upload_port=true
+wifi_slot.upload.erase_cmd=
+wifi_slot.serial.disableDTR=true
+wifi_slot.serial.disableRTS=true
+wifi_slot.build.mcu=esp8266
+wifi_slot.build.core=esp8266
+wifi_slot.build.spiffs_pagesize=256
+wifi_slot.build.debug_port=
+wifi_slot.build.debug_level=
+wifi_slot.menu.CpuFrequency.80=80 MHz
+wifi_slot.menu.CpuFrequency.80.build.f_cpu=80000000L
+wifi_slot.menu.CpuFrequency.160=160 MHz
+wifi_slot.menu.CpuFrequency.160.build.f_cpu=160000000L
+wifi_slot.menu.VTable.flash=Flash
+wifi_slot.menu.VTable.flash.build.vtable_flags=-DVTABLES_IN_FLASH
+wifi_slot.menu.VTable.heap=Heap
+wifi_slot.menu.VTable.heap.build.vtable_flags=-DVTABLES_IN_DRAM
+wifi_slot.menu.VTable.iram=IRAM
+wifi_slot.menu.VTable.iram.build.vtable_flags=-DVTABLES_IN_IRAM
+wifi_slot.upload.resetmethod=nodemcu
+wifi_slot.menu.FlashFreq.40=40MHz
+wifi_slot.menu.FlashFreq.40.build.flash_freq=40
+wifi_slot.menu.FlashFreq.80=80MHz
+wifi_slot.menu.FlashFreq.80.build.flash_freq=80
+wifi_slot.menu.FlashMode.qio=QIO
+wifi_slot.menu.FlashMode.qio.build.flash_mode=qio
+wifi_slot.menu.FlashMode.qout=QOUT
+wifi_slot.menu.FlashMode.qout.build.flash_mode=qout
+wifi_slot.menu.FlashMode.dio=DIO
+wifi_slot.menu.FlashMode.dio.build.flash_mode=dio
+wifi_slot.menu.FlashMode.dout=DOUT
+wifi_slot.menu.FlashMode.dout.build.flash_mode=dout
+wifi_slot.menu.FlashSize.1M0=1M (no SPIFFS)
+wifi_slot.menu.FlashSize.1M0.build.flash_size=1M
+wifi_slot.menu.FlashSize.1M0.build.flash_size_bytes=0x100000
+wifi_slot.menu.FlashSize.1M0.build.flash_ld=eagle.flash.1m0.ld
+wifi_slot.menu.FlashSize.1M0.build.spiffs_pagesize=256
+wifi_slot.menu.FlashSize.1M0.upload.maximum_size=1023984
+wifi_slot.menu.FlashSize.1M0.build.rfcal_addr=0xFC000
+wifi_slot.menu.FlashSize.1M64=1M (64K SPIFFS)
+wifi_slot.menu.FlashSize.1M64.build.flash_size=1M
+wifi_slot.menu.FlashSize.1M64.build.flash_size_bytes=0x100000
+wifi_slot.menu.FlashSize.1M64.build.flash_ld=eagle.flash.1m64.ld
+wifi_slot.menu.FlashSize.1M64.build.spiffs_pagesize=256
+wifi_slot.menu.FlashSize.1M64.upload.maximum_size=958448
+wifi_slot.menu.FlashSize.1M64.build.rfcal_addr=0xFC000
+wifi_slot.menu.FlashSize.1M64.build.spiffs_start=0xEB000
+wifi_slot.menu.FlashSize.1M64.build.spiffs_end=0xFB000
+wifi_slot.menu.FlashSize.1M64.build.spiffs_blocksize=4096
+wifi_slot.menu.FlashSize.1M128=1M (128K SPIFFS)
+wifi_slot.menu.FlashSize.1M128.build.flash_size=1M
+wifi_slot.menu.FlashSize.1M128.build.flash_size_bytes=0x100000
+wifi_slot.menu.FlashSize.1M128.build.flash_ld=eagle.flash.1m128.ld
+wifi_slot.menu.FlashSize.1M128.build.spiffs_pagesize=256
+wifi_slot.menu.FlashSize.1M128.upload.maximum_size=892912
+wifi_slot.menu.FlashSize.1M128.build.rfcal_addr=0xFC000
+wifi_slot.menu.FlashSize.1M128.build.spiffs_start=0xDB000
+wifi_slot.menu.FlashSize.1M128.build.spiffs_end=0xFB000
+wifi_slot.menu.FlashSize.1M128.build.spiffs_blocksize=4096
+wifi_slot.menu.FlashSize.1M144=1M (144K SPIFFS)
+wifi_slot.menu.FlashSize.1M144.build.flash_size=1M
+wifi_slot.menu.FlashSize.1M144.build.flash_size_bytes=0x100000
+wifi_slot.menu.FlashSize.1M144.build.flash_ld=eagle.flash.1m144.ld
+wifi_slot.menu.FlashSize.1M144.build.spiffs_pagesize=256
+wifi_slot.menu.FlashSize.1M144.upload.maximum_size=876528
+wifi_slot.menu.FlashSize.1M144.build.rfcal_addr=0xFC000
+wifi_slot.menu.FlashSize.1M144.build.spiffs_start=0xD7000
+wifi_slot.menu.FlashSize.1M144.build.spiffs_end=0xFB000
+wifi_slot.menu.FlashSize.1M144.build.spiffs_blocksize=4096
+wifi_slot.menu.FlashSize.1M160=1M (160K SPIFFS)
+wifi_slot.menu.FlashSize.1M160.build.flash_size=1M
+wifi_slot.menu.FlashSize.1M160.build.flash_size_bytes=0x100000
+wifi_slot.menu.FlashSize.1M160.build.flash_ld=eagle.flash.1m160.ld
+wifi_slot.menu.FlashSize.1M160.build.spiffs_pagesize=256
+wifi_slot.menu.FlashSize.1M160.upload.maximum_size=860144
+wifi_slot.menu.FlashSize.1M160.build.rfcal_addr=0xFC000
+wifi_slot.menu.FlashSize.1M160.build.spiffs_start=0xD3000
+wifi_slot.menu.FlashSize.1M160.build.spiffs_end=0xFB000
+wifi_slot.menu.FlashSize.1M160.build.spiffs_blocksize=4096
+wifi_slot.menu.FlashSize.1M192=1M (192K SPIFFS)
+wifi_slot.menu.FlashSize.1M192.build.flash_size=1M
+wifi_slot.menu.FlashSize.1M192.build.flash_size_bytes=0x100000
+wifi_slot.menu.FlashSize.1M192.build.flash_ld=eagle.flash.1m192.ld
+wifi_slot.menu.FlashSize.1M192.build.spiffs_pagesize=256
+wifi_slot.menu.FlashSize.1M192.upload.maximum_size=827376
+wifi_slot.menu.FlashSize.1M192.build.rfcal_addr=0xFC000
+wifi_slot.menu.FlashSize.1M192.build.spiffs_start=0xCB000
+wifi_slot.menu.FlashSize.1M192.build.spiffs_end=0xFB000
+wifi_slot.menu.FlashSize.1M192.build.spiffs_blocksize=4096
+wifi_slot.menu.FlashSize.1M256=1M (256K SPIFFS)
+wifi_slot.menu.FlashSize.1M256.build.flash_size=1M
+wifi_slot.menu.FlashSize.1M256.build.flash_size_bytes=0x100000
+wifi_slot.menu.FlashSize.1M256.build.flash_ld=eagle.flash.1m256.ld
+wifi_slot.menu.FlashSize.1M256.build.spiffs_pagesize=256
+wifi_slot.menu.FlashSize.1M256.upload.maximum_size=761840
+wifi_slot.menu.FlashSize.1M256.build.rfcal_addr=0xFC000
+wifi_slot.menu.FlashSize.1M256.build.spiffs_start=0xBB000
+wifi_slot.menu.FlashSize.1M256.build.spiffs_end=0xFB000
+wifi_slot.menu.FlashSize.1M256.build.spiffs_blocksize=4096
+wifi_slot.menu.FlashSize.1M512=1M (512K SPIFFS)
+wifi_slot.menu.FlashSize.1M512.build.flash_size=1M
+wifi_slot.menu.FlashSize.1M512.build.flash_size_bytes=0x100000
+wifi_slot.menu.FlashSize.1M512.build.flash_ld=eagle.flash.1m512.ld
+wifi_slot.menu.FlashSize.1M512.build.spiffs_pagesize=256
+wifi_slot.menu.FlashSize.1M512.upload.maximum_size=499696
+wifi_slot.menu.FlashSize.1M512.build.rfcal_addr=0xFC000
+wifi_slot.menu.FlashSize.1M512.build.spiffs_start=0x7B000
+wifi_slot.menu.FlashSize.1M512.build.spiffs_end=0xFB000
+wifi_slot.menu.FlashSize.1M512.build.spiffs_blocksize=8192
+wifi_slot.menu.FlashSize.2M=2M (1M SPIFFS)
+wifi_slot.menu.FlashSize.2M.build.flash_size=2M
+wifi_slot.menu.FlashSize.2M.build.flash_size_bytes=0x200000
+wifi_slot.menu.FlashSize.2M.build.flash_ld=eagle.flash.2m.ld
+wifi_slot.menu.FlashSize.2M.build.spiffs_pagesize=256
+wifi_slot.menu.FlashSize.2M.upload.maximum_size=1044464
+wifi_slot.menu.FlashSize.2M.build.rfcal_addr=0x1FC000
+wifi_slot.menu.FlashSize.2M.build.spiffs_start=0x100000
+wifi_slot.menu.FlashSize.2M.build.spiffs_end=0x1FB000
+wifi_slot.menu.FlashSize.2M.build.spiffs_blocksize=8192
+wifi_slot.menu.LwIPVariant.v2mss536=v2 Lower Memory
+wifi_slot.menu.LwIPVariant.v2mss536.build.lwip_include=lwip2/include
+wifi_slot.menu.LwIPVariant.v2mss536.build.lwip_lib=-llwip2
+wifi_slot.menu.LwIPVariant.v2mss536.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536
+wifi_slot.menu.LwIPVariant.v2mss1460=v2 Higher Bandwidth
+wifi_slot.menu.LwIPVariant.v2mss1460.build.lwip_include=lwip2/include
+wifi_slot.menu.LwIPVariant.v2mss1460.build.lwip_lib=-llwip2_1460
+wifi_slot.menu.LwIPVariant.v2mss1460.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460
+wifi_slot.menu.LwIPVariant.Prebuilt=v1.4 Higher Bandwidth
+wifi_slot.menu.LwIPVariant.Prebuilt.build.lwip_lib=-llwip_gcc
+wifi_slot.menu.LwIPVariant.Prebuilt.build.lwip_flags=-DLWIP_OPEN_SRC
+wifi_slot.menu.LwIPVariant.OpenSource=v1.4 Compile from source
+wifi_slot.menu.LwIPVariant.OpenSource.build.lwip_lib=-llwip_src
+wifi_slot.menu.LwIPVariant.OpenSource.build.lwip_flags=-DLWIP_OPEN_SRC
+wifi_slot.menu.LwIPVariant.OpenSource.recipe.hooks.sketch.prebuild.1.pattern=make -C "{runtime.platform.path}/tools/sdk/lwip/src" install TOOLS_PATH="{runtime.tools.xtensa-lx106-elf-gcc.path}/bin/xtensa-lx106-elf-"
+wifi_slot.menu.Debug.Disabled=Disabled
+wifi_slot.menu.Debug.Disabled.build.debug_port=
+wifi_slot.menu.Debug.Serial=Serial
+wifi_slot.menu.Debug.Serial.build.debug_port=-DDEBUG_ESP_PORT=Serial
+wifi_slot.menu.Debug.Serial1=Serial1
+wifi_slot.menu.Debug.Serial1.build.debug_port=-DDEBUG_ESP_PORT=Serial1
+wifi_slot.menu.DebugLevel.None____=None
+wifi_slot.menu.DebugLevel.None____.build.debug_level=
+wifi_slot.menu.DebugLevel.SSL=SSL
+wifi_slot.menu.DebugLevel.SSL.build.debug_level= -DDEBUG_ESP_SSL
+wifi_slot.menu.DebugLevel.TLS_MEM=TLS_MEM
+wifi_slot.menu.DebugLevel.TLS_MEM.build.debug_level= -DDEBUG_ESP_TLS_MEM
+wifi_slot.menu.DebugLevel.HTTP_CLIENT=HTTP_CLIENT
+wifi_slot.menu.DebugLevel.HTTP_CLIENT.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT
+wifi_slot.menu.DebugLevel.HTTP_SERVER=HTTP_SERVER
+wifi_slot.menu.DebugLevel.HTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_SERVER
+wifi_slot.menu.DebugLevel.SSLTLS_MEM=SSL+TLS_MEM
+wifi_slot.menu.DebugLevel.SSLTLS_MEM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM
+wifi_slot.menu.DebugLevel.SSLHTTP_CLIENT=SSL+HTTP_CLIENT
+wifi_slot.menu.DebugLevel.SSLHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT
+wifi_slot.menu.DebugLevel.SSLHTTP_SERVER=SSL+HTTP_SERVER
+wifi_slot.menu.DebugLevel.SSLHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_SERVER
+wifi_slot.menu.DebugLevel.TLS_MEMHTTP_CLIENT=TLS_MEM+HTTP_CLIENT
+wifi_slot.menu.DebugLevel.TLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
+wifi_slot.menu.DebugLevel.TLS_MEMHTTP_SERVER=TLS_MEM+HTTP_SERVER
+wifi_slot.menu.DebugLevel.TLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
+wifi_slot.menu.DebugLevel.HTTP_CLIENTHTTP_SERVER=HTTP_CLIENT+HTTP_SERVER
+wifi_slot.menu.DebugLevel.HTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+wifi_slot.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENT=SSL+TLS_MEM+HTTP_CLIENT
+wifi_slot.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
+wifi_slot.menu.DebugLevel.SSLTLS_MEMHTTP_SERVER=SSL+TLS_MEM+HTTP_SERVER
+wifi_slot.menu.DebugLevel.SSLTLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
+wifi_slot.menu.DebugLevel.SSLHTTP_CLIENTHTTP_SERVER=SSL+HTTP_CLIENT+HTTP_SERVER
+wifi_slot.menu.DebugLevel.SSLHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+wifi_slot.menu.DebugLevel.TLS_MEMHTTP_CLIENTHTTP_SERVER=TLS_MEM+HTTP_CLIENT+HTTP_SERVER
+wifi_slot.menu.DebugLevel.TLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+wifi_slot.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER
+wifi_slot.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+wifi_slot.menu.DebugLevel.CORE=CORE
+wifi_slot.menu.DebugLevel.CORE.build.debug_level= -DDEBUG_ESP_CORE
+wifi_slot.menu.DebugLevel.WIFI=WIFI
+wifi_slot.menu.DebugLevel.WIFI.build.debug_level= -DDEBUG_ESP_WIFI
+wifi_slot.menu.DebugLevel.HTTP_UPDATE=HTTP_UPDATE
+wifi_slot.menu.DebugLevel.HTTP_UPDATE.build.debug_level= -DDEBUG_ESP_HTTP_UPDATE
+wifi_slot.menu.DebugLevel.UPDATER=UPDATER
+wifi_slot.menu.DebugLevel.UPDATER.build.debug_level= -DDEBUG_ESP_UPDATER
+wifi_slot.menu.DebugLevel.OTA=OTA
+wifi_slot.menu.DebugLevel.OTA.build.debug_level= -DDEBUG_ESP_OTA
+wifi_slot.menu.DebugLevel.OOM=OOM
+wifi_slot.menu.DebugLevel.OOM.build.debug_level= -DDEBUG_ESP_OOM
+wifi_slot.menu.DebugLevel.COREWIFIHTTP_UPDATEUPDATEROTAOOM=CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM
+wifi_slot.menu.DebugLevel.COREWIFIHTTP_UPDATEUPDATEROTAOOM.build.debug_level= -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM
+wifi_slot.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOM=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER+CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM
+wifi_slot.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM
+wifi_slot.menu.DebugLevel.NoAssert-NDEBUG=NoAssert-NDEBUG
+wifi_slot.menu.DebugLevel.NoAssert-NDEBUG.build.debug_level= -DNDEBUG
+wifi_slot.menu.FlashErase.none=Only Sketch
+wifi_slot.menu.FlashErase.none.upload.erase_cmd=
+wifi_slot.menu.FlashErase.sdk=Sketch + WiFi Settings
+wifi_slot.menu.FlashErase.sdk.upload.erase_cmd=-ca "{build.rfcal_addr}" -cz 0x4000
+wifi_slot.menu.FlashErase.all=All Flash Contents
+wifi_slot.menu.FlashErase.all.upload.erase_cmd=-ca 0x0 -cz "{build.flash_size_bytes}"
+wifi_slot.menu.UploadSpeed.115200=115200
+wifi_slot.menu.UploadSpeed.115200.upload.speed=115200
+wifi_slot.menu.UploadSpeed.9600=9600
+wifi_slot.menu.UploadSpeed.9600.upload.speed=9600
+wifi_slot.menu.UploadSpeed.57600=57600
+wifi_slot.menu.UploadSpeed.57600.upload.speed=57600
+wifi_slot.menu.UploadSpeed.230400.linux=230400
+wifi_slot.menu.UploadSpeed.230400.macosx=230400
+wifi_slot.menu.UploadSpeed.230400.upload.speed=230400
+wifi_slot.menu.UploadSpeed.256000.windows=256000
+wifi_slot.menu.UploadSpeed.256000.upload.speed=256000
+wifi_slot.menu.UploadSpeed.460800.linux=460800
+wifi_slot.menu.UploadSpeed.460800.macosx=460800
+wifi_slot.menu.UploadSpeed.460800.upload.speed=460800
+wifi_slot.menu.UploadSpeed.512000.windows=512000
+wifi_slot.menu.UploadSpeed.512000.upload.speed=512000
+wifi_slot.menu.UploadSpeed.921600=921600
+wifi_slot.menu.UploadSpeed.921600.upload.speed=921600
+

cores/esp8266/Esp-version.cpp

@@ -23,6 +23,7 @@
 #include <core_version.h>
 #include <lwip/init.h>      // LWIP_VERSION_*
 #include <lwipopts.h>       // LWIP_HASH_STR (lwip2)
+#include <bearssl/bearssl_git.h>  // BEARSSL_GIT short hash
 
 #define STRHELPER(x) #x
 #define STR(x) STRHELPER(x) // stringifier
@@ -31,6 +32,7 @@ static const char arduino_esp8266_git_ver [] PROGMEM = STR(ARDUINO_ESP8266_GIT_D
 #if LWIP_VERSION_MAJOR != 1
 static const char lwip2_version [] PROGMEM = "/lwIP:" STR(LWIP_VERSION_MAJOR) "." STR(LWIP_VERSION_MINOR) "." STR(LWIP_VERSION_REVISION);
 #endif
+static const char bearssl_version [] PROGMEM = "/BearSSL:" STR(BEARSSL_GIT);
 
 String EspClass::getFullVersion()
 {
@@ -50,5 +52,6 @@ String EspClass::getFullVersion()
 #ifdef LWIP_HASH_STR
              + "(" + F(LWIP_HASH_STR) + ")"
 #endif
+             + FPSTR(bearssl_version)
            ;
 }

cores/esp8266/libb64/cencode.c

@@ -7,13 +7,11 @@ For details, see http://sourceforge.net/projects/libb64
 
 #include "cencode.h"
 
-const int CHARS_PER_LINE = 72;
-
 void base64_init_encodestate(base64_encodestate* state_in){
   state_in->step = step_A;
   state_in->result = 0;
   state_in->stepcount = 0;
-  state_in->stepsnewline = CHARS_PER_LINE;
+  state_in->stepsnewline = BASE64_CHARS_PER_LINE;
 }
 
 
@@ -72,7 +70,7 @@ int base64_encode_block(const char* plaintext_in, int length_in, char* code_out,
       *codechar++ = base64_encode_value(result);
 
       ++(state_in->stepcount);
-      if ((state_in->stepcount == CHARS_PER_LINE/4) && (state_in->stepsnewline > 0)){
+      if ((state_in->stepcount == BASE64_CHARS_PER_LINE/4) && (state_in->stepsnewline > 0)){
         *codechar++ = '\n';
         state_in->stepcount = 0;
       }

cores/esp8266/libb64/cencode.h

@@ -8,7 +8,12 @@ For details, see http://sourceforge.net/projects/libb64
 #ifndef BASE64_CENCODE_H
 #define BASE64_CENCODE_H
 
-#define base64_encode_expected_len(n) ((((4 * n) / 3) + 3) & ~3)
+#define BASE64_CHARS_PER_LINE 72
+
+#define base64_encode_expected_len_nonewlines(n) ((((4 * (n)) / 3) + 3) & ~3)
+#define base64_encode_expected_len(n) \
+       (base64_encode_expected_len_nonewlines(n) + ((n / ((BASE64_CHARS_PER_LINE * 3) / 4)) + 1))
+
 
 #ifdef __cplusplus
 extern "C" {

doc/boards.rst

@@ -389,3 +389,8 @@ WiFiduino
 
 Product page: https://wifiduino.com/esp8266
 
+Amperka WiFi Slot
+-----------------
+
+Product page: http://wiki.amperka.ru/wifi-slot
+

doc/eclipse/eclipse.rst

@@ -6,7 +6,7 @@ What to Download
 
 -  `arduino IDE <https://www.arduino.cc/en/Main/Software>`__
 -  `Eclipse IDE for C/C++
-   Developers <http://www.eclipse.org/downloads/packages/eclipse-ide-cc-developers/marsr>`__
+   Developers <http://www.eclipse.org/downloads/packages/eclipse-ide-cc-developers/oxygen3a>`__
 -  `Java <http://www.java.com/>`__
 
 Setup Arduino

doc/faq/readme.rst

@@ -93,8 +93,15 @@ This error may pop up after switching between
 How to clear TCP PCBs in time-wait state ?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-This is needed with lwIP-v1.4, less needed with lwIP-v2 but timeout is still
-too high.
+This is not needed anymore:
+
+PCBs in time-wait state are limited to 5 and removed when that number is
+exceeded.
+
+Ref.  `lwIP-v1.4 <https://github.com/esp8266/Arduino/commit/07f4d4c241df2c552899857f39a4295164f686f2#diff-f8258e71e25fb9985ca3799e3d8b88ecR399>`__,
+`lwIP-v2 <https://github.com/d-a-v/esp82xx-nonos-linklayer/commit/420960dfc0dbe07114f7364845836ac333bc84f7>`__
+
+For reference:
 
 Time-wait PCB state helps TCP not confusing two consecutive connections with the
 same (s-ip,s-port,d-ip,d-port) when the first is already closed but still

libraries/ESP8266HTTPUpdateServer/src/ESP8266HTTPUpdateServer.h

@@ -25,6 +25,12 @@ class ESP8266HTTPUpdateServer
 
     void setup(ESP8266WebServer *server, const char * path, const char * username, const char * password);
 
+    void updateCredentials(const char * username, const char * password)
+    {
+      _username = (char *)username;
+      _password = (char *)password;
+    }
+
   protected:
     void _setUpdaterError();
 

libraries/ESP8266WiFi/src/WiFiClientSecureBearSSL.cpp

@@ -228,10 +228,7 @@ bool WiFiClientSecure::_clientConnected() {
 }
 
 uint8_t WiFiClientSecure::connected() {
-  if (_recvapp_len) {
-    return true;
-  }
-  if (_client && _client->state() == ESTABLISHED && _handshake_done) {
+  if (available() || (_clientConnected() && _handshake_done)) {
     return true;
   }
   return false;
@@ -400,7 +397,7 @@ int WiFiClientSecure::_run_until(unsigned target, bool blocking) {
     }
 
     if (!(_client->state() == ESTABLISHED) && !WiFiClient::available()) {
-      return -1;
+      return (state & target) ? 0 : -1;
     }
 
     /*

libraries/ESP8266mDNS/ESP8266mDNS.cpp

@@ -551,7 +551,8 @@ void MDNSResponder::_parsePacket(){
         if (tmp8 & 0xC0) { // Compressed pointer
           uint16_t offset = ((((uint16_t)tmp8) & ~0xC0) << 8) | _conn_read8();
           if (_conn->isValidOffset(offset)) {
-              last_bufferpos  = _conn->tell();
+              if (0 == last_bufferpos)
+                last_bufferpos  = _conn->tell();
 #ifdef DEBUG_ESP_MDNS_RX
               DEBUG_ESP_PORT.print("Compressed pointer, jumping from ");
               DEBUG_ESP_PORT.print(last_bufferpos);

libraries/esp8266/examples/interactive/interactive.ino

@@ -85,7 +85,7 @@ void loop() {
     case 'n': DO(WiFi.setSleepMode(WIFI_NONE_SLEEP));
     case 'l': DO(WiFi.setSleepMode(WIFI_LIGHT_SLEEP));
     case 'm': DO(WiFi.setSleepMode(WIFI_MODEM_SLEEP));
-    case 's': DO(WiFi.config(staticip, gateway, subnet));
-    case 'D': DO(wifi_station_dhcpc_start());
+    case 'S': DO(WiFi.config(staticip, gateway, subnet)); // use static address
+    case 's': DO(WiFi.config(0u, 0u, 0u));                // back to dhcp client
   }
 }