Use correct methods

1 files changed, 18 insertions, 14 deletions

diff --git a/libressl.patch b/libressl.patch
index 8eb385e..4602a27 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..5ca91b79b 100644
+index 6a64836fb..40e1f0ad4 100644
 --- a/networking/wget.c
 +++ b/networking/wget.c
 @@ -1,4 +1,3 @@
@@ -120,7 +120,7 @@ index 6a64836fb..5ca91b79b 100644
  #if ENABLE_FEATURE_WGET_TIMEOUT
         unsigned timeout_seconds;
         smallint die_if_timed_out;
-@@ -460,6 +462,75 @@ static FILE *open_socket(len_and_sockaddr *lsa)
+@@ -460,6 +462,79 @@ static FILE *open_socket(len_and_sockaddr *lsa)
         return fp;
  }
  
@@ -183,8 +183,12 @@ index 6a64836fb..5ca91b79b 100644
 +               bb_error_msg_and_die("out of memory");
 +       //rewind(pemfile);
 +       BIO_seek(pemfile, 0);
++       if(BIO_read(pemfile, pemmem, pemsize) == 0)
++               bb_error_msg_and_die("Failed to read ssl bio in memory file");
++       /*
 +       if(fread(pemmem, sizeof(char), pemsize, pemfile) != pemsize)
 +               bb_error_msg_and_die("Failed to read temp ca pem file");
++       */
 +       tls_config_set_ca_mem(cfg, pemmem, pemsize);
 +       //fclose(pemfile);
 +       BIO_free(pemfile);
@@ -196,7 +200,7 @@ index 6a64836fb..5ca91b79b 100644
  /* We balk at any control chars in other side's messages.
   * This prevents nasty surprises (e.g. ESC sequences) in "Location:" URLs
   * and error messages.
-@@ -689,6 +760,7 @@ static void reset_beg_range_to_zero(void)
+@@ -689,6 +764,7 @@ static void reset_beg_range_to_zero(void)
  }
  
  #if ENABLE_FEATURE_WGET_OPENSSL
@@ -204,7 +208,7 @@ index 6a64836fb..5ca91b79b 100644
  static int spawn_https_helper_openssl(const char *host, unsigned port)
  {
         char *allocated = NULL;
-@@ -698,7 +770,7 @@ static int spawn_https_helper_openssl(const char *host, unsigned port)
+@@ -698,7 +774,7 @@ static int spawn_https_helper_openssl(const char *host, unsigned port)
         IF_FEATURE_WGET_HTTPS(volatile int child_failed = 0;)
  
         if (socketpair(AF_UNIX, SOCK_STREAM, 0, sp) != 0)
@@ -213,7 +217,7 @@ index 6a64836fb..5ca91b79b 100644
                 bb_simple_perror_msg_and_die("socketpair");
  
         if (!strchr(host, ':'))
-@@ -709,18 +781,18 @@ static int spawn_https_helper_openssl(const char *host, unsigned port)
+@@ -709,18 +785,18 @@ static int spawn_https_helper_openssl(const char *host, unsigned port)
         fflush_all();
         pid = xvfork();
         if (pid == 0) {
@@ -238,7 +242,7 @@ index 6a64836fb..5ca91b79b 100644
                 xmove_fd(2, 3);
                 xopen("/dev/null", O_RDWR);
                 memset(&argv, 0, sizeof(argv));
-@@ -729,18 +801,18 @@ static int spawn_https_helper_openssl(const char *host, unsigned port)
+@@ -729,18 +805,18 @@ static int spawn_https_helper_openssl(const char *host, unsigned port)
                 argv[2] = (char*)"-quiet";
                 argv[3] = (char*)"-connect";
                 argv[4] = (char*)host;
@@ -263,7 +267,7 @@ index 6a64836fb..5ca91b79b 100644
                         *argp++ = (char*)"-verify";              //[7]
                         *argp++ = (char*)"100";                  //[8]
                         *argp++ = (char*)"-verify_return_error"; //[9]
-@@ -762,10 +834,10 @@ static int spawn_https_helper_openssl(const char *host, unsigned port)
+@@ -762,10 +838,10 @@ static int spawn_https_helper_openssl(const char *host, unsigned port)
  # else
                 bb_perror_msg_and_die("can't execute '%s'", argv[0]);
  # endif
@@ -276,7 +280,7 @@ index 6a64836fb..5ca91b79b 100644
         free(servername);
         free(allocated);
         close(sp[1]);
-@@ -777,6 +849,7 @@ static int spawn_https_helper_openssl(const char *host, unsigned port)
+@@ -777,6 +853,7 @@ static int spawn_https_helper_openssl(const char *host, unsigned port)
  # endif
         return sp[0];
  }
@@ -284,7 +288,7 @@ index 6a64836fb..5ca91b79b 100644
  #endif
  
  #if ENABLE_FEATURE_WGET_HTTPS
-@@ -1151,6 +1224,9 @@ static void download_one_url(const char *url)
+@@ -1151,6 +1228,9 @@ static void download_one_url(const char *url)
         server.user = NULL;
         target.user = NULL;
  
@@ -294,7 +298,7 @@ index 6a64836fb..5ca91b79b 100644
         parse_url(url, &target);
  
         /* Use the proxy if necessary */
-@@ -1234,22 +1310,41 @@ static void download_one_url(const char *url)
+@@ -1234,22 +1314,41 @@ static void download_one_url(const char *url)
                         /* openssl-based helper
                          * Inconvenient API since we can't give it an open fd
                          */
@@ -346,7 +350,7 @@ index 6a64836fb..5ca91b79b 100644
   socket_opened:
  #elif ENABLE_FEATURE_WGET_HTTPS
                 /* Only internal TLS support is configured */
-@@ -1353,7 +1448,41 @@ static void download_one_url(const char *url)
+@@ -1353,7 +1452,41 @@ static void download_one_url(const char *url)
                         shutdown(fileno(sfp), SHUT_WR);
                 }
  #endif
@@ -389,7 +393,7 @@ index 6a64836fb..5ca91b79b 100644
                 /*
                  * Retrieve HTTP response line and check for "200" status code.
                  */
-@@ -1536,6 +1665,10 @@ However, in real world it was observed that some web servers
+@@ -1536,6 +1669,10 @@ However, in real world it was observed that some web servers
                 /* ftpcmd("QUIT", NULL, sfp); - why bother? */
         }
  #endif
@@ -400,7 +404,7 @@ index 6a64836fb..5ca91b79b 100644
         fclose(sfp);
  
         free(server.allocated);
-@@ -1690,9 +1823,18 @@ IF_DESKTOP(      "no-parent\0"        No_argument       "\xf0")
+@@ -1690,9 +1827,18 @@ IF_DESKTOP(      "no-parent\0"        No_argument       "\xf0")
                         xdup2(G.log_fd, STDERR_FILENO);
                 }
         }
@@ -420,7 +424,7 @@ index 6a64836fb..5ca91b79b 100644
  
         if (G.output_fd >= 0)
                 xclose(G.output_fd);
-@@ -1704,6 +1846,6 @@ IF_DESKTOP(       "no-parent\0"        No_argument       "\xf0")
+@@ -1704,6 +1850,6 @@ IF_DESKTOP(       "no-parent\0"        No_argument       "\xf0")
         free(G.extra_headers);
  #endif
         FINI_G();