archive-gh-me/Espruino
1
0
Fork 0
mirror of https://github.com/espruino/Espruino.git synced 2025-12-08 19:06:15 +00:00
Code Issues Projects Releases Wiki Activity

Fix regression where HTTPS without cert/ca or key failed

Browse Source
This commit is contained in:
Gordon Williams 2016-12-20 09:25:29 +00:00 committed by Rhys.Williams
parent a509b2e5b0
commit 8aa637c24e
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -1,5 +1,6 @@
1v91 : Fix recent regression if no Boot Code defined at startup
Fix handling of return of rejected promise within a promise
Fix regression where HTTPS without cert/ca or key failed
1v90 : Fixes for Promise.all (passing in non-promises, pre-resolved, and ordering) (fix #976)
Fix arrow function bug when parsing multiple arguments

4
libs/network/network.c
View File

@ -453,7 +453,7 @@ bool ssl_load_key(SSLSocketData *sd, JsVar *options) {
bool ssl_load_owncert(SSLSocketData *sd, JsVar *options) {
JsVar *certVar = jsvObjectGetChild(options, "cert", 0);
if (!certVar) {
return true; // still ok - just no key
return true; // still ok - just no cert
}
int ret = -1;
jsiConsolePrintf("Loading the Client certificate...\n");
@ -477,7 +477,7 @@ bool ssl_load_owncert(SSLSocketData *sd, JsVar *options) {
bool ssl_load_cacert(SSLSocketData *sd, JsVar *options) {
JsVar *caVar = jsvObjectGetChild(options, "ca", 0);
if (!caVar) {
return true; // still ok - just no key
return true; // still ok - just no ca
}
int ret = -1;
jsiConsolePrintf("Loading the CA root certificate...\n");