work

1 files changed, 88 insertions, 43 deletions

diff --git a/libressl.patch b/libressl.patch
index 6af3b51..0c7f495 100644
--- a/libressl.patch
+++ b/libressl.patch
@@ -135,20 +135,48 @@ 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..3bd573e0a 100644
+index 6a64836fb..8805aae0b 100644
 --- a/networking/wget.c
 +++ b/networking/wget.c
-@@ -169,7 +169,8 @@
+@@ -169,7 +169,11 @@
  //usage:     "\n       -Y on/off       Use proxy"
  
  #include "libbb.h"
 -
 +#include <string.h>
 +#include <errno.h>
++#include <tls.h>
++#include <stdarg.h>
++#include <stdio.h>
  #if 0
  # define log_io(...) bb_error_msg(__VA_ARGS__)
  # define SENDFMT(fp, fmt, ...) \
-@@ -488,26 +489,35 @@ static char fgets_trim_sanitize(FILE *fp, const char *fmt)
+@@ -179,6 +183,24 @@
+        } while (0);
+ #else
+ # define log_io(...) ((void)0)
++/*
++void SENDFMT(struct tls *ctx, const char *fmt, ...) {
++       va_list args, args2;
++       va_start(args, fmt);
++       size_t strlen = vsnprintf(NULL, 0, fmt, args);
++       va_end(args);
++       char *buf = (char*)malloc(strlen);
++       va_start(args2, fmt);
++       vsnprintf(buf, strlen, fmt, args2);
++       va_end(args2);
++       ssize_t writelen = tls_write(ctx, buf, strlen);
++       if(writelen == -1)
++               bb_error_msg_and_die("tls_write error: %s", tls_error(ctx));
++       if(writelen != strlen)
++               bb_error_msg_and_die("tls_write incomplete");
++       free(buf);
++}
++*/
+ # define SENDFMT(fp, fmt, ...) fprintf(fp, fmt, ##__VA_ARGS__)
+ #endif
+ 
+@@ -488,26 +510,35 @@ static char fgets_trim_sanitize(FILE *fp, const char *fmt)
         char c;
         char *buf_ptr;
  
@@ -186,7 +214,7 @@ index 6a64836fb..3bd573e0a 100644
  
         return c;
  }
-@@ -689,6 +699,7 @@ static void reset_beg_range_to_zero(void)
+@@ -689,6 +720,7 @@ static void reset_beg_range_to_zero(void)
  }
  
  #if ENABLE_FEATURE_WGET_OPENSSL
@@ -194,7 +222,7 @@ index 6a64836fb..3bd573e0a 100644
  static int spawn_https_helper_openssl(const char *host, unsigned port)
  {
         char *allocated = NULL;
-@@ -777,6 +788,38 @@ static int spawn_https_helper_openssl(const char *host, unsigned port)
+@@ -777,6 +809,38 @@ static int spawn_https_helper_openssl(const char *host, unsigned port)
  # endif
         return sp[0];
  }
@@ -233,7 +261,7 @@ index 6a64836fb..3bd573e0a 100644
  #endif
  
  #if ENABLE_FEATURE_WGET_HTTPS
-@@ -1151,6 +1194,7 @@ static void download_one_url(const char *url)
+@@ -1151,6 +1215,7 @@ static void download_one_url(const char *url)
         server.user = NULL;
         target.user = NULL;
  
@@ -241,7 +269,7 @@ index 6a64836fb..3bd573e0a 100644
         parse_url(url, &target);
  
         /* Use the proxy if necessary */
-@@ -1172,6 +1216,7 @@ static void download_one_url(const char *url)
+@@ -1172,6 +1237,7 @@ static void download_one_url(const char *url)
                         server.host = target.host;
                 }
         }
@@ -249,7 +277,7 @@ index 6a64836fb..3bd573e0a 100644
  
         if (ENABLE_FEATURE_IPV6)
                 strip_ipv6_scope_id(target.host);
