diff options
author | Alexander M Pickering <alex@cogarr.net> | 2024-11-17 15:51:17 -0600 |
---|---|---|
committer | Alexander M Pickering <alex@cogarr.net> | 2024-11-17 15:51:17 -0600 |
commit | 685f6c76a07ab25d766d0a4b4494e2b7464b8c51 (patch) | |
tree | 54dac0551553429b195a95ef9964e918a7eb1a43 | |
parent | 781a6a3e646366701132cacac51bb4fb6a469fc1 (diff) | |
download | busybox-w32-packaging-685f6c76a07ab25d766d0a4b4494e2b7464b8c51.tar.gz busybox-w32-packaging-685f6c76a07ab25d766d0a4b4494e2b7464b8c51.tar.bz2 busybox-w32-packaging-685f6c76a07ab25d766d0a4b4494e2b7464b8c51.zip |
Remove extra certificates
-rw-r--r-- | libressl.patch | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/libressl.patch b/libressl.patch index 0322ddd..28d46a3 100644 --- a/libressl.patch +++ b/libressl.patch | |||
@@ -102,7 +102,7 @@ index 9f1dd67ec..60e1afe99 100644 | |||
102 | static void tls_xwrite(tls_state_t *tls, int len) | 102 | static void tls_xwrite(tls_state_t *tls, int len) |
103 | { | 103 | { |
104 | diff --git a/networking/wget.c b/networking/wget.c | 104 | diff --git a/networking/wget.c b/networking/wget.c |
105 | index 6a64836fb..f859f429a 100644 | 105 | index 6a64836fb..490daf001 100644 |
106 | --- a/networking/wget.c | 106 | --- a/networking/wget.c |
107 | +++ b/networking/wget.c | 107 | +++ b/networking/wget.c |
108 | @@ -1,4 +1,3 @@ | 108 | @@ -1,4 +1,3 @@ |
@@ -250,7 +250,7 @@ index 6a64836fb..f859f429a 100644 | |||
250 | #endif | 250 | #endif |
251 | 251 | ||
252 | #if ENABLE_FEATURE_WGET_HTTPS | 252 | #if ENABLE_FEATURE_WGET_HTTPS |
253 | @@ -1230,26 +1276,51 @@ static void download_one_url(const char *url) | 253 | @@ -1230,26 +1276,47 @@ static void download_one_url(const char *url) |
254 | /* Open socket to http(s) server */ | 254 | /* Open socket to http(s) server */ |
255 | #if ENABLE_FEATURE_WGET_OPENSSL | 255 | #if ENABLE_FEATURE_WGET_OPENSSL |
256 | /* openssl (and maybe internal TLS) support is configured */ | 256 | /* openssl (and maybe internal TLS) support is configured */ |
@@ -278,10 +278,6 @@ index 6a64836fb..f859f429a 100644 | |||
278 | + config = tls_config_new(); | 278 | + config = tls_config_new(); |
279 | + if(config == NULL) | 279 | + if(config == NULL) |
280 | + bb_error_msg_and_die("Out of memory 2"); | 280 | + bb_error_msg_and_die("Out of memory 2"); |
281 | + if(tls_config_set_ca_path(config, "certs") != 0) | ||
282 | + bb_error_msg_and_die("Failed to set ca path"); | ||
283 | + if(tls_config_set_ca_file(config, "cert.pem") != 0) | ||
284 | + bb_error_msg_and_die("Failed to set ca file"); | ||
285 | + pemmem = gather_certificates(config); | 281 | + pemmem = gather_certificates(config); |
286 | + if(tls_configure(ctx,config) != 0) | 282 | + if(tls_configure(ctx,config) != 0) |
287 | + bb_error_msg_and_die("Failed to configure client"); | 283 | + bb_error_msg_and_die("Failed to configure client"); |
@@ -312,7 +308,7 @@ index 6a64836fb..f859f429a 100644 | |||
312 | socket_opened: | 308 | socket_opened: |
313 | #elif ENABLE_FEATURE_WGET_HTTPS | 309 | #elif ENABLE_FEATURE_WGET_HTTPS |
314 | /* Only internal TLS support is configured */ | 310 | /* Only internal TLS support is configured */ |
315 | @@ -1353,7 +1424,35 @@ static void download_one_url(const char *url) | 311 | @@ -1353,7 +1420,35 @@ static void download_one_url(const char *url) |
316 | shutdown(fileno(sfp), SHUT_WR); | 312 | shutdown(fileno(sfp), SHUT_WR); |
317 | } | 313 | } |
318 | #endif | 314 | #endif |