NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/libcurl: security bump to version 7.77.0

Browse Source 
Fixes the following security issues:

- CVE-2021-22897: schannel cipher selection surprise
  https://curl.se/docs/CVE-2021-22897.html

- CVE-2021-22898: TELNET stack contents disclosure
  https://curl.se/docs/CVE-2021-22898.html

- CVE-2021-22901: TLS session caching disaster
  https://curl.se/docs/CVE-2021-22901.html

Unconditionally disable the ldap(s) options.  These require external
libraries, but the options were ignored if the needed libraries weren't
available. This is now changed to be a fatal error since

dae382a1a1

Additionally, add a post-7.77.0 upstream patch to fix compilation with
bearssl.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
[yann.morin.1998@free.fr: annotate the patch, that it is a backport]
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
This commit is contained in:
Peter Korsgaard 2021-05-27 23:35:31 +02:00 committed by Yann E. MORIN
parent 1f1d220419
commit eae15d62c6
3 changed files with 36 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
package/libcurl/0001-bearssl-remove-incorrect-const-on-variable-that-is-m.patch Normal file
View File

@ -0,0 +1,32 @@
From a03ea6223950002eba8b1ef0df3133c62f387d6b Mon Sep 17 00:00:00 2001
From: Michael Forney <mforney@mforney.org>
Date: Tue, 25 May 2021 23:42:07 -0700
Subject: [PATCH] bearssl: remove incorrect const on variable that is modified
hostname may be set to NULL later on in this function if it is an
IP address.
Closes #7133
[peter@korsgaard.com: backported from upstream]
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
lib/vtls/bearssl.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/vtls/bearssl.c b/lib/vtls/bearssl.c
index 7f729713d..40a5e7879 100644
--- a/lib/vtls/bearssl.c
+++ b/lib/vtls/bearssl.c
@@ -300,7 +300,7 @@ static CURLcode bearssl_connect_step1(struct Curl_easy *data,
struct ssl_connect_data *connssl = &conn->ssl[sockindex];
struct ssl_backend_data *backend = connssl->backend;
const char * const ssl_cafile = SSL_CONN_CONFIG(CAfile);
- const char * const hostname = SSL_HOST_NAME();
+ const char *hostname = SSL_HOST_NAME();
const bool verifypeer = SSL_CONN_CONFIG(verifypeer);
const bool verifyhost = SSL_CONN_CONFIG(verifyhost);
CURLcode ret;
--
2.20.1

4
package/libcurl/libcurl.hash
View File

@ -1,5 +1,5 @@
# Locally calculated after checking pgp signature # Locally calculated after checking pgp signature
# https://curl.haxx.se/download/curl-7.76.1.tar.xz.asc # https://curl.haxx.se/download/curl-7.77.0.tar.xz.asc
# signed with key 27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2 # signed with key 27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2
sha256 64bb5288c39f0840c07d077e30d9052e1cbb9fa6c2dc52523824cc859e679145 curl-7.76.1.tar.xz sha256 0f64582c54282f31c0de9f0a1a596b182776bd4df9a4c4a2a41bbeb54f62594b curl-7.77.0.tar.xz
sha256 6fd1a1c008b5ef4c4741dd188c3f8af6944c14c25afa881eb064f98fb98358e7 COPYING sha256 6fd1a1c008b5ef4c4741dd188c3f8af6944c14c25afa881eb064f98fb98358e7 COPYING

8
package/libcurl/libcurl.mk
View File

@ -4,7 +4,7 @@
# #
################################################################################ ################################################################################
LIBCURL_VERSION = 7.76.1 LIBCURL_VERSION = 7.77.0
LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.xz LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.xz
LIBCURL_SITE = https://curl.haxx.se/download LIBCURL_SITE = https://curl.haxx.se/download
LIBCURL_DEPENDENCIES = host-pkgconf \ LIBCURL_DEPENDENCIES = host-pkgconf \
@ -24,7 +24,7 @@ LIBCURL_INSTALL_STAGING = YES
# generate C code) isn't very useful # generate C code) isn't very useful
LIBCURL_CONF_OPTS = --disable-manual --disable-ntlm-wb \ LIBCURL_CONF_OPTS = --disable-manual --disable-ntlm-wb \
--enable-hidden-symbols --with-random=/dev/urandom --disable-curldebug \ --enable-hidden-symbols --with-random=/dev/urandom --disable-curldebug \
--disable-libcurl-option --disable-libcurl-option --disable-ldap --disable-ldaps
ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
LIBCURL_CONF_OPTS += --enable-threaded-resolver LIBCURL_CONF_OPTS += --enable-threaded-resolver
@ -150,8 +150,6 @@ LIBCURL_CONF_OPTS += \
--enable-dict \ --enable-dict \
--enable-gopher \ --enable-gopher \
--enable-imap \ --enable-imap \
--enable-ldap \
--enable-ldaps \
--enable-pop3 \ --enable-pop3 \
--enable-rtsp \ --enable-rtsp \
--enable-smb \ --enable-smb \
@ -163,8 +161,6 @@ LIBCURL_CONF_OPTS += \
--disable-dict \ --disable-dict \
--disable-gopher \ --disable-gopher \
--disable-imap \ --disable-imap \
--disable-ldap \
--disable-ldaps \
--disable-pop3 \ --disable-pop3 \
--disable-rtsp \ --disable-rtsp \
--disable-smb \ --disable-smb \