-@@ -1191,6 +1236,7 @@ static void download_one_url(const char *url)
+@@ -1191,6 +1257,7 @@ static void download_one_url(const char *url)
                         G.fname_out = fname_out_alloc = xstrdup(G.fname_out);
                 }
         }
@@ -257,7 +285,7 @@ index 6a64836fb..3bd573e0a 100644
  #if ENABLE_FEATURE_WGET_STATUSBAR
         G.curfile = bb_get_last_path_component_nostrip(G.fname_out);
  #endif
-@@ -1206,15 +1252,19 @@ static void download_one_url(const char *url)
+@@ -1206,15 +1273,19 @@ static void download_one_url(const char *url)
                  * We are not sure it exists on remote side */
         }
  
@@ -277,42 +305,58 @@ index 6a64836fb..3bd573e0a 100644
         /*G.content_len = 0; - redundant, got_clen = 0 is enough */
         G.got_clen = 0;
         G.chunked = 0;
-@@ -1229,37 +1279,49 @@ static void download_one_url(const char *url)
+@@ -1229,37 +1300,54 @@ static void download_one_url(const char *url)
  
                 /* Open socket to http(s) server */
  #if ENABLE_FEATURE_WGET_OPENSSL
 +               printf("wget download_one_url 8\n");
                 /* openssl (and maybe internal TLS) support is configured */
++               struct tls *ctx;
                 if (server.protocol == P_HTTPS) {
                         /* openssl-based helper
                          * Inconvenient API since we can't give it an open fd
                          */
+-                       int fd = spawn_https_helper_openssl(server.host, server.port);
+-# if ENABLE_FEATURE_WGET_HTTPS
+-                       if (fd < 0) { /* no openssl? try internal */
+-                               sfp = open_socket(lsa);
+-                               spawn_ssl_client(server.host, fileno(sfp), /*flags*/ 0);
+-                               goto socket_opened;
 +                       printf("wget download_one_url 9\n");
-                        int fd = spawn_https_helper_openssl(server.host, server.port);
++                       //int fd = spawn_https_helper_openssl(server.host, server.port);
++                       ctx = tls_client();
++                       if(ctx == NULL)
++                                       bb_error_msg_and_die("Out of memory 1");
++                       struct tls_config *config;
++                       config = tls_config_new();
++                       if(config == NULL)
++                                       bb_error_msg_and_die("Out of memory 2");
++                       if(tls_configure(ctx,config) != 0)
++                                       bb_error_msg_and_die("Failed to configure client");
++                       sfp = tmpfile();
++                       dfp = tmpfile();
++                       tls_connect_fds(ctx, dfp, sfp, servername);
++                       tls_config_free(config);
++                       free(allocated);
++                       free(servername);
 +                       printf("wget download_one_url 10\n");
- # if ENABLE_FEATURE_WGET_HTTPS
-                        if (fd < 0) { /* no openssl? try internal */
-+                               printf("wget download_one_url 11\n");
-                                sfp = open_socket(lsa);
-                                spawn_ssl_client(server.host, fileno(sfp), /*flags*/ 0);
-                                goto socket_opened;
-+                               printf("wget download_one_url 12\n");
-                        }
- # else
-                        /* We don't check for exec("openssl") failure in this case */
- # endif
 +                       printf("wget download_one_url 13\n");
-                        sfp = fdopen(fd, "r+");
--                       if (!sfp)
--                               bb_die_memory_exhausted();
++                       //sfp = fdopen(fd, "r+");
 +                       if (!sfp){
 +                               bb_error_msg_and_die("Error opening fd: %s",strerror(errno));
-+                       }
+                        }
+-# else
+-                       /* We don't check for exec("openssl") failure in this case */
+-# endif
+-                       sfp = fdopen(fd, "r+");
+-                       if (!sfp)
+-                               bb_die_memory_exhausted();
 +                       printf("wget download_one_url 14\n");
                         goto socket_opened;
                 }
