try a different way of patching

2 files changed, 106 insertions, 1 deletions

diff --git a/init b/init
index 348c86b..b7ba829 100755
--- a/init
+++ b/init
@@ -13,7 +13,7 @@ mv libcrypto.a /usr/x86_64-w64-mingw32/lib
 
 cd busybox-w32
 cp /root/busybox-w32-packaging/config .config
-git apply /root/busybox-w32-packaging/libressl.patch
+git apply /root/busybox-w32-packaging/libressl2.patch
 # For some reason this code only causes errors on -O0
 if [ -n "$ZERO_PATCH" ]; then
         git apply /root/busybox-w32-packaging/zero.patch
diff --git a/libressl2.patch b/libressl2.patch
new file mode 100644
index 0000000..ccf7121
--- /dev/null
+++ b/libressl2.patch
@@ -0,0 +1,105 @@
+diff --git a/networking/wget.c b/networking/wget.c
+index 6a64836fb..9da1274ac 100644
+--- a/networking/wget.c
++++ b/networking/wget.c
+@@ -689,6 +689,8 @@ 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;
+@@ -1230,26 +1232,52 @@ 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) {
+                        /* openssl-based helper
+                         * Inconvenient API since we can't give it an open fd
+                         */
+-                       int fd = spawn_https_helper_openssl(server.host, server.port);
++                       //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;
+-                       }
++                       char *allocated, *servername, *p, *host;
++                       if(!strchr(server.host, ":"))
++                               host = allocated = xasprintf("%s:%u", server.host, server.port);
++                       servername = xstrdup(host);
++                       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_config_set_ca_path(config, "certs") != 0)
++                               bb_error_msg_and_die("Failed to set ca path");
++                       if(tls_config_set_ca_file(config, "cert.pem") != 0)
++                               bb_error_msg_and_die("Failed to set ca file");
++                       if(tls_configure(ctx,config) != 0)
++                               bb_error_msg_and_die("Failed to configure client");
++                       sfp = tmpfile();
++                       dfp = tmpfile();
++                       printf("TLS connection to %s\n", server.host);
++                       if(tls_connect(ctx, servername, NULL) != 0)
++                               bb_error_msg_and_die("Failed to connect: %s", tls_error(ctx));
++                       tls_config_free(config);
++                       free(allocated);
++                       free(servername);
++                       printf("wget download_one_url 10\n");
++                       printf("wget download_one_url 13\n");
++                       //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();
++                       //sfp = fdopen(fd, "r+");
++                       //if (!sfp)
++                       //      bb_die_memory_exhausted();
+                        goto socket_opened;
+                }
+-               sfp = open_socket(lsa);
++               //sfp = open_socket(lsa);
+  socket_opened:
+ #elif ENABLE_FEATURE_WGET_HTTPS
+                /* Only internal TLS support is configured */
+@@ -1353,7 +1381,27 @@ static void download_one_url(const char *url)
+                        shutdown(fileno(sfp), SHUT_WR);
+                }
+ #endif
+-
++               //How much data did we actually get?
++               size_t wlen = ftell(sfp);
++               char *outbuf = (char*)malloc(sizeof(char) * wlen);
++               rewind(sfp);
++               rewind(dfp);
++               if(fread(outbuf, sizeof(char), wlen, sfp) < wlen)
++                       bb_error_msg_and_die("Failed to read tmpfile: %s", strerror(errno));
++               if(tls_write(ctx, outbuf, wlen) < wlen)
++                       bb_error_msg_and_die("Failed to write:%s",tls_error(ctx));
++               ssize_t len = TLS_WANT_POLLIN;
++               size_t bufsize = 4096;
++               char *buf[bufsize];
++               while(len == TLS_WANT_POLLIN || len > 0){
++                       len = tls_read(ctx, buf, bufsize);
++                       if(fputs(buf, dfp) == EOF)
++                               bb_error_msg_and_die("Failed to copy buffer to tmpfile");
++               }
++               if(len == -1)
++                       bb_error_msg_and_die("tls read error: %s", tls_error(ctx));
++               rewind(dfp);
++               sfp = dfp;
+                /*
+                 * Retrieve HTTP response line and check for "200" status code.
+                 */