diff options
| author |   Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> | 2018-12-05 02:22:50 +0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-12-05 12:28:55 +0000 |
| commit | 50a554a8ffff0bb34f844fb6cb9dd69362caafa5 (patch) | |
| tree | 4d851c5c0e23fa6e92e828a5ff1bc2bb7df89580 | |
| parent | 873507c0cbbf1f7ef22d1cb9dcb0e2b167460490 (diff) | |
| download | openembedded-core-contrib-50a554a8ffff0bb34f844fb6cb9dd69362caafa5.tar.gz | |
nss: Fix SHA_HTONL bug for arm 32be.
Rpm use nss as digest crypto library and which will cause an error as follows:
error: test-manual-1.2.3-20181012.noarch.rpm: Header SHA1 digest: BAD (Expected
f1deb7dc4a10742d88ccd1e967dbc62ae45095a5 !=4ad9d7dad6d70d6086eefec62612ad5d77f2fe81) => this value is wrong
error: test-manual-1.2.3-20181012.noarch.rpm: not an rpm package (or package manifest)
The error is caused by SHA_HTONL in nss, for there is no need to reverse the host value for arm 32be, so fix it.
Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-support/nss/nss/nss-fix-SHA_HTONL-bug-for-arm-32be.patch | 34 | ||||
| -rw-r--r-- | meta/recipes-support/nss/nss_3.40.bb | 1 |
2 files changed, 35 insertions, 0 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 new file mode 100644 index 0000000000..7ba8d16483 --- /dev/null +++ b/meta/recipes-support/nss/nss/nss-fix-SHA_HTONL-bug-for-arm-32be.patch @@ -0,0 +1,34 @@ +Subject: [PATCH] Fix SHA_HTONL bug for arm 32be. + +In arm 32be, there is no need to reverse the host value. + +Upstream Status: Pending + +Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> +--- + lib/freebl/sha_fast.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/nss/lib/freebl/sha_fast.h b/nss/lib/freebl/sha_fast.h +index 4f37d13..8072eda 100644 +--- a/nss/lib/freebl/sha_fast.h ++++ b/nss/lib/freebl/sha_fast.h +@@ -99,6 +99,7 @@ swap4b(PRUint32 value) + defined(__ARM_ARCH_7__) || \ + defined(__ARM_ARCH_7A__) || \ + defined(__ARM_ARCH_7R__))) ++#if defined(IS_LITTLE_ENDIAN) + static __inline__ PRUint32 + swap4b(PRUint32 value) + { +@@ -109,6 +110,7 @@ swap4b(PRUint32 value) + return ret; + } + #define SHA_HTONL(x) swap4b(x) ++#endif + + #endif /* x86 family */ + +-- +2.7.4 + diff --git a/meta/recipes-support/nss/nss_3.40.bb b/meta/recipes-support/nss/nss_3.40.bb index 23c95dd0d1..afc50817f1 100644 --- a/meta/recipes-support/nss/nss_3.40.bb +++ b/meta/recipes-support/nss/nss_3.40.bb @@ -28,6 +28,7 @@ SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${VERSIO file://blank-cert9.db \ file://blank-key4.db \ file://system-pkcs11.txt \ + file://nss-fix-SHA_HTONL-bug-for-arm-32be.patch \ " SRC_URI[md5sum] = "f7aec858d192ae03d0e9a35a730c70fa" |