+-               sfp = open_socket(lsa);
 +               printf("wget download_one_url 15\n");
-                sfp = open_socket(lsa);
++               //sfp = open_socket(lsa);
   socket_opened:
  #elif ENABLE_FEATURE_WGET_HTTPS
                 /* Only internal TLS support is configured */
@@ -329,7 +373,7 @@ index 6a64836fb..3bd573e0a 100644
                 /* Send HTTP request */
                 if (use_proxy) {
                         SENDFMT(sfp, "GET %s://%s/%s HTTP/1.1\r\n",
-@@ -1270,6 +1332,7 @@ static void download_one_url(const char *url)
+@@ -1270,6 +1358,7 @@ static void download_one_url(const char *url)
                                 (option_mask32 & WGET_OPT_POST) ? "POST" : "GET",
                                 target.path);
                 }
@@ -337,7 +381,7 @@ index 6a64836fb..3bd573e0a 100644
                 if (!USR_HEADER_HOST)
                         SENDFMT(sfp, "Host: %s\r\n", target.host);
                 if (!USR_HEADER_USER_AGENT)
-@@ -1280,6 +1343,7 @@ static void download_one_url(const char *url)
+@@ -1280,6 +1369,7 @@ static void download_one_url(const char *url)
                  */
                 SENDFMT(sfp, "Connection: close\r\n");
  
@@ -345,7 +389,7 @@ index 6a64836fb..3bd573e0a 100644
  #if ENABLE_FEATURE_WGET_AUTHENTICATION
                 if (target.user && !USR_HEADER_AUTH) {
                         SENDFMT(sfp, "Proxy-Authorization: Basic %s\r\n"+6,
-@@ -1291,6 +1355,7 @@ static void download_one_url(const char *url)
+@@ -1291,6 +1381,7 @@ static void download_one_url(const char *url)
                 }
  #endif
  
@@ -353,7 +397,7 @@ index 6a64836fb..3bd573e0a 100644
                 if (G.beg_range != 0 && !USR_HEADER_RANGE)
                         SENDFMT(sfp, "Range: bytes=%"OFF_FMT"u-\r\n", G.beg_range);
  
-@@ -1300,6 +1365,7 @@ static void download_one_url(const char *url)
+@@ -1300,6 +1391,7 @@ static void download_one_url(const char *url)
                         fputs(G.extra_headers, sfp);
                 }
  
@@ -361,7 +405,7 @@ index 6a64836fb..3bd573e0a 100644
                 if (option_mask32 & WGET_OPT_POST_FILE) {
                         int fd = xopen_stdin(G.post_file);
                         G.post_data = xmalloc_read(fd, NULL);
-@@ -1314,15 +1380,18 @@ static void download_one_url(const char *url)
+@@ -1314,15 +1406,18 @@ static void download_one_url(const char *url)
                                 );
                         }
  # if ENABLE_PLATFORM_MINGW32
@@ -380,7 +424,7 @@ index 6a64836fb..3bd573e0a 100644
                 } else
  # else
                         SENDFMT(sfp,
-@@ -1338,6 +1407,7 @@ static void download_one_url(const char *url)
+@@ -1338,6 +1433,7 @@ static void download_one_url(const char *url)
                         SENDFMT(sfp, "\r\n");
                 }
  
@@ -388,10 +432,11 @@ index 6a64836fb..3bd573e0a 100644
                 fflush(sfp);
  
  /* Tried doing this unconditionally.
-@@ -1358,14 +1428,21 @@ static void download_one_url(const char *url)
+@@ -1358,14 +1454,22 @@ static void download_one_url(const char *url)
                  * Retrieve HTTP response line and check for "200" status code.
                  */
   read_response:
++               sfp = dfp;
 +               printf("wget download_one_url 27\n");
                 fgets_trim_sanitize(sfp, "  %s\n");
 +               printf("wget download_one_url 27-1\n");
