Subrepo axtls

libraries/ESP8266WiFi/src/WiFiClientSecure.h

@@ -23,7 +23,7 @@
 #ifndef wificlientsecure_h
 #define wificlientsecure_h
 #include "WiFiClient.h"
-#include "include/ssl.h"
+#include <ssl/ssl.h>
 
 
 class SSLContext;

libraries/Hash/src/Hash.cpp

@@ -27,7 +27,7 @@
 #include "Hash.h"
 
 extern "C" {
-#include "sha1/sha1.h"
+#include <crypto/crypto.h>
 }
 
 /**
@@ -39,31 +39,9 @@ extern "C" {
 void sha1(uint8_t * data, uint32_t size, uint8_t hash[20]) {
 
     SHA1_CTX ctx;
-
-#ifdef DEBUG_SHA1
-    os_printf("DATA:");
-    for(uint16_t i = 0; i < size; i++) {
-        os_printf("%02X", data[i]);
-    }
-    os_printf("\n");
-    os_printf("DATA:");
-    for(uint16_t i = 0; i < size; i++) {
-        os_printf("%c", data[i]);
-    }
-    os_printf("\n");
-#endif
-
-    SHA1Init(&ctx);
-    SHA1Update(&ctx, data, size);
-    SHA1Final(hash, &ctx);
-
-#ifdef DEBUG_SHA1
-    os_printf("SHA1:");
-    for(uint16_t i = 0; i < 20; i++) {
-        os_printf("%02X", hash[i]);
-    }
-    os_printf("\n\n");
-#endif
+    SHA1_Init(&ctx);
+    SHA1_Update(&ctx, data, size);
+    SHA1_Final(hash, &ctx);
 }
 
 void sha1(char * data, uint32_t size, uint8_t hash[20]) {

platform.txt

@@ -23,7 +23,7 @@ build.lwip_flags=-DLWIP_OPEN_SRC
 compiler.path={runtime.tools.xtensa-lx106-elf-gcc.path}/bin/
 compiler.sdk.path={runtime.platform.path}/tools/sdk
 compiler.libc.path={runtime.platform.path}/tools/sdk/libc/xtensa-lx106-elf
-compiler.cpreprocessor.flags=-D__ets__ -DICACHE_FLASH -U__STRICT_ANSI__ "-I{compiler.sdk.path}/include" "-I{compiler.sdk.path}/lwip/include" "-I{compiler.libc.path}/include" "-I{build.path}/core"
+compiler.cpreprocessor.flags=-D__ets__ -DICACHE_FLASH -U__STRICT_ANSI__ "-I{compiler.sdk.path}/include" "-I{compiler.sdk.path}/lwip/include" "-I{compiler.libc.path}/include" "-I{build.path}/core" "-I{compiler.sdk.path}/axtls"
 
 compiler.c.cmd=xtensa-lx106-elf-gcc
 compiler.c.flags=-c {compiler.warning_flags} -Os -g -Wpointer-arith -Wno-implicit-function-declaration -Wl,-EL -fno-inline-functions -nostdlib -mlongcalls -mtext-section-literals -falign-functions=4 -MMD -std=gnu99 -ffunction-sections -fdata-sections

tools/sdk/axtls/.gitignore

@@ -0,0 +1,5 @@
+*.o
+bin/
+Makefile.local
+.DS_Store
+

tools/sdk/axtls/.gitmodules

@@ -0,0 +1,3 @@
+[submodule "compat"]
+	path = compat
+	url = https://github.com/attachix/lwirax.git

tools/sdk/axtls/.gitrepo

@@ -0,0 +1,11 @@
+; DO NOT EDIT (unless you know what you are doing)
+;
+; This subdirectory is a git "subrepo", and this file is maintained by the
+; git-subrepo command. See https://github.com/git-commands/git-subrepo#readme
+;
+[subrepo]
+	remote = https://github.com/igrr/axtls-8266
+	branch = master
+	commit = 27f4a6caf69625a9e798b7a1c3b1406ec1ec1d85
+	parent = b6958986d1fd1e020ae8794d91959c2e1030eacf
+	cmdver = 0.3.1

tools/sdk/axtls/.travis.yml

@@ -0,0 +1,43 @@
+sudo: false
+language: bash
+os:
+  - linux
+
+script:
+  # Download Arduino IDE
+  - wget -O arduino.tar.xz https://www.arduino.cc/download.php?f=/arduino-nightly-linux64.tar.xz
+  - tar xf arduino.tar.xz
+  - mv arduino-nightly $HOME/arduino_ide
+  # Download ESP8266 Arduino core
+  - cd $HOME/arduino_ide/hardware
+  - mkdir esp8266com
+  - cd esp8266com
+  - git clone https://github.com/esp8266/Arduino.git esp8266
+  - cd esp8266
+  - export ESP8266_ARDUINO_DIR="$PWD"
+  # Download toolchain and esptool
+  - cd tools
+  - python get.py
+  - export PATH="$PATH:$PWD/xtensa-lx106-elf/bin"
+  # Build axTLS
+  - cd $TRAVIS_BUILD_DIR
+  - make
+  # Copy the library into Arduino core
+  - cp bin/libaxtls.a $ESP8266_ARDUINO_DIR/tools/sdk/lib/libaxtls.a
+  # Try building examples in ESP8266WiFi library from the ESP8266 Arduino core
+  - /sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_1.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :1 -ac -screen 0 1280x1024x16
+  - sleep 3
+  - export DISPLAY=:1.0
+  - export PATH="$HOME/arduino_ide:$PATH"
+  - which arduino
+  - cd $ESP8266_ARDUINO_DIR
+  - source tests/common.sh
+  - arduino --board esp8266com:esp8266:generic --save-prefs
+  - arduino --get-pref sketchbook.path
+  - build_sketches $HOME/arduino_ide $ESP8266_ARDUINO_DIR/libraries/ESP8266WiFi/examples/HTTPSRequest
+  # Feel free to add more test cases (for other environments) here
+
+notifications:
+  email:
+    on_success: change
+    on_failure: change

tools/sdk/axtls/LICENSE

@@ -0,0 +1,24 @@
+Copyright (c) 2008, Cameron Rich All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this
+list of conditions and the following disclaimer. Redistributions in binary
+form must reproduce the above copyright notice, this list of conditions and
+the following disclaimer in the documentation and/or other materials
+provided with the distribution. Neither the name of the axTLS Project nor
+the names of its contributors may be used to endorse or promote products
+derived from this software without specific prior written permission. 
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.