Try creating a socket pair

1 files changed, 32 insertions, 27 deletions

diff --git a/libressl.patch b/libressl.patch
index 24963ac..ee924e6 100644
--- a/libressl.patch
+++ b/libressl.patch
@@ -135,7 +135,7 @@ index 9f1dd67ec..7e8da6df2 100644
  static void tls_xwrite(tls_state_t *tls, int len)
  {
 diff --git a/networking/wget.c b/networking/wget.c
-index 6a64836fb..96ebc298b 100644
+index 6a64836fb..3f1213af1 100644
 --- a/networking/wget.c
 +++ b/networking/wget.c
 @@ -169,7 +169,8 @@
@@ -155,9 +155,10 @@ index 6a64836fb..96ebc298b 100644
 +       printf("wget fgets_trim_sanitize 1\n");
         set_alarm();
 -       if (fgets(G.wget_buf, sizeof(G.wget_buf), fp) == NULL)
+-               bb_simple_perror_msg_and_die("error getting response");
 +       printf("wget fgets_trim_sanitize 2\n");
 +       if (fgets(G.wget_buf, sizeof(G.wget_buf), fp) == NULL){
-                bb_simple_perror_msg_and_die("error getting response");
++               bb_simple_perror_msg_and_die("error getting response: %s",strerror(errno));
 +       }
         clear_alarm();
  
@@ -193,16 +194,21 @@ index 6a64836fb..96ebc298b 100644
  static int spawn_https_helper_openssl(const char *host, unsigned port)
  {
         char *allocated = NULL;
-@@ -777,6 +788,33 @@ static int spawn_https_helper_openssl(const char *host, unsigned port)
+@@ -777,6 +788,37 @@ static int spawn_https_helper_openssl(const char *host, unsigned port)
  # endif
         return sp[0];
  }
 +# else
 +#include <tls.h>
++#include <winsock2.h>
 +static int spawn_https_helper_openssl(const char *host, unsigned port)
 +{
 +               char* allocated = NULL;
 +               char *servername, *cmd;
++               int sp[2];
++               if (socketpair(AF_UNIX, SOCK_STREAM, 0, sp) != 0)
++                       bb_simple_perror_msg_and_die("socketpair");
++
 +               if(!strchr(host,":"))
 +                               host = allocated = xasprintf("%s:%u",host,port);
 +               servername = xstrdup(host);
@@ -216,18 +222,17 @@ index 6a64836fb..96ebc298b 100644
 +                               bb_error_msg_and_die("Out of memory 2");
 +               if(tls_configure(ctx,config) != 0)
 +                               bb_error_msg_and_die("Failed to configure client");
-+               int ret = tls_connect(ctx,servername,NULL);
++               tls_connect_fds(ctx, sp[0], sp[1], servername);
 +               tls_config_free(config);
-+               tls_free(ctx);
 +               free(allocated);
 +               free(servername);
-+               return ret;
++               return sp[0];
 +}
 +# endif
  #endif
  
  #if ENABLE_FEATURE_WGET_HTTPS
-@@ -1151,6 +1189,7 @@ static void download_one_url(const char *url)
+@@ -1151,6 +1193,7 @@ static void download_one_url(const char *url)
         server.user = NULL;
         target.user = NULL;
  
@@ -235,7 +240,7 @@ index 6a64836fb..96ebc298b 100644
         parse_url(url, &target);
  
         /* Use the proxy if necessary */
-@@ -1172,6 +1211,7 @@ static void download_one_url(const char *url)
+@@ -1172,6 +1215,7 @@ static void download_one_url(const char *url)
                         server.host = target.host;
                 }
         }
@@ -243,7 +248,7 @@ index 6a64836fb..96ebc298b 100644
  
         if (ENABLE_FEATURE_IPV6)
                 strip_ipv6_scope_id(target.host);
-@@ -1191,6 +1231,7 @@ static void download_one_url(const char *url)
+@@ -1191,6 +1235,7 @@ static void download_one_url(const char *url)
                         G.fname_out = fname_out_alloc = xstrdup(G.fname_out);
                 }
         }
@@ -251,7 +256,7 @@ index 6a64836fb..96ebc298b 100644
  #if ENABLE_FEATURE_WGET_STATUSBAR
         G.curfile = bb_get_last_path_component_nostrip(G.fname_out);
  #endif
