pool/mozilla-nss
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 835218 from home:hpjansson:nss-tw

Browse Source 
- Update nss-fips-approved-crypto-non-ec.patch to match RC2 code
  being moved to deprecated/.
- Remove nss-fix-dh-pkcs-derive-inverted-logic.patch. This was made
  obsolete by upstream changes.

OBS-URL: https://build.opensuse.org/request/show/835218
OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/mozilla-nss?expand=0&rev=333
This commit is contained in:
Wolfgang Rosenauer 2020-09-17 14:55:31 +00:00 committed by Git OBS Bridge
parent cd3540b0de
commit 50269fd3cd
4 changed files with 13 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mozilla-nss.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Thu Sep 17 13:57:18 UTC 2020 - Hans Petter Jansson <hpj@suse.com>
- Update nss-fips-approved-crypto-non-ec.patch to match RC2 code
being moved to deprecated/.
- Remove nss-fix-dh-pkcs-derive-inverted-logic.patch. This was made
obsolete by upstream changes.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Sep 8 20:17:19 UTC 2020 - Wolfgang Rosenauer <wr@rosenauer.org> Tue Sep 8 20:17:19 UTC 2020 - Wolfgang Rosenauer <wr@rosenauer.org>

4
mozilla-nss.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package mozilla-nss # spec file for package mozilla-nss
# #
# Copyright (c) 2020 SUSE LLC # Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2006-2020 Wolfgang Rosenauer # Copyright (c) 2006-2020 Wolfgang Rosenauer
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
@ -68,7 +68,6 @@ Patch30: nss-fips-tls-allow-md5-prf.patch
Patch31: nss-fips-use-strong-random-pool.patch Patch31: nss-fips-use-strong-random-pool.patch
Patch32: nss-fips-detect-fips-mode-fixes.patch Patch32: nss-fips-detect-fips-mode-fixes.patch
Patch34: nss-fips-combined-hash-sign-dsa-ecdsa.patch Patch34: nss-fips-combined-hash-sign-dsa-ecdsa.patch
Patch35: nss-fix-dh-pkcs-derive-inverted-logic.patch
Patch36: nss-fips-aes-keywrap-post.patch Patch36: nss-fips-aes-keywrap-post.patch
%if 0%{?sle_version} >= 120000 && 0%{?sle_version} < 150000 %if 0%{?sle_version} >= 120000 && 0%{?sle_version} < 150000
# aarch64 + gcc4.8 fails to build on SLE-12 due to undefined references # aarch64 + gcc4.8 fails to build on SLE-12 due to undefined references
@ -226,7 +225,6 @@ cd nss
%patch31 -p1 %patch31 -p1
%patch32 -p1 %patch32 -p1
%patch34 -p1 %patch34 -p1
%patch35 -p1
%patch36 -p1 %patch36 -p1
# additional CA certificates # additional CA certificates

8
nss-fips-approved-crypto-non-ec.patch
View File

@ -6,14 +6,14 @@
# Parent 3f4d682c9a1e8b3d939c744ee249e23179db5191 # Parent 3f4d682c9a1e8b3d939c744ee249e23179db5191
imported patch nss-fips-approved-crypto-non-ec.patch imported patch nss-fips-approved-crypto-non-ec.patch
diff --git a/lib/freebl/alg2268.c b/lib/freebl/alg2268.c diff --git a/lib/freebl/deprecated/alg2268.c b/lib/freebl/deprecated/alg2268.c
--- a/lib/freebl/alg2268.c --- a/lib/freebl/deprecated/alg2268.c
+++ b/lib/freebl/alg2268.c +++ b/lib/freebl/deprecated/alg2268.c
@@ -16,6 +16,8 @@ @@ -16,6 +16,8 @@
#include <stddef.h> /* for ptrdiff_t */ #include <stddef.h> /* for ptrdiff_t */
#endif #endif
+#include "fips.h" +#include "../fips.h"
+ +
/* /*
** RC2 symmetric block cypher ** RC2 symmetric block cypher

20
nss-fix-dh-pkcs-derive-inverted-logic.patch
View File

@ -1,20 +0,0 @@
# HG changeset patch
# User M. Sirringhaus <msirringhaus@suse.de>
# Date 1590586654 -7200
# Wed May 27 15:37:34 2020 +0200
# Node ID 582ed54a5cda147cd5996603d6066817edb687fa
# Parent ce99bba6375432c55a73c1367f619dfef7c7e9fc
imported patch nss-fix-dh-pkcs-derive-inverted-logic.patch
diff --git a/lib/softoken/pkcs11c.c b/lib/softoken/pkcs11c.c
--- a/lib/softoken/pkcs11c.c
+++ b/lib/softoken/pkcs11c.c
@@ -8316,7 +8316,7 @@
if (crv == CKR_OK) {
rv = KEA_Verify(&dhPublic, &dhPrime, &dhSubPrime);
PORT_Free(dhSubPrime.data);
- if (rv != SECSuccess) {
+ if (rv == PR_FALSE) {
crv = CKR_ARGUMENTS_BAD;
PORT_Free(dhPrime.data);
PORT_Free(dhValue.data);