diff options
author | Anuj Mittal <anuj.mittal@intel.com> | 2021-06-24 15:42:43 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-07-06 13:02:30 +0100 |
commit | 57574529f8472f32335909e4c06d85d4cdde1713 (patch) | |
tree | 4856e109641f55c8485ead8ba9a1b2edcc4dd792 /meta/recipes-support | |
parent | a175f86329c769b4ae84702ea525962b06c01775 (diff) | |
download | poky-57574529f8472f32335909e4c06d85d4cdde1713.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,
| | ^
(From OE-Core rev: e900a44e76dc2bb20ff725f24333c1c2b330bf41)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support')
-rw-r--r-- | meta/recipes-support/curl/curl/vtls-fix-addsessionid.patch | 31 | ||||
-rw-r--r-- | meta/recipes-support/curl/curl/vtls-fix-warning.patch | 40 | ||||
-rw-r--r-- | meta/recipes-support/curl/curl_7.75.0.bb | 2 |
3 files changed, 73 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 @@ | |||
1 | From 2c26eeef12f0204fb85d6bf40b4e7a1e2ddcdf24 Mon Sep 17 00:00:00 2001 | ||
2 | From: Daniel Stenberg <daniel@haxx.se> | ||
3 | Date: Mon, 29 Mar 2021 12:50:57 +0200 | ||
4 | Subject: [PATCH] vtls: fix addsessionid for non-proxy builds | ||
5 | |||
6 | Follow-up to b09c8ee15771c61 | ||
7 | Fixes #6812 | ||
8 | Closes #6811 | ||
9 | |||
10 | Upstream-Status: Backport [https://github.com/curl/curl/commit/2c26eeef12f0204fb85d6bf40b4e7a1e2ddcdf24] | ||
11 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | ||
12 | --- | ||
13 | lib/vtls/vtls.c | 3 --- | ||
14 | 1 file changed, 3 deletions(-) | ||
15 | |||
16 | diff --git a/lib/vtls/vtls.c b/lib/vtls/vtls.c | ||
17 | index 95fd6356285f..2e07df0a0462 100644 | ||
18 | --- a/lib/vtls/vtls.c | ||
19 | +++ b/lib/vtls/vtls.c | ||
20 | @@ -504,11 +504,8 @@ CURLcode Curl_ssl_addsessionid(struct Curl_easy *data, | ||
21 | const char *hostname = isProxy ? conn->http_proxy.host.name : | ||
22 | conn->host.name; | ||
23 | #else | ||
24 | - /* proxy support disabled */ | ||
25 | - const bool isProxy = FALSE; | ||
26 | struct ssl_primary_config * const ssl_config = &conn->ssl_config; | ||
27 | const char *hostname = conn->host.name; | ||
28 | - (void)sockindex; | ||
29 | #endif | ||
30 | (void)sockindex; | ||
31 | DEBUGASSERT(SSL_SET_OPTION(primary.sessionid)); | ||
diff --git a/meta/recipes-support/curl/curl/vtls-fix-warning.patch b/meta/recipes-support/curl/curl/vtls-fix-warning.patch new file mode 100644 index 0000000000..113b6fd116 --- /dev/null +++ b/meta/recipes-support/curl/curl/vtls-fix-warning.patch | |||
@@ -0,0 +1,40 @@ | |||
1 | From b31d9ccfc2da288900e6857ad8d048c612328cac Mon Sep 17 00:00:00 2001 | ||
2 | From: Jay Satiro <raysatiro@yahoo.com> | ||
3 | Date: Sun, 20 Jun 2021 16:42:58 -0400 | ||
4 | Subject: [PATCH] vtls: fix warning due to function prototype mismatch | ||
5 | |||
6 | b09c8ee changed the function prototype. Caught by Visual Studio. | ||
7 | |||
8 | Upstream-Status: Backport [https://github.com/curl/curl/commit/b31d9ccfc2da288900e6857ad8d048c612328cac] | ||
9 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | ||
10 | --- | ||
11 | lib/vtls/vtls.c | 2 +- | ||
12 | lib/vtls/vtls.h | 2 +- | ||
13 | 2 files changed, 2 insertions(+), 2 deletions(-) | ||
14 | |||
15 | diff --git a/lib/vtls/vtls.c b/lib/vtls/vtls.c | ||
16 | index 82883c9c55e2..fe43703bf8b8 100644 | ||
17 | --- a/lib/vtls/vtls.c | ||
18 | +++ b/lib/vtls/vtls.c | ||
19 | @@ -497,7 +497,7 @@ void Curl_ssl_delsessionid(struct Curl_easy *data, void *ssl_sessionid) | ||
20 | */ | ||
21 | CURLcode Curl_ssl_addsessionid(struct Curl_easy *data, | ||
22 | struct connectdata *conn, | ||
23 | - bool isProxy, | ||
24 | + const bool isProxy, | ||
25 | void *ssl_sessionid, | ||
26 | size_t idsize, | ||
27 | int sockindex) | ||
28 | diff --git a/lib/vtls/vtls.h b/lib/vtls/vtls.h | ||
29 | index a0585c9cec4c..f1a9b8033ae5 100644 | ||
30 | --- a/lib/vtls/vtls.h | ||
31 | +++ b/lib/vtls/vtls.h | ||
32 | @@ -247,7 +247,7 @@ void Curl_ssl_sessionid_unlock(struct Curl_easy *data); | ||
33 | */ | ||
34 | bool Curl_ssl_getsessionid(struct Curl_easy *data, | ||
35 | struct connectdata *conn, | ||
36 | - const bool isproxy, | ||
37 | + const bool isProxy, | ||
38 | void **ssl_sessionid, | ||
39 | size_t *idsize, /* set 0 if unknown */ | ||
40 | int sockindex); | ||
diff --git a/meta/recipes-support/curl/curl_7.75.0.bb b/meta/recipes-support/curl/curl_7.75.0.bb index 7c7b363ae3..f7a8202bc9 100644 --- a/meta/recipes-support/curl/curl_7.75.0.bb +++ b/meta/recipes-support/curl/curl_7.75.0.bb | |||
@@ -13,6 +13,8 @@ SRC_URI = "https://curl.haxx.se/download/curl-${PV}.tar.bz2 \ | |||
13 | file://0001-replace-krb5-config-with-pkg-config.patch \ | 13 | file://0001-replace-krb5-config-with-pkg-config.patch \ |
14 | file://0001-vtls-add-isproxy-argument-to-Curl_ssl_get-addsession.patch \ | 14 | file://0001-vtls-add-isproxy-argument-to-Curl_ssl_get-addsession.patch \ |
15 | file://0002-transfer-strip-credentials-from-the-auto-referer-hea.patch \ | 15 | file://0002-transfer-strip-credentials-from-the-auto-referer-hea.patch \ |
16 | file://vtls-fix-addsessionid.patch \ | ||
17 | file://vtls-fix-warning.patch \ | ||
16 | " | 18 | " |
17 | 19 | ||
18 | SRC_URI[sha256sum] = "50552d4501c178e4cc68baaecc487f466a3d6d19bbf4e50a01869effb316d026" | 20 | SRC_URI[sha256sum] = "50552d4501c178e4cc68baaecc487f466a3d6d19bbf4e50a01869effb316d026" |