Try removing tls_handshake, it should be called automatically

1 files changed, 22 insertions, 23 deletions

diff --git a/libressl.patch b/libressl.patch
index c134e98..00e6f63 100644
--- a/libressl.patch
+++ b/libressl.patch
@@ -11,6 +11,27 @@ index bc1453e12..69f76cbb3 100644
  #define TLSLOOP_EXIT_ON_LOCAL_EOF (1 << 0)
  void tls_run_copy_loop(tls_state_t *tls, unsigned flags) FAST_FUNC;
  
+diff --git a/networking/ssl_client.c b/networking/ssl_client.c
+index 757745896..653b6f48e 100644
+--- a/networking/ssl_client.c
++++ b/networking/ssl_client.c
+@@ -24,6 +24,7 @@
+ //usage:#define ssl_client_full_usage ""
+ 
+ #include "libbb.h"
++#include <tls.h>
+ 
+ int ssl_client_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+ int ssl_client_main(int argc UNUSED_PARAM, char **argv)
+@@ -69,7 +70,7 @@ int ssl_client_main(int argc UNUSED_PARAM, char **argv)
+        }
+ #endif
+ 
+-       tls_handshake(tls, sni);
++       //tls_handshake(tls, sni);
+ 
+        BUILD_BUG_ON(TLSLOOP_EXIT_ON_LOCAL_EOF != 1);
+        tls_run_copy_loop(tls, /*flags*/ opt & 1);
 diff --git a/networking/tls.c b/networking/tls.c
 index 9f1dd67ec..7e8da6df2 100644
 --- a/networking/tls.c
@@ -88,7 +109,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..6a82f1fa4 100644
+index 6a64836fb..ae99b2972 100644
 --- a/networking/wget.c
 +++ b/networking/wget.c
 @@ -689,6 +689,7 @@ static void reset_beg_range_to_zero(void)
@@ -166,25 +187,3 @@ index 87e7ca602..7bad3e4fa 100644
  
  struct passwd *getpwnam(const char *name)
  {
-diff --git a/networking/ssl_client.c b/networking/ssl_client.c
-index 757745896..2c30b7923 100644
---- a/networking/ssl_client.c
-+++ b/networking/ssl_client.c
-@@ -24,7 +24,7 @@
- //usage:#define ssl_client_full_usage ""
- 
- #include "libbb.h"
--
-+#include <tls.h>
- int ssl_client_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;     
- int ssl_client_main(int argc UNUSED_PARAM, char **argv)
- {
-@@ -69,7 +69,7 @@ int ssl_client_main(int argc UNUSED_PARAM, char **argv)
-        }
- #endif
- 
--       tls_handshake(tls, sni);
-+       //tls_handshake(tls, sni);
- 
-        BUILD_BUG_ON(TLSLOOP_EXIT_ON_LOCAL_EOF != 1);
-        tls_run_copy_loop(tls, /*flags*/ opt & 1);