bugfixes

1 files changed, 16 insertions, 12 deletions

diff --git a/libressl.patch b/libressl.patch
index 19a6b74..d86d449 100644
--- a/libressl.patch
+++ b/libressl.patch
@@ -102,7 +102,7 @@ index 9f1dd67ec..60e1afe99 100644
  static void tls_xwrite(tls_state_t *tls, int len)
  {
 diff --git a/networking/wget.c b/networking/wget.c
-index 6a64836fb..b714d68b5 100644
+index 6a64836fb..7c68435c0 100644
 --- a/networking/wget.c
 +++ b/networking/wget.c
 @@ -1,4 +1,3 @@
@@ -268,12 +268,17 @@ index 6a64836fb..b714d68b5 100644
  #endif
  
  #if ENABLE_FEATURE_WGET_HTTPS
-@@ -1230,26 +1287,45 @@ static void download_one_url(const char *url)
-                /* Open socket to http(s) server */
- #if ENABLE_FEATURE_WGET_OPENSSL
-                /* openssl (and maybe internal TLS) support is configured */
-+               struct tls *ctx;
-                if (server.protocol == P_HTTPS) {
+@@ -1151,6 +1208,9 @@ static void download_one_url(const char *url)
+        server.user = NULL;
+        target.user = NULL;
+ 
++       struct tls *ctx;
++       ctx = NULL;
++
+        parse_url(url, &target);
+ 
+        /* Use the proxy if necessary */
+@@ -1234,22 +1294,39 @@ static void download_one_url(const char *url)
                         /* openssl-based helper
                          * Inconvenient API since we can't give it an open fd
                          */
@@ -286,7 +291,6 @@ index 6a64836fb..b714d68b5 100644
 -                               goto socket_opened;
 -                       }
 +                       char *allocated, *servername, *host, *pemmem;
-+                       struct tls_config *config;
 +                       if(!strchr(server.host, ':'))
 +                               host = allocated = xasprintf("%s:%u", server.host, server.port);
 +                       servername = xstrdup(host);
@@ -324,7 +328,7 @@ index 6a64836fb..b714d68b5 100644
   socket_opened:
  #elif ENABLE_FEATURE_WGET_HTTPS
                 /* Only internal TLS support is configured */
-@@ -1353,7 +1429,39 @@ static void download_one_url(const char *url)
+@@ -1353,7 +1430,39 @@ static void download_one_url(const char *url)
                         shutdown(fileno(sfp), SHUT_WR);
                 }
  #endif
@@ -365,7 +369,7 @@ index 6a64836fb..b714d68b5 100644
                 /*
                  * Retrieve HTTP response line and check for "200" status code.
                  */
-@@ -1536,6 +1644,8 @@ However, in real world it was observed that some web servers
+@@ -1536,6 +1645,8 @@ However, in real world it was observed that some web servers
                 /* ftpcmd("QUIT", NULL, sfp); - why bother? */
         }
  #endif
@@ -374,12 +378,12 @@ index 6a64836fb..b714d68b5 100644
         fclose(sfp);
  
         free(server.allocated);
-@@ -1691,9 +1801,17 @@ IF_DESKTOP(      "no-parent\0"        No_argument       "\xf0")
+@@ -1691,9 +1802,17 @@ IF_DESKTOP(      "no-parent\0"        No_argument       "\xf0")
                 }
         }
  
 +       G.tlscfg = tls_config_new();
-+       if(config == NULL)
++       if(G.tlscfg == NULL)
 +               bb_error_msg_and_die("Out of memory 2");
 +       char *pemmem = gather_certificates(G.tlscfg);
 +