Fix regression where HTTPS without cert/ca or key failed

espruino · Dec 20, 2016 · fc38156 · fc38156
1 parent f39dd3b
commit fc38156
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -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

diff --git a/libs/network/network.c b/libs/network/network.c
@@ -422,7 +422,7 @@ JsVar *decode_certificate_var(JsVar *var) {
 bool ssl_load_key(SSLSocketData *sd, JsVar *options) {
   JsVar *keyVar = jsvObjectGetChild(options, "key", 0);
   if (!keyVar) {
-    return false;
+    return true; // still ok - just no key
   }
   int ret = -1;
   jsiConsolePrintf("Loading the Client Key...\n");
@@ -447,7 +447,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 false;
+    return true; // still ok - just no cert
   }
   int ret = -1;
   jsiConsolePrintf("Loading the Client certificate...\n");
@@ -471,7 +471,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 false;
+    return true; // still ok - just no ca
   }
   int ret = -1;
   jsiConsolePrintf("Loading the CA root certificate...\n");