More debugging messages

1 files changed, 28 insertions, 12 deletions

diff --git a/libressl.patch b/libressl.patch
index 28d46a3..0406099 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..490daf001 100644
+index 6a64836fb..e09c4bc7d 100644
 --- a/networking/wget.c
 +++ b/networking/wget.c
 @@ -1,4 +1,3 @@
@@ -110,7 +110,7 @@ index 6a64836fb..490daf001 100644
  /*
   * wget - retrieve a file using HTTP or FTP
   *
-@@ -460,6 +459,49 @@ static FILE *open_socket(len_and_sockaddr *lsa)
+@@ -460,6 +459,59 @@ static FILE *open_socket(len_and_sockaddr *lsa)
         return fp;
  }
  
@@ -119,12 +119,19 @@ index 6a64836fb..490daf001 100644
 +#include <openssl/ssl.h>
 +#include <openssl/x509.h>
 +#include <wincrypt.h>
++#include <tls.h>
++#include <winsock2.h>
++#include <windows.h>
 +char* gather_certificates(struct tls_config *cfg)
 +{
 +       FILE *pemfile;
 +       pemfile = tmpfile();
++       if(pemfile == NULL)
++               bb_error_msg_and_die("Failed to open pem tempfile: %s", strerror(errno));
 +       HCERTSTORE dstore;
 +       dstore = CertOpenSystemStore(0,"ROOT");
++       if(dstore == NULL)
++               bb_error_msg_and_die("Failed to open system store: %s", GetLastError());
 +       size_t numcerts;
 +       if(!dstore)
 +               bb_error_msg_and_die("Error opening 'CA' cert store");
@@ -140,6 +147,8 @@ index 6a64836fb..490daf001 100644
 +               X509 *x509cert;
 +               x509cert = d2i_X509(NULL,&dcert,dcert_len);
 +               if(x509cert == NULL)
++                       bb_error_msg_and_die("Failed to convert dcert to x509");
++               if(x509cert == NULL)
 +                       bb_error_msg_and_die("Failed to convert cert");
 +               if(!PEM_write_X509(pemfile, x509cert))
 +                       bb_error_msg_and_die("Failed to write cert");
@@ -154,23 +163,22 @@ index 6a64836fb..490daf001 100644
 +       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);
 +}
 +#endif
 +
  /* 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 +731,9 @@ static void reset_beg_range_to_zero(void)
+@@ -689,6 +741,7 @@ static void reset_beg_range_to_zero(void)
  }
  
  #if ENABLE_FEATURE_WGET_OPENSSL
-+#include <tls.h>
-+#include <winsock2.h>
 +/*
  static int spawn_https_helper_openssl(const char *host, unsigned port)
  {
         char *allocated = NULL;
-@@ -698,7 +743,7 @@ static int spawn_https_helper_openssl(const char *host, unsigned port)
+@@ -698,7 +751,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)
@@ -179,7 +187,7 @@ index 6a64836fb..490daf001 100644
                 bb_simple_perror_msg_and_die("socketpair");
  
         if (!strchr(host, ':'))
-@@ -709,18 +754,18 @@ static int spawn_https_helper_openssl(const char *host, unsigned port)
+@@ -709,18 +762,18 @@ static int spawn_https_helper_openssl(const char *host, unsigned port)
         fflush_all();
         pid = xvfork();
         if (pid == 0) {
@@ -204,7 +212,7 @@ index 6a64836fb..490daf001 100644
                 xmove_fd(2, 3);
                 xopen("/dev/null", O_RDWR);
                 memset(&argv, 0, sizeof(argv));
-@@ -729,18 +774,18 @@ static int spawn_https_helper_openssl(const char *host, unsigned port)
+@@ -729,18 +782,18 @@ static int spawn_https_helper_openssl(const char *host, unsigned port)
                 argv[2] = (char*)"-quiet";
                 argv[3] = (char*)"-connect";
                 argv[4] = (char*)host;
@@ -229,7 +237,7 @@ index 6a64836fb..490daf001 100644
                         *argp++ = (char*)"-verify";              //[7]
                         *argp++ = (char*)"100";                  //[8]
                         *argp++ = (char*)"-verify_return_error"; //[9]
-@@ -762,10 +807,10 @@ static int spawn_https_helper_openssl(const char *host, unsigned port)
+@@ -762,10 +815,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
@@ -242,7 +250,7 @@ index 6a64836fb..490daf001 100644
         free(servername);
         free(allocated);
         close(sp[1]);
-@@ -777,6 +822,7 @@ static int spawn_https_helper_openssl(const char *host, unsigned port)
+@@ -777,6 +830,7 @@ static int spawn_https_helper_openssl(const char *host, unsigned port)
  # endif
         return sp[0];
  }
@@ -250,7 +258,7 @@ index 6a64836fb..490daf001 100644
  #endif
  
  #if ENABLE_FEATURE_WGET_HTTPS
-@@ -1230,26 +1276,47 @@ static void download_one_url(const char *url)
+@@ -1230,26 +1284,51 @@ 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 */
@@ -282,7 +290,11 @@ index 6a64836fb..490daf001 100644
 +                       if(tls_configure(ctx,config) != 0)
 +                               bb_error_msg_and_die("Failed to configure client");
 +                       sfp = tmpfile();
++                       if(sfp == NULL)
++                               bb_error_msg_and_die("Failed to open source tempfile %d: %s", errno, strerror(errno));
 +                       dfp = tmpfile();
++                       if(dfp == NULL)
++                               bb_error_msg_and_die("Failed to open source tempfile %d: %s", errno, strerror(errno));
 +                       if(tls_connect(ctx, servername, NULL) != 0)
 +                               bb_error_msg_and_die("Failed to connect: %s", tls_error(ctx));
 +                       free(pemmem);
@@ -308,7 +320,7 @@ index 6a64836fb..490daf001 100644
   socket_opened:
  #elif ENABLE_FEATURE_WGET_HTTPS
                 /* Only internal TLS support is configured */
-@@ -1353,7 +1420,35 @@ static void download_one_url(const char *url)
+@@ -1353,7 +1432,39 @@ static void download_one_url(const char *url)
                         shutdown(fileno(sfp), SHUT_WR);
                 }
  #endif
@@ -316,10 +328,14 @@ index 6a64836fb..490daf001 100644
 +               //How much data did we actually get?
 +               size_t wlen, bufsize;
 +               wlen = ftell(sfp);
++               if(wlen < 0)
++                       bb_error_msg_and_die("Failed to get source len %d:%s",errno,strerror(errno));
 +               bufsize = 4096;
 +               char buf[bufsize];
 +               char *outbuf;
 +               outbuf = (char*)malloc(sizeof(char) * wlen);
++               if(outbuf == NULL)
++                       bb_error_msg_and_die("Out of memory");
 +               rewind(sfp);
 +               rewind(dfp);
 +               if(fread(outbuf, sizeof(char), wlen, sfp) < wlen)