diff options
author | Khem Raj <raj.khem@gmail.com> | 2017-04-19 19:31:43 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-05-12 08:51:09 +0100 |
commit | 82b555aef24f7ca454a624f5dea2f222b3206663 (patch) | |
tree | 4d5df2fbe2a9d10839c2ae3d816662fcfcfbf557 /meta/recipes-support/nss/nss | |
parent | 13fcd3fdeceea7324f86087541b1b77fb52917bb (diff) | |
download | poky-82b555aef24f7ca454a624f5dea2f222b3206663.tar.gz |
nss: Update to 3.29.1
Also fix build with gcc7 along
(From OE-Core rev: 5b8c7e4cc54353014e9e023e29a6ff97aefd5179)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/nss/nss')
-rw-r--r-- | meta/recipes-support/nss/nss/0001-Fix-warnings-found-with-gcc7.patch | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/meta/recipes-support/nss/nss/0001-Fix-warnings-found-with-gcc7.patch b/meta/recipes-support/nss/nss/0001-Fix-warnings-found-with-gcc7.patch new file mode 100644 index 0000000000..b16fb020c1 --- /dev/null +++ b/meta/recipes-support/nss/nss/0001-Fix-warnings-found-with-gcc7.patch | |||
@@ -0,0 +1,41 @@ | |||
1 | From a1d2ef6a8e1bc721e44640bdb85747deaf8edcca Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Wed, 19 Apr 2017 10:50:37 -0700 | ||
4 | Subject: [PATCH] Fix warnings found with gcc7 | ||
5 | |||
6 | GCC7 finds more type conversion issues | ||
7 | |||
8 | | pkix_pl_ocsprequest.c: In function 'pkix_pl_OcspRequest_Hashcode': | ||
9 | | pkix_pl_ocsprequest.c:92:60: error: '<<' in boolean context, did you mean '<' ? [-Werror=int-in-bool-context] | ||
10 | | *pHashcode = (((((extensionHash << 8) || certHash) << 8) || | ||
11 | | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~ | ||
12 | | pkix_pl_ocsprequest.c:93:27: error: '<<' in boolean context, did you mean '<' ? [-Werror=int-in-bool-context] | ||
13 | | *pHashcode = (((((extensionHash << 8) || certHash) << 8) || | ||
14 | | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | ||
15 | | dateHash) << 8) || signerHash; | ||
16 | | ~~~~~~~~~~^~~~~ | ||
17 | | cc1: all warnings being treated as errors | ||
18 | |||
19 | Upstream-Status: Pending | ||
20 | |||
21 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
22 | --- | ||
23 | nss/lib/libpkix/pkix_pl_nss/pki/pkix_pl_ocsprequest.c | 2 +- | ||
24 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
25 | |||
26 | diff --git a/nss/lib/libpkix/pkix_pl_nss/pki/pkix_pl_ocsprequest.c b/nss/lib/libpkix/pkix_pl_nss/pki/pkix_pl_ocsprequest.c | ||
27 | index 171a3d2..d5eef88 100644 | ||
28 | --- a/nss/lib/libpkix/pkix_pl_nss/pki/pkix_pl_ocsprequest.c | ||
29 | +++ b/nss/lib/libpkix/pkix_pl_nss/pki/pkix_pl_ocsprequest.c | ||
30 | @@ -89,7 +89,7 @@ pkix_pl_OcspRequest_Hashcode( | ||
31 | PKIX_HASHCODE(ocspRq->signerCert, &signerHash, plContext, | ||
32 | PKIX_CERTHASHCODEFAILED); | ||
33 | |||
34 | - *pHashcode = (((((extensionHash << 8) || certHash) << 8) || | ||
35 | + *pHashcode = ((PKIX_UInt32)(((PKIX_UInt32)((extensionHash << 8) || certHash) << 8) || | ||
36 | dateHash) << 8) || signerHash; | ||
37 | |||
38 | cleanup: | ||
39 | -- | ||
40 | 2.12.2 | ||
41 | |||