-@@ -1206,15 +1247,19 @@ static void download_one_url(const char *url)
+@@ -1206,15 +1251,19 @@ static void download_one_url(const char *url)
                  * We are not sure it exists on remote side */
         }
  
@@ -271,7 +276,7 @@ index 6a64836fb..96ebc298b 100644
         /*G.content_len = 0; - redundant, got_clen = 0 is enough */
         G.got_clen = 0;
         G.chunked = 0;
-@@ -1229,37 +1274,49 @@ static void download_one_url(const char *url)
+@@ -1229,37 +1278,49 @@ static void download_one_url(const char *url)
  
                 /* Open socket to http(s) server */
  #if ENABLE_FEATURE_WGET_OPENSSL
@@ -323,7 +328,7 @@ index 6a64836fb..96ebc298b 100644
                 /* Send HTTP request */
                 if (use_proxy) {
                         SENDFMT(sfp, "GET %s://%s/%s HTTP/1.1\r\n",
-@@ -1270,6 +1327,7 @@ static void download_one_url(const char *url)
+@@ -1270,6 +1331,7 @@ static void download_one_url(const char *url)
                                 (option_mask32 & WGET_OPT_POST) ? "POST" : "GET",
                                 target.path);
                 }
@@ -331,7 +336,7 @@ index 6a64836fb..96ebc298b 100644
                 if (!USR_HEADER_HOST)
                         SENDFMT(sfp, "Host: %s\r\n", target.host);
                 if (!USR_HEADER_USER_AGENT)
-@@ -1280,6 +1338,7 @@ static void download_one_url(const char *url)
+@@ -1280,6 +1342,7 @@ static void download_one_url(const char *url)
                  */
                 SENDFMT(sfp, "Connection: close\r\n");
  
@@ -339,7 +344,7 @@ index 6a64836fb..96ebc298b 100644
  #if ENABLE_FEATURE_WGET_AUTHENTICATION
                 if (target.user && !USR_HEADER_AUTH) {
                         SENDFMT(sfp, "Proxy-Authorization: Basic %s\r\n"+6,
-@@ -1291,6 +1350,7 @@ static void download_one_url(const char *url)
+@@ -1291,6 +1354,7 @@ static void download_one_url(const char *url)
                 }
  #endif
  
@@ -347,7 +352,7 @@ index 6a64836fb..96ebc298b 100644
                 if (G.beg_range != 0 && !USR_HEADER_RANGE)
                         SENDFMT(sfp, "Range: bytes=%"OFF_FMT"u-\r\n", G.beg_range);
  
-@@ -1300,6 +1360,7 @@ static void download_one_url(const char *url)
+@@ -1300,6 +1364,7 @@ static void download_one_url(const char *url)
                         fputs(G.extra_headers, sfp);
                 }
  
@@ -355,7 +360,7 @@ index 6a64836fb..96ebc298b 100644
                 if (option_mask32 & WGET_OPT_POST_FILE) {
                         int fd = xopen_stdin(G.post_file);
                         G.post_data = xmalloc_read(fd, NULL);
-@@ -1314,15 +1375,18 @@ static void download_one_url(const char *url)
+@@ -1314,15 +1379,18 @@ static void download_one_url(const char *url)
                                 );
                         }
  # if ENABLE_PLATFORM_MINGW32
@@ -374,7 +379,7 @@ index 6a64836fb..96ebc298b 100644
                 } else
  # else
                         SENDFMT(sfp,
-@@ -1338,6 +1402,7 @@ static void download_one_url(const char *url)
+@@ -1338,6 +1406,7 @@ static void download_one_url(const char *url)
                         SENDFMT(sfp, "\r\n");
                 }
  
@@ -382,7 +387,7 @@ index 6a64836fb..96ebc298b 100644
                 fflush(sfp);
  
  /* Tried doing this unconditionally.
-@@ -1358,14 +1423,21 @@ static void download_one_url(const char *url)
+@@ -1358,14 +1427,21 @@ static void download_one_url(const char *url)
                  * Retrieve HTTP response line and check for "200" status code.
                  */
   read_response:
