0b59ee7dde
- rebase to upstream NSS 3.124 - backport ml-dsa support that is not upstream yet. - pick up in process patches upstream including eddsa
105 lines
2.3 KiB
Diff
105 lines
2.3 KiB
Diff
# HG changeset patch
|
|
# User Robert Relyea <rrelyea@redhat.com>
|
|
# Date 1780437848 25200
|
|
# Tue Jun 02 15:04:08 2026 -0700
|
|
# Branch NSS_3_124_BRANCH
|
|
# Node ID b32abfeba0dab71016b45b33d32b8bea717da75f
|
|
# Parent 19e655733f3af71e3d517ada0d31ad0697d40f3f
|
|
nss-3.124-enable-crmf.patch
|
|
|
|
diff --git a/cmd/manifest.mn b/cmd/manifest.mn
|
|
--- a/cmd/manifest.mn
|
|
+++ b/cmd/manifest.mn
|
|
@@ -4,16 +4,22 @@
|
|
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
|
|
DEPTH = ..
|
|
# MODULE = seccmd
|
|
|
|
SOFTOKEN_SRCDIRS=
|
|
NSS_SRCDIRS=
|
|
LIB_SRCDIRS=
|
|
+CRMF_SRCDIR=
|
|
+
|
|
+ifdef NSS_ENABLE_CRMF
|
|
+CRMF_SRCDIR=crmftest
|
|
+endif
|
|
+
|
|
|
|
ifdef NSS_BUILD_UTIL_ONLY
|
|
REQUIRES = nspr
|
|
else
|
|
REQUIRES = nss nspr libdbm
|
|
LIB_SRCDIRS = \
|
|
lib \
|
|
$(NULL)
|
|
@@ -35,16 +41,17 @@ ifndef NSS_BUILD_SOFTOKEN_ONLY
|
|
ifndef NSS_BUILD_UTIL_ONLY
|
|
NSS_SRCDIRS = \
|
|
addbuiltin \
|
|
atob \
|
|
btoa \
|
|
certutil \
|
|
chktest \
|
|
crlutil \
|
|
+ $(CRMF_SRCDIR) \
|
|
dbtest \
|
|
derdump \
|
|
digest \
|
|
httpserv \
|
|
listsuites \
|
|
makepqg \
|
|
multinit \
|
|
nss-policy-check \
|
|
diff --git a/lib/Makefile b/lib/Makefile
|
|
--- a/lib/Makefile
|
|
+++ b/lib/Makefile
|
|
@@ -51,16 +51,20 @@ endif # MOZILLA_CLIENT
|
|
ifndef NSS_DISABLE_DBM
|
|
DBM_SRCDIR = dbm
|
|
endif
|
|
|
|
ifndef NSS_DISABLE_LIBPKIX
|
|
LIBPKIX_SRCDIR = libpkix
|
|
endif
|
|
|
|
+ifdef NSS_ENABLE_CRMF
|
|
+CRMF_SRCDIR=crmf
|
|
+endif
|
|
+
|
|
ifeq ($(NSS_BUILD_UTIL_ONLY),1)
|
|
UTIL_SRCDIR = util
|
|
|
|
else
|
|
ifeq ($(NSS_BUILD_SOFTOKEN_ONLY),1)
|
|
FREEBL_SRCDIR = freebl
|
|
SOFTOKEN_SRCDIR = softoken
|
|
else
|
|
@@ -83,24 +87,24 @@ else
|
|
endif
|
|
|
|
ifneq (,$(SOFTOKEN_SRCDIR))
|
|
$(SOFTOKEN_SRCDIR): $(DBM_SRCDIR) $(FREEBL_SRCDIR) $(SQLITE_SRCDIR) $(UTIL_SRCDIR)
|
|
endif
|
|
|
|
ifndef NSS_BUILD_SOFTOKEN_ONLY
|
|
NSS_SRCDIRS = \
|
|
- base certdb certhigh ckfw cryptohi dev jar $(LIBPKIX_SRCDIR) \
|
|
+ base certdb certhigh ckfw $(CRMF_SRCDIR) cryptohi dev jar $(LIBPKIX_SRCDIR) \
|
|
nss pk11wrap pkcs12 pkcs7 pki smime ssl $(SYSINIT_SRCDIR) $(ZLIB_SRCDIR)
|
|
|
|
ifneq (,$(SYSINIT_SRCDIR))
|
|
$(SYSINIT_SRCDIR): $(UTIL_SRCDIR)
|
|
endif
|
|
|
|
- nss: base certdb certhigh cryptohi dev $(LIBPKIX_SRCDIR) pk11wrap pki $(UTIL_SRCDIR)
|
|
+ nss: base certdb certhigh cryptohi $(CRMF_SRCDIR) dev $(LIBPKIX_SRCDIR) pk11wrap pki $(UTIL_SRCDIR)
|
|
smime: nss pkcs7 pkcs12
|
|
ssl: nss
|
|
ckfw: nss
|
|
|
|
endif # !NSS_BUILD_SOFTOKEN_ONLY
|
|
endif # !NSS_BUILD_UTIL_ONLY
|
|
|
|
DIRS = \
|