From b62d8c7633641721b01eb3e2ef3a06cdea59c688 Mon Sep 17 00:00:00 2001 From: "Earle F. Philhower, III" Date: Sat, 4 Jan 2020 08:18:14 -0800 Subject: [PATCH] Update BearSSL, increase SSL stack (#6980) Only minor updates to headers and no functionality change on the portions that we use in the ESP8266. @Teddyz reported random crashes while running against a local MQTT server and was able to report stack usages of up to 6136 bytes. Increase the SSL stack to a little more than that, once again. --- cores/esp8266/StackThunk.cpp | 4 ++-- tools/sdk/include/bearssl/bearssl_ec.h | 2 +- tools/sdk/include/bearssl/bearssl_git.h | 2 +- tools/sdk/include/bearssl/bearssl_ssl.h | 2 +- tools/sdk/lib/libbearssl.a | Bin 3805038 -> 3805038 bytes tools/sdk/ssl/bearssl | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cores/esp8266/StackThunk.cpp b/cores/esp8266/StackThunk.cpp index 9d7cc24f5..89294d390 100644 --- a/cores/esp8266/StackThunk.cpp +++ b/cores/esp8266/StackThunk.cpp @@ -36,8 +36,8 @@ uint32_t *stack_thunk_top = NULL; uint32_t *stack_thunk_save = NULL; /* Saved A1 while in BearSSL */ uint32_t stack_thunk_refcnt = 0; -/* Largest stack usage seen in the wild at scripts.google.com at 5828 */ -#define _stackSize (5900/4) +/* Largest stack usage seen in the wild at 6120 */ +#define _stackSize (6200/4) #define _stackPaint 0xdeadbeef /* Add a reference, and allocate the stack if necessary */ diff --git a/tools/sdk/include/bearssl/bearssl_ec.h b/tools/sdk/include/bearssl/bearssl_ec.h index f954309eb..acd3a2bf5 100644 --- a/tools/sdk/include/bearssl/bearssl_ec.h +++ b/tools/sdk/include/bearssl/bearssl_ec.h @@ -108,7 +108,7 @@ extern "C" { * * - The multipliers (integers) MUST be lower than the subgroup order. * If this property is not met, then the result is indeterminate, - * but an error value is not ncessearily returned. + * but an error value is not necessarily returned. * * * ## ECDSA diff --git a/tools/sdk/include/bearssl/bearssl_git.h b/tools/sdk/include/bearssl/bearssl_git.h index e494ac683..432d98a41 100644 --- a/tools/sdk/include/bearssl/bearssl_git.h +++ b/tools/sdk/include/bearssl/bearssl_git.h @@ -1,2 +1,2 @@ // Do not edit -- Automatically generated by tools/sdk/ssl/bearssl/Makefile -#define BEARSSL_GIT 89454af +#define BEARSSL_GIT 0645c68 diff --git a/tools/sdk/include/bearssl/bearssl_ssl.h b/tools/sdk/include/bearssl/bearssl_ssl.h index fe3f6be2f..d760dff2d 100644 --- a/tools/sdk/include/bearssl/bearssl_ssl.h +++ b/tools/sdk/include/bearssl/bearssl_ssl.h @@ -2114,7 +2114,7 @@ void br_ssl_engine_sendapp_ack(br_ssl_engine_context *cc, size_t len); /** * \brief Get buffer for received application data. * - * If the engine has received application data from the peer, hen this + * If the engine has received application data from the peer, then this * call returns a pointer to the buffer from where such data shall be * read, and its length is written in `*len`. Otherwise, `*len` is set * to 0 and `NULL` is returned. diff --git a/tools/sdk/lib/libbearssl.a b/tools/sdk/lib/libbearssl.a index 773eeaf8045ef443de47fe3f87ddb35cec093451..9bcd86fe159f3901380a3f2c10a001d5d9ac9fb5 100644 GIT binary patch delta 3676 zcmZXWe^6A{6~~7)+w2O~x?z!LlW?uSd&J2F3)>>0I;*UmUIihw{8e9X1Yv=6(rEXS81HJcm zJ)VV*8eIcxemeGwKqJ@8E-2fQv;UA_S~BSWV~)`wSPDbo+Iu-imMvljXa0{3+70Fc z;nsB7Btfje;1djRiKasC5@qGX_4^D*vKU+O@Mgn2tr%4q>uJOEcW1V)HeNQlVd#*d zX%X^uAzHA41ZQ6~c(Yc(A|!Y(Ww2#2?1uz-e=tm{BDS?FDE;KoC6O#rkt=~$U1Iy1 zV62mkHeBg#cx)YD@f}|wQ*C;_#s#yxbN4J4Y$R-xpz}oT^cul1753puZvEEqC|i7n%AXm2I%ROx={#RKkl{c3He!LKIo`@3G=cpR^>4sC|70 zY;L&GZ<(y->16G|Pzc_!j1>_B9P`OiirRWKVL2wHp&gpUCv)i-NIT?$6(rQZD=Duz*yO7in2dhH*@*G zEo#>hUYN4Bc(|XU`{mxYt|LE1#SZR-!Cc#;)J8=go6vIGb2Q%(z(afcKAtL?NFK03 z^1!mK7YV8UzZFQ}@DwEP7mQVVt+inDTEW=yHzW(DW5fVsH#U%|6@@pY+>~1=UjNIBg?1O><#-_8vx(C7%jP%;Qi`b>}_NN4b z_@MpmEVK1ZdxL`pfl2e|yY|+s5}AUp|HwW;*Nv4Zf&X*+Ii4x(*N^3v#c}hcOb3v~ z<9Na6UUke>5QC4eI?i$pKo@qx7e8>k#fKdkd(O@noj08nrgne}n_28kOMCd3!I{`t zc%0v=Fv=i4F)(tdFcuMO&sp41@{7W*QW47T%p2o{0k2?j+2;o5zY4E&jnmU1bGTj) z3qKY+yTP@Gx`!`^rURXOUA7wThoYukl8a|tzolJ;0NdrDE;DmU4!rP|YZ>^4&86>)ESj97D*mdp zl5237NxTH@OFd2B;OR4La;Ik~i?Lbn|BdG)mlllGI-Y1B_dxr2S;G*;Cy+xbQ9eD! zk*qg#U{l3>53vg4S^dhOQM8 zj}QYqu#z~LdI`->R8=1njGfE5e^*K07mTH!im#mD4`x_~)Q2mR-{CHb{#JH8v1&An z;VAqEg43%`?IS-xcD#ekQ}XKD@W@#8i^AiQyt-F7sA=Djw|j&de^;> z-sQhRCzy%6I_Cc?Nmf*4$~NiVD~^ z&|&SLs=23b{+WenU!lDJ$%W{@$7OduPZj|089BC|JhcCF=={4}&($;%(5s)yRa$tT zBLTqbQ+1R?7hLOO%5D!az^Cq0+HU~x&OOVo8zyB^yF3_v{D_Fa2iyN6GWD%r-xm42 einAblKNEL4BXFlPx}A@5B&c`u+wVkg%l`v|C1b1r delta 3685 zcmZXWe^6A{6~~7)+w2OYW2QatzP;zZ zkU#d1^VxImJ@?#mzV}VP^slUG{H0oIZDBQ57YqeMT6?9%(|@3LR=PWbw7$s-Z-4K7 zT~7$7)FG>Ms@(%+8?yH97ffFZ`u>z~%h?%31%<>d$WTbji38r#y}Wny8y zLNc6w!Q!JmGVEH);xaL;hzvP@w2W&!zp&QQrN}?sHZN)-71=WQw0W*?2*zr;ZgSqy zXE}>#$y*Lj;@qrKLZrJO~zRKh1G z{QXw&_kU$$%Ea~SIn#P~@J-HQM*K{b%~32EOR;E`&FYxLRy5f{b6HQbZI_AZM}e|$ z+jffepgUo!r!I+UXnNtJQ?@b_!@KZ8P0Ch8r;h2cezS7haSFJFfE zw9Qo{SW87VHm2SF^RE#Dj6G`#Yp4m!Q2DsMQ_Z+20j=o=H6FNl+`eG3V65Y22JM&m z%_{-G;<%l{CHYXX2X4M^ul|-`tbWVa&Ogq_1(#1=$dTdWOY=AKtJIku+j?dG?86ib zn0@;L+zc97&FswHwNS93h)agfquEo-1;eGV5SOzXz9|@{A;XQboZp-v2AIZ=I)&Mw zI)*%C8qH9)+VL_krxIk%1UGg#d|XG61$H^Hua7&Dg{IgJ%<4v;W4u~0EIaDKyN(g^ zQve%eyo9?bOp-K|krnXQyxg}W`r~}ED)$+(wCK?rdx&Kfr8NTxs&d z8g7SyY}Ym_q;V=x7rLJ3Ev|$BukD?C`IezXvcm<*js+WEC8P!Zo+pF5G%tCdU@Y6K zEqUu#2*w(qF_|}2&si8Sc1R*Hx~VZm@P^Fk}ynGTm1+-nMs&|IMu;!6WV`wQy%Tca=`m!bHV z1zj{;sI>ajyg6DB^zqeWT0G?ULjJ!Cu9MEO^^mzeZ$yM2i=A2R*+u1x8CuY}+vBPc zent&Xd45NyiUHQkO=V{0yev5Owr2s=FQze(y!e4W!Qwx`>rVgPo9q@0XG~6XuPcP^bwy{-3Eq%ZvKwBREt=j;40Hv3 zRG35Oi=Q@`7_n8Dn!bRB3*e;`xVz!6ac~rwT zT7TPvc5fnm|3WQ&e`PQC$w<|quUCFDCK&7E9`~Y?`{uCKU5myZBL;Y1#c?u?6t+BB zRee}6b}eWBQzidUFt+?eeDN56GgSprA1+RQ*W{uy}|i>c0M^cL9D>>t@mc^Mya8(;U=ANZnMU##Y26S)C?g9NI`G*sbN^(m)Ja9#uZAHJM#Xic1l$f)5ue{*Y4tI(Om1`HX6%-6F=_^u4S$bIDR8 z8vE4q53BL8h-F!g-d4Bs?=JLXpMR^@)|D?3eoO)nchvog?mCj`@t(TbXN4b=vONW% zy-&?y|2q=$<`M(nsZjkYGBaxWk5B_wQ%r+xIguT1rk0BW9wAl7!=lEc<$OH6vy>R% z{eDV^jsgzdb2M*JBj<%m