diff options
| author | Michael Forney <mforney@mforney.org> | 2021-11-15 13:39:20 -0800 |
|---|---|---|
| committer | Michael Forney <mforney@mforney.org> | 2021-11-17 13:42:34 -0800 |
| commit | d95c5b072fc3345076ba5da51a596bba19a12f2e (patch) | |
| tree | 2bec4c9eb1b3bff2e39c55a4058e01ba64849f36 /pkg/curl/patch | |
| parent | 78d1604bc7b807fb0707e89678bba5c148831343 (diff) | |
curl: Update to 7.80.0
Diffstat (limited to 'pkg/curl/patch')
| -rw-r--r-- | pkg/curl/patch/0002-Use-double-instead-of-long-double-for-progress-calcu.patch | 25 | ||||
| -rw-r--r-- | pkg/curl/patch/0002-bearssl-Remove-unnecessary-CA-blob-length-check.patch | 29 |
2 files changed, 29 insertions, 25 deletions
diff --git a/pkg/curl/patch/0002-Use-double-instead-of-long-double-for-progress-calcu.patch b/pkg/curl/patch/0002-Use-double-instead-of-long-double-for-progress-calcu.patch deleted file mode 100644 index f4d754d5..00000000 --- a/pkg/curl/patch/0002-Use-double-instead-of-long-double-for-progress-calcu.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 4a4a14e99d8bdf4f25bbf60ed4f1a62f19ed3a57 Mon Sep 17 00:00:00 2001 -From: Michael Forney <mforney@mforney.org> -Date: Mon, 6 Sep 2021 18:19:30 -0700 -Subject: [PATCH] Use double instead of long double for progress calculation - ---- - lib/progress.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/progress.c b/lib/progress.c -index 4bcd615eb..d46a3a06d 100644 ---- a/lib/progress.c -+++ b/lib/progress.c -@@ -377,7 +377,7 @@ static curl_off_t trspeed(curl_off_t size, /* number of bytes */ - { - if(us < 1) - return size * 1000000; -- return (curl_off_t)((long double)size/us * 1000000); -+ return (curl_off_t)((double)size/us * 1000000); - } - - /* returns TRUE if it's time to show the progress meter */ --- -2.32.0 - diff --git a/pkg/curl/patch/0002-bearssl-Remove-unnecessary-CA-blob-length-check.patch b/pkg/curl/patch/0002-bearssl-Remove-unnecessary-CA-blob-length-check.patch new file mode 100644 index 00000000..e72a5489 --- /dev/null +++ b/pkg/curl/patch/0002-bearssl-Remove-unnecessary-CA-blob-length-check.patch @@ -0,0 +1,29 @@ +From 5d080c8db49bdb91a35ad4763fcc176088214b22 Mon Sep 17 00:00:00 2001 +From: Michael Forney <mforney@mforney.org> +Date: Mon, 15 Nov 2021 13:10:02 -0800 +Subject: [PATCH] bearssl: Remove unnecessary CA blob length check + +BearSSL APIs take a size_t length parameter, so unlike OpenSSL, +there is no conversion to int and no reason to check that it's less +than INT_MAX. +--- + lib/vtls/bearssl.c | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/lib/vtls/bearssl.c b/lib/vtls/bearssl.c +index 9b772d064..591eb8715 100644 +--- a/lib/vtls/bearssl.c ++++ b/lib/vtls/bearssl.c +@@ -124,9 +124,6 @@ static CURLcode load_cafile(struct cafile_source *source, + return CURLE_SSL_CACERT_BADFILE; + } + +- if(source->type == CAFILE_SOURCE_BLOB && source->len > (size_t)INT_MAX) +- return CURLE_SSL_CACERT_BADFILE; +- + ca.err = CURLE_OK; + ca.in_cert = FALSE; + ca.anchors = NULL; +-- +2.32.0 + |