summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJack Mitchell <ml@embed.me.uk>2023-05-10 10:06:47 +0100
committerArmin Kuster <akuster808@gmail.com>2023-05-16 07:09:25 -0400
commitc69846bfc6d09b3cca49d4303014fba1d383cfbb (patch)
tree65a041519044dc728f4f1ef7fc155ee7a04bfe72
parent6577dc6003fd484dde7ec33f138938500e8e9da6 (diff)
downloadmeta-openembedded-c69846bfc6d09b3cca49d4303014fba1d383cfbb.tar.gz
nss: backport fix for native build failure due to implicit casting with gcc13
Upstream-Status: Backport Link: https://github.com/nss-dev/nss/commit/4e7e332b25a2794f381323518e52d8d95273b69e Signed-off-by: Jack Mitchell <ml@embed.me.uk> Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--meta-oe/recipes-support/nss/nss/0001-Bug-1812671-build-failure-while-implicitly-casting-S.patch46
-rw-r--r--meta-oe/recipes-support/nss/nss_3.51.1.bb1
2 files changed, 47 insertions, 0 deletions
diff --git a/meta-oe/recipes-support/nss/nss/0001-Bug-1812671-build-failure-while-implicitly-casting-S.patch b/meta-oe/recipes-support/nss/nss/0001-Bug-1812671-build-failure-while-implicitly-casting-S.patch
new file mode 100644
index 0000000000..b935d9eec5
--- /dev/null
+++ b/meta-oe/recipes-support/nss/nss/0001-Bug-1812671-build-failure-while-implicitly-casting-S.patch
@@ -0,0 +1,46 @@
1From 4e7e332b25a2794f381323518e52d8d95273b69e Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Franti=C5=A1ek=20Kren=C5=BEelok?= <fkrenzel@redhat.com>
3Date: Mon, 30 Jan 2023 12:59:20 +0000
4Subject: [PATCH] Bug 1812671 - build failure while implicitly casting
5 SECStatus to PRUInt32. r=nss-reviewers,mt
6
7Author of the patch: Bob Relyea <rrelyea@redhat.com>
8
9Differential Revision: https://phabricator.services.mozilla.com/D167983
10
11--HG--
12extra : moz-landing-system : lando
13---
14 lib/ssl/ssl3exthandle.c | 2 +-
15 lib/ssl/sslsnce.c | 2 +-
16 2 files changed, 2 insertions(+), 2 deletions(-)
17
18diff --git a/lib/ssl/ssl3exthandle.c b/lib/ssl/ssl3exthandle.c
19index b5ae62f39..7134447bf 100644
20--- a/lib/ssl/ssl3exthandle.c
21+++ b/lib/ssl/ssl3exthandle.c
22@@ -201,7 +201,7 @@ ssl3_FreeSniNameArray(TLSExtensionData *xtnData)
23 * Clients sends a filled in session ticket if one is available, and otherwise
24 * sends an empty ticket. Servers always send empty tickets.
25 */
26-PRInt32
27+SECStatus
28 ssl3_ClientSendSessionTicketXtn(const sslSocket *ss, TLSExtensionData *xtnData,
29 sslBuffer *buf, PRBool *added)
30 {
31diff --git a/lib/ssl/sslsnce.c b/lib/ssl/sslsnce.c
32index 56edafa1f..49f041c97 100644
33--- a/lib/ssl/sslsnce.c
34+++ b/lib/ssl/sslsnce.c
35@@ -1820,7 +1820,7 @@ ssl_GetSelfEncryptKeyPair(SECKEYPublicKey **pubKey,
36 return SECSuccess;
37 }
38
39-static PRBool
40+static SECStatus
41 ssl_GenerateSelfEncryptKeys(void *pwArg, PRUint8 *keyName,
42 PK11SymKey **aesKey, PK11SymKey **macKey);
43
44--
452.40.1
46
diff --git a/meta-oe/recipes-support/nss/nss_3.51.1.bb b/meta-oe/recipes-support/nss/nss_3.51.1.bb
index 1de2a40094..721b38ddb6 100644
--- a/meta-oe/recipes-support/nss/nss_3.51.1.bb
+++ b/meta-oe/recipes-support/nss/nss_3.51.1.bb
@@ -43,6 +43,7 @@ SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${VERSIO
43 file://CVE-2021-43527.patch \ 43 file://CVE-2021-43527.patch \
44 file://CVE-2022-22747.patch \ 44 file://CVE-2022-22747.patch \
45 file://CVE-2023-0767.patch \ 45 file://CVE-2023-0767.patch \
46 file://0001-Bug-1812671-build-failure-while-implicitly-casting-S.patch;patchdir=nss \
46 " 47 "
47 48
48SRC_URI[md5sum] = "6acaf1ddff69306ae30a908881c6f233" 49SRC_URI[md5sum] = "6acaf1ddff69306ae30a908881c6f233"