Merge branch 'master' into fscharwrite

earlephilhower · web-flow · commit 918732c7039c · 2019-05-15T13:36:12.000-07:00
diff --git a/README.md b/README.md
@@ -48,9 +48,9 @@ Documentation: [https://arduino-esp8266.readthedocs.io/en/2.5.1/](https://arduin
     ```bash
     cd <application-directory>/Arduino.app/Contents/Java
     ```
-  - For Linux, it is ~/arduino by default.
+  - For Linux, it is ~/Arduino by default.
     ```bash
-    cd ~arduino
+    cd ~/Arduino
     ```
 - Clone this repository into hardware/esp8266com/esp8266 directory (or clone it elsewhere and create a symlink)
 ```bash
diff --git a/libraries/ESP8266WiFi/src/WiFiClientSecureBearSSL.cpp b/libraries/ESP8266WiFi/src/WiFiClientSecureBearSSL.cpp
@@ -255,7 +255,7 @@ bool WiFiClientSecure::_clientConnected() {
 }
 
 uint8_t WiFiClientSecure::connected() {
-  if (available() || (_clientConnected() && _handshake_done)) {
+  if (available() || (_clientConnected() && _handshake_done && (br_ssl_engine_current_state(_eng) != BR_SSL_CLOSED))) {
     return true;
   }
   return false;
@@ -1003,6 +1003,12 @@ bool WiFiClientSecure::_connectSSL(const char* hostName) {
     DEBUG_BSSL("Connected!\n");
   }
 #endif
+
+  // Session is already validated here, there is no need to keep following
+  _x509_minimal = nullptr;
+  _x509_insecure = nullptr;
+  _x509_knownkey = nullptr;
+
   return ret;
 }
 
diff --git a/tests/device/Makefile b/tests/device/Makefile
@@ -4,10 +4,12 @@ TEST_LIST ?= $(wildcard test_*/*.ino)
 ESP8266_CORE_PATH ?= ../..
 BUILD_DIR ?= $(PWD)/.build
 HARDWARE_DIR ?= $(PWD)/.hardware
-ESPTOOL ?= $(ESP8266_CORE_PATH)/tools/esptool/esptool
+#PYTHON ?= python3
+PYTHON ?= python
+ESPTOOL ?= $(PYTHON) $(ESP8266_CORE_PATH)/tools/esptool/esptool.py
 MKSPIFFS ?= $(ESP8266_CORE_PATH)/tools/mkspiffs/mkspiffs
 UPLOAD_PORT ?= $(shell ls /dev/tty* | grep -m 1 -i USB)
-UPLOAD_BAUD ?= 921600
+UPLOAD_BAUD ?= 460800
 UPLOAD_BOARD ?= nodemcu
 BS_DIR ?= libraries/BSTest
 DEBUG_LEVEL ?= DebugLevel=None____
@@ -24,7 +26,7 @@ ifneq ("$(V)","1")
 else
 	BUILDER_DEBUG_FLAG = -verbose
 	RUNNER_DEBUG_FLAG = -d
-	UPLOAD_VERBOSE_FLAG = -v
+	#UPLOAD_VERBOSE_FLAG = -v
 endif
 
 
@@ -57,28 +59,34 @@ endif
 ifneq ("$(NO_UPLOAD)","1")
 	@test -n "$(UPLOAD_PORT)" || (echo "Failed to detect upload port, please export UPLOAD_PORT manually" && exit 1)
 	@test -e $(dir $@)/make_spiffs.py && (echo "Generating and uploading SPIFFS" && \
-		(cd $(dir $@) && python ./make_spiffs.py) && \
-		$(MKSPIFFS) --create $(dir $@)data/ --size 0xFB000 \
+		(cd $(dir $@) && $(PYTHON) ./make_spiffs.py) && \
+		$(SILENT)$(MKSPIFFS) --create $(dir $@)data/ --size 0xFB000 \
 			--block 8192 --page 256 $(LOCAL_BUILD_DIR)/spiffs.img && \
-		$(ESPTOOL) $(UPLOAD_VERBOSE_FLAG) \
-			-cp $(UPLOAD_PORT) \
-			-cb $(UPLOAD_BAUD) \
-			-cd $(UPLOAD_BOARD) \
-			-ca 0x300000 \
-			-cf $(LOCAL_BUILD_DIR)/spiffs.img ) || (echo "No SPIFFS to upload")
+		$(SILENT)$(ESPTOOL) $(UPLOAD_VERBOSE_FLAG) \
+			--chip esp8266 \
+			--port $(UPLOAD_PORT) \
+			--baud $(UPLOAD_BAUD) \
+			--after no_reset \
+			write_flash 0x300000 $(LOCAL_BUILD_DIR)/spiffs.img ) \
+			|| (echo "No SPIFFS to upload")
 	@echo Uploading binary
 	$(SILENT)$(ESPTOOL) $(UPLOAD_VERBOSE_FLAG)  \
-		-cp $(UPLOAD_PORT) \
-		-cb $(UPLOAD_BAUD) \
-		-cd $(UPLOAD_BOARD) \
-		-cf $(LOCAL_BUILD_DIR)/$(notdir $@).bin
+		--chip esp8266 \
+		--port $(UPLOAD_PORT) \
+		--baud $(UPLOAD_BAUD) \
+		--after no_reset \
+		write_flash 0x0 $(LOCAL_BUILD_DIR)/$(notdir $@).bin # no reset
 endif
 ifneq ("$(NO_RUN)","1")
 	@test -n "$(UPLOAD_PORT)" || (echo "Failed to detect upload port, please export UPLOAD_PORT manually" && exit 1)
 	@echo Running tests
-	$(SILENT)$(ESPTOOL) $(UPLOAD_VERBOSE_FLAG) -cp $(UPLOAD_PORT) -cd $(UPLOAD_BOARD) -cr
+	$(SILENT)$(ESPTOOL) $(UPLOAD_VERBOSE_FLAG)  \
+		--chip esp8266 \
+		--port $(UPLOAD_PORT) \
+		--baud $(UPLOAD_BAUD) \
+		read_flash_status # reset
 	@source $(BS_DIR)/virtualenv/bin/activate && \
-		python $(BS_DIR)/runner.py \
+		$(PYTHON) $(BS_DIR)/runner.py \
 			$(RUNNER_DEBUG_FLAG) \
 			-p $(UPLOAD_PORT) \
 			-n $(basename $(notdir $@)) \
@@ -88,10 +96,10 @@ ifneq ("$(NO_RUN)","1")
 endif
 
 $(TEST_REPORT_XML): $(HARDWARE_DIR) virtualenv
-	@$(BS_DIR)/virtualenv/bin/xunitmerge $(shell find $(BUILD_DIR) -name 'test_result.xml' | xargs echo) $(TEST_REPORT_XML)
+	$(SILENT)$(BS_DIR)/virtualenv/bin/xunitmerge $(shell find $(BUILD_DIR) -name 'test_result.xml' | xargs echo) $(TEST_REPORT_XML)
 
 $(TEST_REPORT_HTML): $(TEST_REPORT_XML) | virtualenv
-	@$(BS_DIR)/virtualenv/bin/junit2html $< $@
+	$(SILENT)$(BS_DIR)/virtualenv/bin/junit2html $< $@
 
 test_report: $(TEST_REPORT_HTML)
 	@echo "Test report generated in $(TEST_REPORT_HTML)"
@@ -104,13 +112,17 @@ $(HARDWARE_DIR):
 	cd $(HARDWARE_DIR)/esp8266com && ln -s $(realpath $(ESP8266_CORE_PATH)) esp8266
 
 virtualenv:
-	@make -C $(BS_DIR) virtualenv
+	@make -C $(BS_DIR) PYTHON=$(PYTHON) virtualenv
 
 clean:
 	rm -rf $(BUILD_DIR)
 	rm -rf $(HARDWARE_DIR)
 	rm -f $(TEST_REPORT_HTML) $(TEST_REPORT_XML)
 
+distclean: clean
+	rm -rf libraries/BSTest/virtualenv/
+	find . -name "*pyc" -exec rm -f {} \;
+
 $(TEST_CONFIG):
 	@echo "******    "
 	@echo "******    $(TEST_CONFIG) does not exist"
diff --git a/tests/device/libraries/BSTest/Makefile b/tests/device/libraries/BSTest/Makefile
@@ -1,5 +1,6 @@
 PYTHON_ENV_DIR=virtualenv
 TEST_EXECUTABLE=test/test
+PYTHON ?= python3
 
 all: test
 
@@ -10,7 +11,7 @@ clean:
 	rm -rf $(TEST_EXECUTABLE)
 
 $(PYTHON_ENV_DIR):
-	virtualenv --no-site-packages $(PYTHON_ENV_DIR)
+	virtualenv --python=$(PYTHON) --no-site-packages $(PYTHON_ENV_DIR)
 	. $(PYTHON_ENV_DIR)/bin/activate && pip install -r requirements.txt
 
 test: $(TEST_EXECUTABLE) $(PYTHON_ENV_DIR)
diff --git a/tests/device/libraries/BSTest/runner.py b/tests/device/libraries/BSTest/runner.py
@@ -14,12 +14,18 @@
 except:
     from ConfigParser import ConfigParser
 import itertools
-from urlparse import urlparse
+try:
+    from urllib.parse import urlparse, urlencode
+except ImportError:
+    from urlparse import urlparse
 from junit_xml import TestSuite, TestCase
 try:
     from cStringIO import StringIO
 except:
-    from StringIO import StringIO
+    try:
+        from StringIO import StringIO
+    except ImportError:
+        from io import StringIO
 import mock_decorators
 
 debug = False
diff --git a/tools/platformio-build.py b/tools/platformio-build.py
@@ -24,13 +24,10 @@
 
 # Extends: https://github.com/platformio/platform-espressif8266/blob/develop/builder/main.py
 
-import os
-import subprocess
-
 from os.path import isdir, join
 
-from SCons import Builder, Util
-from SCons.Script import DefaultEnvironment
+from SCons import Util
+from SCons.Script import Builder, DefaultEnvironment
 
 
 def scons_patched_match_splitext(path, suffixes=None):
@@ -127,7 +124,26 @@ def scons_patched_match_splitext(path, suffixes=None):
 
     LIBSOURCE_DIRS=[
         join(FRAMEWORK_DIR, "libraries")
-    ]
+    ],
+
+    BUILDERS=dict(
+        ElfToBin=Builder(
+            action=env.VerboseAction(" ".join([
+                '"$PYTHONEXE"',
+                '"%s"' % env.subst(join(FRAMEWORK_DIR, "tools", "elf2bin.py")),
+                "--eboot", '"%s"' % env.subst(join(
+                    FRAMEWORK_DIR, "bootloaders", "eboot", "eboot.elf")),
+                "--app", '"%s"' % "$SOURCE",
+                "--flash_mode", "$BOARD_FLASH_MODE",
+                "--flash_freq", "${__get_board_f_flash(__env__)}",
+                "--flash_size", "${__get_flash_size(__env__)}",
+                "--path", '"%s"' % env.subst(join(
+                    platform.get_package_dir("toolchain-xtensa"), "bin")),
+                "--out", '"$TARGET"'
+            ]), "Building $TARGET"),
+            suffix=".bin"
+        )
+    )
 )
 
 # copy CCFLAGS to ASFLAGS (-x assembler-with-cpp mode)
@@ -141,18 +157,18 @@ def scons_patched_match_splitext(path, suffixes=None):
 if "PIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK3" in flatten_cppdefines:
     env.Append(
         CPPDEFINES=[("NONOSDK3V0", 1)],
-        LIBPATH=[join(FRAMEWORK_DIR, "tools", "sdk", "lib", "NONOSDK3V0"),]
+        LIBPATH=[join(FRAMEWORK_DIR, "tools", "sdk", "lib", "NONOSDK3V0")]
     )
 elif "PIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x" in flatten_cppdefines:
     env.Append(
         CPPDEFINES=[("NONOSDK22x", 1)],
-        LIBPATH=[join(FRAMEWORK_DIR, "tools", "sdk", "lib", "NONOSDK22x"),]
+        LIBPATH=[join(FRAMEWORK_DIR, "tools", "sdk", "lib", "NONOSDK22x")]
     )
 # PIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x (default)
 else:
     env.Append(
         CPPDEFINES=[("NONOSDK221", 1)],
-        LIBPATH=[join(FRAMEWORK_DIR, "tools", "sdk", "lib", "NONOSDK221"),]
+        LIBPATH=[join(FRAMEWORK_DIR, "tools", "sdk", "lib", "NONOSDK221")]
     )
 
 #
diff --git a/tools/sdk/ld/eagle.app.v6.common.ld.h b/tools/sdk/ld/eagle.app.v6.common.ld.h
@@ -137,6 +137,7 @@ SECTIONS
     *(.ver_number)
     *.c.o( EXCLUDE_FILE (umm_malloc.c.o) .literal*, EXCLUDE_FILE (umm_malloc.c.o) .text* )
     *.cpp.o(.literal*, .text*)
+    *.cc.o(.literal*, .text*)
 #ifdef VTABLES_IN_FLASH
     *(.rodata._ZTV*) /* C++ vtables */
 #endif

Original file line number	Diff line number	Diff line change
`@@ -255,7 +255,7 @@ bool WiFiClientSecure::_clientConnected() {`
`255`	`255`	`}`
`256`	`256`
`257`	`257`	`uint8_t WiFiClientSecure::connected() {`
`258`		`- if (available() \|\| (_clientConnected() && _handshake_done)) {`
	`258`	`+ if (available() \|\| (_clientConnected() && _handshake_done && (br_ssl_engine_current_state(_eng) != BR_SSL_CLOSED))) {`
`259`	`259`	`return true;`
`260`	`260`	`}`
`261`	`261`	`return false;`
`@@ -1003,6 +1003,12 @@ bool WiFiClientSecure::_connectSSL(const char* hostName) {`
`1003`	`1003`	`DEBUG_BSSL("Connected!\n");`
`1004`	`1004`	`}`
`1005`	`1005`	`#endif`
	`1006`	`+`
	`1007`	`+ // Session is already validated here, there is no need to keep following`
	`1008`	`+ _x509_minimal = nullptr;`
	`1009`	`+ _x509_insecure = nullptr;`
	`1010`	`+ _x509_knownkey = nullptr;`
	`1011`	`+`
`1006`	`1012`	`return ret;`
`1007`	`1013`	`}`
`1008`	`1014`