Skip to content

Commit

Permalink
[curl] Upgrade libcurl to version 8.7.1
Browse files Browse the repository at this point in the history
This upgrade includes fixes for several CVEs affecting libcurl,
specifically:
* CVE-2024-0853 (fixed in v8.6.0);
* CVE-2024-2004, CVE-2024-2398, CVE-2024-2379, CVE-2024-2466 (fixed in
  v8.7.0/v8.7.1).

This commit also updates the (disabled) libcurl feature list in Gramine
based on the updated minimal binary size configuration recommendations
from curl.

Signed-off-by: Kailun Qin <kailun.qin@intel.com>
  • Loading branch information
kailun-qin authored and mkow committed Apr 5, 2024
1 parent ec06c32 commit 886b7f3
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 10 deletions.
2 changes: 1 addition & 1 deletion meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ mbedtls_proj = subproject('mbedtls-mbedtls-3.5.2')
mbedtls_static_dep = mbedtls_proj.get_variable('mbedtls_static_dep')
mbedtls_pal_dep = mbedtls_proj.get_variable('mbedtls_pal_dep')

curl_proj = subproject('curl-8.5.0')
curl_proj = subproject('curl-8.7.1')
cjson_proj = subproject('cJSON-1.7.12')

if sgx
Expand Down
7 changes: 0 additions & 7 deletions subprojects/curl-8.5.0.wrap

This file was deleted.

7 changes: 7 additions & 0 deletions subprojects/curl-8.7.1.wrap
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
[wrap-file]
directory = curl-8.7.1
source_url = https://curl.se/download/curl-8.7.1.tar.gz
source_fallback_url = https://packages.gramineproject.io/distfiles/curl-8.7.1.tar.gz
source_filename = curl-8.7.1.tar.gz
source_hash = f91249c87f68ea00cf27c44fdfa5a78423e41e71b7d408e5901a9896d905c495
patch_directory = curl-8.7.1
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ cp -ar "$CURRENT_SOURCE_DIR" "$PRIVATE_DIR"

log "running configure..."
# The list of configure options is selected based on:
# https://github.com/curl/curl/blob/curl-8_5_0/docs/INSTALL.md#reducing-size
# https://github.com/curl/curl/blob/curl-8_7_1/docs/INSTALL.md#reducing-size
./configure \
--enable-proxy \
--disable-alt-svc \
Expand All @@ -39,18 +39,22 @@ cp -ar "$CURRENT_SOURCE_DIR" "$PRIVATE_DIR"
--disable-dnsshuffle \
--disable-doh \
--disable-file \
--disable-form-api \
--disable-ftp \
--disable-get-easy-options \
--disable-gopher \
--disable-headers-api \
--disable-hsts \
--disable-http-auth \
--disable-imap \
--disable-ldap \
--disable-ldaps \
--disable-libcurl-option \
--disable-manual \
--disable-mime \
--disable-mqtt \
--disable-netrc \
--disable-ntlm \
--disable-ntlm-wb \
--disable-pop3 \
--disable-progress-meter \
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
project('curl', 'c', version: '8.5.0')
project('curl', 'c', version: '8.7.1')

curl_libs_output = [
'libcurl.a',
Expand Down

0 comments on commit 886b7f3

Please sign in to comment.