@@ -404,7 +409,7 @@ index 6a64836fb..96ebc298b 100644
                 switch (status) {
                 case 0:
                 case 100:
-@@ -1441,6 +1513,7 @@ However, in real world it was observed that some web servers
+@@ -1441,6 +1517,7 @@ However, in real world it was observed that some web servers
                 /*
                  * Retrieve HTTP headers.
                  */
@@ -412,7 +417,7 @@ index 6a64836fb..96ebc298b 100644
                 while ((str = get_sanitized_hdr(sfp)) != NULL) {
                         static const char keywords[] ALIGN1 =
                                 "content-length\0""transfer-encoding\0""location\0";
-@@ -1497,6 +1570,7 @@ However, in real world it was observed that some web servers
+@@ -1497,6 +1574,7 @@ However, in real world it was observed that some web servers
                                 goto establish_session;
                         }
                 }
@@ -420,7 +425,7 @@ index 6a64836fb..96ebc298b 100644
  //             if (status >= 300)
  //                     bb_error_msg_and_die("bad redirection (no Location: header from server)");
  
-@@ -1514,6 +1588,7 @@ However, in real world it was observed that some web servers
+@@ -1514,6 +1592,7 @@ However, in real world it was observed that some web servers
  
         free(lsa);
  
@@ -428,7 +433,7 @@ index 6a64836fb..96ebc298b 100644
         if (!(option_mask32 & WGET_OPT_SPIDER)) {
                 if (G.output_fd < 0)
                         G.output_fd = xopen(G.fname_out, G.o_flags);
-@@ -1536,6 +1611,7 @@ However, in real world it was observed that some web servers
+@@ -1536,6 +1615,7 @@ However, in real world it was observed that some web servers
                 /* ftpcmd("QUIT", NULL, sfp); - why bother? */
         }
  #endif
@@ -436,7 +441,7 @@ index 6a64836fb..96ebc298b 100644
         fclose(sfp);
  
         free(server.allocated);
-@@ -1544,11 +1620,13 @@ However, in real world it was observed that some web servers
+@@ -1544,11 +1624,13 @@ However, in real world it was observed that some web servers
         free(target.user);
         free(fname_out_alloc);
         free(redirected_path);
@@ -450,7 +455,7 @@ index 6a64836fb..96ebc298b 100644
  #if ENABLE_FEATURE_WGET_LONG_OPTIONS
         static const char wget_longopts[] ALIGN1 =
                 /* name, has_arg, val */
-@@ -1590,6 +1668,7 @@ IF_DESKTOP(       "no-parent\0"        No_argument       "\xf0")
+@@ -1590,6 +1672,7 @@ IF_DESKTOP(       "no-parent\0"        No_argument       "\xf0")
  #endif
  
         INIT_G();
@@ -458,7 +463,7 @@ index 6a64836fb..96ebc298b 100644
  
  #if ENABLE_FEATURE_WGET_TIMEOUT
         G.timeout_seconds = 900;
-@@ -1626,6 +1705,8 @@ IF_DESKTOP(       "no-parent\0"        No_argument       "\xf0")
+@@ -1626,6 +1709,8 @@ IF_DESKTOP(       "no-parent\0"        No_argument       "\xf0")
                 IF_FEATURE_WGET_LONG_OPTIONS(, &G.post_data)
                 IF_FEATURE_WGET_LONG_OPTIONS(, &G.post_file)
         );
@@ -467,7 +472,7 @@ index 6a64836fb..96ebc298b 100644
  #if 0 /* option bits debug */
         if (option_mask32 & WGET_OPT_RETRIES) bb_error_msg("-t NUM");
         if (option_mask32 & WGET_OPT_nsomething) bb_error_msg("-nsomething");
-@@ -1670,6 +1751,7 @@ IF_DESKTOP(       "no-parent\0"        No_argument       "\xf0")
+@@ -1670,6 +1755,7 @@ IF_DESKTOP(       "no-parent\0"        No_argument       "\xf0")
         }
  #endif
  
@@ -475,7 +480,7 @@ index 6a64836fb..96ebc298b 100644
         G.output_fd = -1;
         G.o_flags = O_WRONLY | O_CREAT | O_TRUNC | O_EXCL;
         if (G.fname_out) { /* -O FILE ? */
-@@ -1691,8 +1773,11 @@ IF_DESKTOP(      "no-parent\0"        No_argument       "\xf0")
+@@ -1691,8 +1777,11 @@ IF_DESKTOP(      "no-parent\0"        No_argument       "\xf0")
                 }
         }