diff options
author | Anuj Mittal <anuj.mittal@intel.com> | 2021-06-24 15:42:43 +0800 |
---|---|---|
committer | Anuj Mittal <anuj.mittal@intel.com> | 2021-06-30 14:09:07 +0800 |
commit | e900a44e76dc2bb20ff725f24333c1c2b330bf41 (patch) | |
tree | 54f11dceb3c5ed1768240748919b730c5d4e88fa /meta/recipes-support/curl/curl/vtls-fix-addsessionid.patch | |
parent | 8cb77273abd6985242cf45100b2fb732db74e909 (diff) | |
download | openembedded-core-contrib-e900a44e76dc2bb20ff725f24333c1c2b330bf41.tar.gz |
curl: fix build when proxy is not enabled in PACKAGECONFIG
Backport upstream patches to fix issues introduced by a backported CVE
patch. Fixes:
| ../../curl-7.75.0/lib/vtls/vtls.c: In function ‘Curl_ssl_addsessionid’:
| ../../curl-7.75.0/lib/vtls/vtls.c:508:14: error: ‘isProxy’ redeclared as different kind of symbol
| 508 | const bool isProxy = FALSE;
| | ^~~~~~~
| ../../curl-7.75.0/lib/vtls/vtls.c:488:37: note: previous definition of ‘isProxy’ with type ‘_Bool’
| 488 | bool isProxy,
| | ^
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Diffstat (limited to 'meta/recipes-support/curl/curl/vtls-fix-addsessionid.patch')
-rw-r--r-- | meta/recipes-support/curl/curl/vtls-fix-addsessionid.patch | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/meta/recipes-support/curl/curl/vtls-fix-addsessionid.patch b/meta/recipes-support/curl/curl/vtls-fix-addsessionid.patch new file mode 100644 index 0000000000..a4b9cb8931 --- /dev/null +++ b/meta/recipes-support/curl/curl/vtls-fix-addsessionid.patch @@ -0,0 +1,31 @@ +From 2c26eeef12f0204fb85d6bf40b4e7a1e2ddcdf24 Mon Sep 17 00:00:00 2001 +From: Daniel Stenberg <daniel@haxx.se> +Date: Mon, 29 Mar 2021 12:50:57 +0200 +Subject: [PATCH] vtls: fix addsessionid for non-proxy builds + +Follow-up to b09c8ee15771c61 +Fixes #6812 +Closes #6811 + +Upstream-Status: Backport [https://github.com/curl/curl/commit/2c26eeef12f0204fb85d6bf40b4e7a1e2ddcdf24] +Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> +--- + lib/vtls/vtls.c | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/lib/vtls/vtls.c b/lib/vtls/vtls.c +index 95fd6356285f..2e07df0a0462 100644 +--- a/lib/vtls/vtls.c ++++ b/lib/vtls/vtls.c +@@ -504,11 +504,8 @@ CURLcode Curl_ssl_addsessionid(struct Curl_easy *data, + const char *hostname = isProxy ? conn->http_proxy.host.name : + conn->host.name; + #else +- /* proxy support disabled */ +- const bool isProxy = FALSE; + struct ssl_primary_config * const ssl_config = &conn->ssl_config; + const char *hostname = conn->host.name; +- (void)sockindex; + #endif + (void)sockindex; + DEBUGASSERT(SSL_SET_OPTION(primary.sessionid)); |