@@ -410,7 +455,7 @@ index 6a64836fb..3bd573e0a 100644
                 switch (status) {
                 case 0:
                 case 100:
-@@ -1441,6 +1518,7 @@ However, in real world it was observed that some web servers
+@@ -1441,6 +1545,7 @@ However, in real world it was observed that some web servers
                 /*
                  * Retrieve HTTP headers.
                  */
@@ -418,7 +463,7 @@ index 6a64836fb..3bd573e0a 100644
                 while ((str = get_sanitized_hdr(sfp)) != NULL) {
                         static const char keywords[] ALIGN1 =
                                 "content-length\0""transfer-encoding\0""location\0";
-@@ -1497,6 +1575,7 @@ However, in real world it was observed that some web servers
+@@ -1497,6 +1602,7 @@ However, in real world it was observed that some web servers
                                 goto establish_session;
                         }
                 }
@@ -426,7 +471,7 @@ index 6a64836fb..3bd573e0a 100644
  //             if (status >= 300)
  //                     bb_error_msg_and_die("bad redirection (no Location: header from server)");
  
-@@ -1514,6 +1593,7 @@ However, in real world it was observed that some web servers
+@@ -1514,6 +1620,7 @@ However, in real world it was observed that some web servers
  
         free(lsa);
  
@@ -434,7 +479,7 @@ index 6a64836fb..3bd573e0a 100644
         if (!(option_mask32 & WGET_OPT_SPIDER)) {
                 if (G.output_fd < 0)
                         G.output_fd = xopen(G.fname_out, G.o_flags);
-@@ -1536,6 +1616,7 @@ However, in real world it was observed that some web servers
+@@ -1536,6 +1643,7 @@ However, in real world it was observed that some web servers
                 /* ftpcmd("QUIT", NULL, sfp); - why bother? */
         }
  #endif
@@ -442,7 +487,7 @@ index 6a64836fb..3bd573e0a 100644
         fclose(sfp);
  
         free(server.allocated);
-@@ -1544,11 +1625,13 @@ However, in real world it was observed that some web servers
+@@ -1544,11 +1652,13 @@ However, in real world it was observed that some web servers
         free(target.user);
         free(fname_out_alloc);
         free(redirected_path);
@@ -456,7 +501,7 @@ index 6a64836fb..3bd573e0a 100644
  #if ENABLE_FEATURE_WGET_LONG_OPTIONS
         static const char wget_longopts[] ALIGN1 =
                 /* name, has_arg, val */
-@@ -1590,6 +1673,7 @@ IF_DESKTOP(       "no-parent\0"        No_argument       "\xf0")
+@@ -1590,6 +1700,7 @@ IF_DESKTOP(       "no-parent\0"        No_argument       "\xf0")
  #endif
  
         INIT_G();
@@ -464,7 +509,7 @@ index 6a64836fb..3bd573e0a 100644
  
  #if ENABLE_FEATURE_WGET_TIMEOUT
         G.timeout_seconds = 900;
-@@ -1626,6 +1710,8 @@ IF_DESKTOP(       "no-parent\0"        No_argument       "\xf0")
+@@ -1626,6 +1737,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)
         );
@@ -473,7 +518,7 @@ index 6a64836fb..3bd573e0a 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 +1756,7 @@ IF_DESKTOP(       "no-parent\0"        No_argument       "\xf0")
+@@ -1670,6 +1783,7 @@ IF_DESKTOP(       "no-parent\0"        No_argument       "\xf0")
         }
  #endif
  
@@ -481,7 +526,7 @@ index 6a64836fb..3bd573e0a 100644
         G.output_fd = -1;
         G.o_flags = O_WRONLY | O_CREAT | O_TRUNC | O_EXCL;
         if (G.fname_out) { /* -O FILE ? */
-@@ -1691,8 +1778,11 @@ IF_DESKTOP(      "no-parent\0"        No_argument       "\xf0")
+@@ -1691,8 +1805,11 @@ IF_DESKTOP(      "no-parent\0"        No_argument       "\xf0")
                 }
         }