summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/nss
diff options
context:
space:
mode:
authorArmin Kuster <akuster808@gmail.com>2019-03-10 11:07:40 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-03-11 05:36:37 -0700
commit623e56c34910e0b1c9f4d049a50a925760cbc00a (patch)
tree99190ee8264641b37798ecba386e46e06e51da5d /meta/recipes-support/nss
parent7ff7f2261283ba45ced3ebfa370bef19f0fea5f4 (diff)
downloadpoky-623e56c34910e0b1c9f4d049a50a925760cbc00a.tar.gz
nss: update to 3.42.1
remove nss-fix-SHA_HTONL-bug-for-arm-32be.patch now included (From OE-Core rev: 0de293ce514c24305a520b2291158477f77cb3ac) Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/nss')
-rw-r--r--meta/recipes-support/nss/nss/nss-fix-SHA_HTONL-bug-for-arm-32be.patch34
-rw-r--r--meta/recipes-support/nss/nss_3.42.1.bb (renamed from meta/recipes-support/nss/nss_3.41.bb)5
2 files changed, 2 insertions, 37 deletions
diff --git a/meta/recipes-support/nss/nss/nss-fix-SHA_HTONL-bug-for-arm-32be.patch b/meta/recipes-support/nss/nss/nss-fix-SHA_HTONL-bug-for-arm-32be.patch
deleted file mode 100644
index bb1c6e3b34..0000000000
--- a/meta/recipes-support/nss/nss/nss-fix-SHA_HTONL-bug-for-arm-32be.patch
+++ /dev/null
@@ -1,34 +0,0 @@
1Subject: [PATCH] Fix SHA_HTONL bug for arm 32be.
2
3In arm 32be, there is no need to reverse the host value.
4
5Upstream-Status: Pending
6
7Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com>
8---
9 lib/freebl/sha_fast.h | 2 ++
10 1 file changed, 2 insertions(+)
11
12diff --git a/nss/lib/freebl/sha_fast.h b/nss/lib/freebl/sha_fast.h
13index 4f37d13..8072eda 100644
14--- a/nss/lib/freebl/sha_fast.h
15+++ b/nss/lib/freebl/sha_fast.h
16@@ -99,6 +99,7 @@ swap4b(PRUint32 value)
17 defined(__ARM_ARCH_7__) || \
18 defined(__ARM_ARCH_7A__) || \
19 defined(__ARM_ARCH_7R__)))
20+#if defined(IS_LITTLE_ENDIAN)
21 static __inline__ PRUint32
22 swap4b(PRUint32 value)
23 {
24@@ -109,6 +110,7 @@ swap4b(PRUint32 value)
25 return ret;
26 }
27 #define SHA_HTONL(x) swap4b(x)
28+#endif
29
30 #endif /* x86 family */
31
32--
332.7.4
34
diff --git a/meta/recipes-support/nss/nss_3.41.bb b/meta/recipes-support/nss/nss_3.42.1.bb
index 5ab22b1226..b6bbd800fc 100644
--- a/meta/recipes-support/nss/nss_3.41.bb
+++ b/meta/recipes-support/nss/nss_3.42.1.bb
@@ -28,11 +28,10 @@ SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${VERSIO
28 file://blank-cert9.db \ 28 file://blank-cert9.db \
29 file://blank-key4.db \ 29 file://blank-key4.db \
30 file://system-pkcs11.txt \ 30 file://system-pkcs11.txt \
31 file://nss-fix-SHA_HTONL-bug-for-arm-32be.patch \
32 " 31 "
33 32
34SRC_URI[md5sum] = "eec62a289387a7ce2fd9cca1f76600f3" 33SRC_URI[md5sum] = "1f6cc6c702379478a3a72298caaef0a7"
35SRC_URI[sha256sum] = "ab2e18f5d0dd0079c0005396f9beb9a41e9a1bbc7e6c1d0a99affcef0471712d" 34SRC_URI[sha256sum] = "087db37d38fd49dfd584dd2a8b5baa7fc88de7c9bd97c0c2d5be4abcafc61fc6"
36 35
37UPSTREAM_CHECK_URI = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_Releases" 36UPSTREAM_CHECK_URI = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_Releases"
38UPSTREAM_CHECK_REGEX = "NSS_(?P<pver>.+)_release_notes" 37UPSTREAM_CHECK_REGEX = "NSS_(?P<pver>.+)_release_notes"