Accepting request 1176701 from mozilla:Factory
OBS-URL: https://build.opensuse.org/request/show/1176701 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mozilla-nss?expand=0&rev=218
This commit is contained in:
commit
ea382df860
@ -1,3 +1,11 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri May 24 08:12:08 UTC 2024 - Martin Sirringhaus <martin.sirringhaus@suse.com>
|
||||||
|
|
||||||
|
- Adding nss-fips-bsc1223724.patch to fix startup crash of Firefox
|
||||||
|
when using FIPS-mode (bsc#1223724).
|
||||||
|
- Added "Provides: nss" so other RPMs that require 'nss' can
|
||||||
|
be installed (jira PED-6358).
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Wed May 8 06:06:52 UTC 2024 - Martin Sirringhaus <martin.sirringhaus@suse.com>
|
Wed May 8 06:06:52 UTC 2024 - Martin Sirringhaus <martin.sirringhaus@suse.com>
|
||||||
|
|
||||||
|
@ -80,6 +80,7 @@ Patch46: nss-allow-slow-tests.patch
|
|||||||
Patch47: nss-fips-pct-pubkeys.patch
|
Patch47: nss-fips-pct-pubkeys.patch
|
||||||
Patch48: nss-fips-test.patch
|
Patch48: nss-fips-test.patch
|
||||||
Patch49: nss-allow-slow-tests-s390x.patch
|
Patch49: nss-allow-slow-tests-s390x.patch
|
||||||
|
Patch50: nss-fips-bsc1223724.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
|
||||||
BuildRequires: gcc9-c++
|
BuildRequires: gcc9-c++
|
||||||
@ -107,6 +108,7 @@ Requires: libnssckbi.so()(64bit)
|
|||||||
%else
|
%else
|
||||||
Requires: libnssckbi.so
|
Requires: libnssckbi.so
|
||||||
%endif
|
%endif
|
||||||
|
Provides: nss = %{version}
|
||||||
%ifnarch %sparc
|
%ifnarch %sparc
|
||||||
%if ! 0%{?qemu_user_space_build}
|
%if ! 0%{?qemu_user_space_build}
|
||||||
%define run_testsuite 1
|
%define run_testsuite 1
|
||||||
@ -242,6 +244,7 @@ cd nss
|
|||||||
# slow test on s390x, permit more time
|
# slow test on s390x, permit more time
|
||||||
%patch -P 49 -p1
|
%patch -P 49 -p1
|
||||||
%endif
|
%endif
|
||||||
|
%patch -P 50 -p1
|
||||||
|
|
||||||
# additional CA certificates
|
# additional CA certificates
|
||||||
#cd security/nss/lib/ckfw/builtins
|
#cd security/nss/lib/ckfw/builtins
|
||||||
|
19
nss-fips-bsc1223724.patch
Normal file
19
nss-fips-bsc1223724.patch
Normal file
@ -0,0 +1,19 @@
|
|||||||
|
Index: nss/lib/pk11wrap/pk11skey.c
|
||||||
|
===================================================================
|
||||||
|
--- nss.orig/lib/pk11wrap/pk11skey.c
|
||||||
|
+++ nss/lib/pk11wrap/pk11skey.c
|
||||||
|
@@ -520,6 +520,14 @@ PK11_ImportDataKey(PK11SlotInfo *slot, C
|
||||||
|
CK_OBJECT_HANDLE handle;
|
||||||
|
PK11GenericObject *genObject;
|
||||||
|
|
||||||
|
+ // Using HTTP3, Firefox runs via neqo that doesn't log in before calling into
|
||||||
|
+ // this function. So we try to log in here (and ignore failures) in case of FIPS.
|
||||||
|
+ // Also, no need to also load certificates, we only create a new object and we
|
||||||
|
+ // have to be logged in for that.
|
||||||
|
+ if (PK11_IsFIPS()) {
|
||||||
|
+ PK11_Authenticate(slot, PR_FALSE, wincx);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
genObject = PK11_CreateGenericObject(slot, template, PR_ARRAY_SIZE(template), PR_FALSE);
|
||||||
|
if (genObject == NULL) {
|
||||||
|
return NULL;
|
Loading…
Reference in New Issue
Block a user