summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander M Pickering <alex@cogarr.net>2024-11-08 14:00:44 -0600
committerAlexander M Pickering <alex@cogarr.net>2024-11-08 14:00:44 -0600
commitdc9210eb0190092e7b461628ff8f1aa2ad6ebe0a (patch)
tree832c1bd687e977e5ce6cd9d8715e1ec241af7d23
parent7161bfe028f01f237d9b6e91ef1e3ec274686472 (diff)
downloadbusybox-w32-packaging-dc9210eb0190092e7b461628ff8f1aa2ad6ebe0a.tar.gz
busybox-w32-packaging-dc9210eb0190092e7b461628ff8f1aa2ad6ebe0a.tar.bz2
busybox-w32-packaging-dc9210eb0190092e7b461628ff8f1aa2ad6ebe0a.zip
Try removing tls_handshake, it should be called automatically
-rw-r--r--libressl.patch45
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
11 #define TLSLOOP_EXIT_ON_LOCAL_EOF (1 << 0) 11 #define TLSLOOP_EXIT_ON_LOCAL_EOF (1 << 0)
12 void tls_run_copy_loop(tls_state_t *tls, unsigned flags) FAST_FUNC; 12 void tls_run_copy_loop(tls_state_t *tls, unsigned flags) FAST_FUNC;
13 13
14diff --git a/networking/ssl_client.c b/networking/ssl_client.c
15index 757745896..653b6f48e 100644
16--- a/networking/ssl_client.c
17+++ b/networking/ssl_client.c
18@@ -24,6 +24,7 @@
19 //usage:#define ssl_client_full_usage ""
20
21 #include "libbb.h"
22+#include <tls.h>
23
24 int ssl_client_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
25 int ssl_client_main(int argc UNUSED_PARAM, char **argv)
26@@ -69,7 +70,7 @@ int ssl_client_main(int argc UNUSED_PARAM, char **argv)
27 }
28 #endif
29
30- tls_handshake(tls, sni);
31+ //tls_handshake(tls, sni);
32
33 BUILD_BUG_ON(TLSLOOP_EXIT_ON_LOCAL_EOF != 1);
34 tls_run_copy_loop(tls, /*flags*/ opt & 1);
14diff --git a/networking/tls.c b/networking/tls.c 35diff --git a/networking/tls.c b/networking/tls.c
15index 9f1dd67ec..7e8da6df2 100644 36index 9f1dd67ec..7e8da6df2 100644
16--- a/networking/tls.c 37--- a/networking/tls.c
@@ -88,7 +109,7 @@ index 9f1dd67ec..7e8da6df2 100644
88 static void tls_xwrite(tls_state_t *tls, int len) 109 static void tls_xwrite(tls_state_t *tls, int len)
89 { 110 {
90diff --git a/networking/wget.c b/networking/wget.c 111diff --git a/networking/wget.c b/networking/wget.c
91index 6a64836fb..6a82f1fa4 100644 112index 6a64836fb..ae99b2972 100644
92--- a/networking/wget.c 113--- a/networking/wget.c
93+++ b/networking/wget.c 114+++ b/networking/wget.c
94@@ -689,6 +689,7 @@ static void reset_beg_range_to_zero(void) 115@@ -689,6 +689,7 @@ static void reset_beg_range_to_zero(void)
@@ -166,25 +187,3 @@ index 87e7ca602..7bad3e4fa 100644
166 187
167 struct passwd *getpwnam(const char *name) 188 struct passwd *getpwnam(const char *name)
168 { 189 {
169diff --git a/networking/ssl_client.c b/networking/ssl_client.c
170index 757745896..2c30b7923 100644
171--- a/networking/ssl_client.c
172+++ b/networking/ssl_client.c
173@@ -24,7 +24,7 @@
174 //usage:#define ssl_client_full_usage ""
175
176 #include "libbb.h"
177-
178+#include <tls.h>
179 int ssl_client_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
180 int ssl_client_main(int argc UNUSED_PARAM, char **argv)
181 {
182@@ -69,7 +69,7 @@ int ssl_client_main(int argc UNUSED_PARAM, char **argv)
183 }
184 #endif
185
186- tls_handshake(tls, sni);
187+ //tls_handshake(tls, sni);
188
189 BUILD_BUG_ON(TLSLOOP_EXIT_ON_LOCAL_EOF != 1);
190 tls_run_copy_loop(tls, /*flags*/ opt & 1);