Adam5Wu
diff --git a/‎README.md
Lines changed: 1 addition & 1 deletion b/‎README.md
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/inner.h
Lines changed: 6 additions & 14 deletions b/‎src/inner.h
Lines changed: 6 additions & 14 deletions
diff --git a/‎src/port/esp8266_stack_proxy.c
Lines changed: 1 addition & 3 deletions b/‎src/port/esp8266_stack_proxy.c
Lines changed: 1 addition & 3 deletions
@@ -5,7 +5,7 @@
 [![License](https://img.shields.io/github/license/Adam5Wu/bearssl-esp8266.svg)](./LICENSE.txt)
 
 BearSSL port for ESP8266.
-Reverted custom stack proxy, works better with AsyncTCP.
+With small patches, works better with AsyncTCP.
 
 * [Upstream Project](https://github.com/earlephilhower/bearssl-esp8266)
 * [Modifications of this fork](MODIFICATIONS.md)
 
@@ -1,20 +1,20 @@
 /*
  * Copyright (c) 2016 Thomas Pornin <pornin@bolet.org>
  *
- * Permission is hereby granted, free of charge, to any person obtaining
+ * Permission is hereby granted, free of charge, to any person obtaining 
  * a copy of this software and associated documentation files (the
  * "Software"), to deal in the Software without restriction, including
  * without limitation the rights to use, copy, modify, merge, publish,
  * distribute, sublicense, and/or sell copies of the Software, and to
  * permit persons to whom the Software is furnished to do so, subject to
  * the following conditions:
  *
- * The above copyright notice and this permission notice shall be
+ * The above copyright notice and this permission notice shall be 
  * included in all copies or substantial portions of the Software.
  *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
  * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
  * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
  * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
@@ -2351,15 +2351,14 @@ br_cpuid(uint32_t mask_eax, uint32_t mask_ebx,
 
 #endif
 
-#if defined(ESP8266) && ESP8266_ALTSTACK
+#ifdef ESP8266
 
   #ifdef __cplusplus
   extern "C" {
   #endif
 
   #define _debugBearSSL (0)
   extern void optimistic_yield(uint32_t);
-  extern void system_soft_wdt_feed();
   extern void br_stack_proxy_enter();
   extern void *br_stack_proxy_alloc(size_t bytes);
   extern void br_stack_proxy_exit();
@@ -2370,7 +2369,7 @@ br_cpuid(uint32_t mask_eax, uint32_t mask_ebx,
   #define STACK_PROXY_EXIT()  { if (_debugBearSSL) { char b[64]; sprintf(b, "EXIT: %s:%s\n", __FILE__, __FUNCTION__ ); _BearSSLSerialPrint(b); } br_stack_proxy_exit();  }
   #define STACK_PROXY_ALLOC(type, name, count) \
 		type *name = (type *)br_stack_proxy_alloc(sizeof(type) * (count));\
-		if (!name) name = (type *)alloca(sizeof(type) * (count));
+		if (!name) name = (type *)alloca(sizeof(type) * (count)); 
   #define dumpstack() if (_debugBearSSL) _BearSSLCheckStack(__FUNCTION__, __FILE__, __LINE__); else {}
 
   #ifdef __cplusplus
@@ -2383,13 +2382,6 @@ br_cpuid(uint32_t mask_eax, uint32_t mask_ebx,
   #define STACK_PROXY_ALLOC(type, name, count) type name[count]
   #define dumpstack()
   #define optimistic_yield(ignored)
-
-  #if defined(ESP8266)
-  extern void system_soft_wdt_feed();
-  #else
-  #define system_soft_wdt_feed()
-  #endif
-
 #endif
 
 
 
@@ -73,13 +73,11 @@ void *br_stack_proxy_alloc(size_t bytes)
 		return (void*)ptr;
 	}
 	// If we're here, the 2nd stack allocation failed.  Record if in debug mode
-#if DEBUG_BEARSSL
-	{
+	if (_debugBearSSL) {
 		char a[32];
 		sprintf(a,"stack2 alloc %d fail\n", bytes);
 		_BearSSLSerialPrint(a);
 	}
-#endif
 	return NULL;
 }
Original file line number	Diff line number	Diff line change
`@@ -73,13 +73,11 @@ void *br_stack_proxy_alloc(size_t bytes)`
`73`	`73`	`return (void*)ptr;`
`74`	`74`	`}`
`75`	`75`	`// If we're here, the 2nd stack allocation failed. Record if in debug mode`
`76`		`-#if DEBUG_BEARSSL`
`77`		`- {`
	`76`	`+ if (_debugBearSSL) {`
`78`	`77`	`char a[32];`
`79`	`78`	`sprintf(a,"stack2 alloc %d fail\n", bytes);`
`80`	`79`	`_BearSSLSerialPrint(a);`
`81`	`80`	`}`
`82`		`-#endif`
`83`	`81`	`return NULL;`
`84`	`82`	`}`
`85`	`83`