* [gentoo-commits] repo/gentoo:master commit in: dev-libs/nss/files/
@ 2018-05-12 20:54 Lars Wendler
0 siblings, 0 replies; 8+ messages in thread
From: Lars Wendler @ 2018-05-12 20:54 UTC (permalink / raw
To: gentoo-commits
commit: 99b69ea16e2e67d658564d83e38f6df9fca75a9e
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sat May 12 15:41:44 2018 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sat May 12 20:54:06 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99b69ea1
dev-libs/nss: remove unused patch
Closes: https://github.com/gentoo/gentoo/pull/8375
.../files/nss-3.35-Hacl_Poly1305_64-aarch64.patch | 36 ----------------------
1 file changed, 36 deletions(-)
diff --git a/dev-libs/nss/files/nss-3.35-Hacl_Poly1305_64-aarch64.patch b/dev-libs/nss/files/nss-3.35-Hacl_Poly1305_64-aarch64.patch
deleted file mode 100644
index c05d103e25b..00000000000
--- a/dev-libs/nss/files/nss-3.35-Hacl_Poly1305_64-aarch64.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-
-# HG changeset patch
-# User Daiki Ueno <dueno@redhat.com>
-# Date 1516710574 -3600
-# Node ID 74e679158d1bfe05c173e995ae7dc5a05ae02fe0
-# Parent b3feffd76f4714139f72369f82b28619a704dbd6
-Bug 1432455, Build Hacl_Poly1305_64.o on AArch64 even with make, r=fkiefer
-
-diff --git a/lib/freebl/Makefile b/lib/freebl/Makefile
---- a/lib/freebl/Makefile
-+++ b/lib/freebl/Makefile
-@@ -522,17 +522,22 @@ ifndef NSS_DISABLE_CHACHAPOLY
-
- ifneq (1,$(CC_IS_GCC))
- EXTRA_SRCS += chacha20.c
- VERIFIED_SRCS += Hacl_Chacha20.c
- else
- EXTRA_SRCS += chacha20_vec.c
- endif
- else
-- EXTRA_SRCS += poly1305.c
-+ ifeq ($(CPU_ARCH),aarch64)
-+ EXTRA_SRCS += Hacl_Poly1305_64.c
-+ else
-+ EXTRA_SRCS += poly1305.c
-+ endif
-+
- EXTRA_SRCS += chacha20.c
- VERIFIED_SRCS += Hacl_Chacha20.c
- endif # x86_64
- endif # NSS_DISABLE_CHACHAPOLY
-
- ifeq (,$(filter-out i386 x386 x86 x86_64 aarch64,$(CPU_ARCH)))
- # All intel architectures get the 64 bit version
- # With custom uint128 if necessary (faster than generic 32 bit version).
-
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/nss/files/
@ 2020-01-02 18:34 Thomas Deutschmann
0 siblings, 0 replies; 8+ messages in thread
From: Thomas Deutschmann @ 2020-01-02 18:34 UTC (permalink / raw
To: gentoo-commits
commit: 27037007ea09027bcebb488b1e348f192ba115e3
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Thu Jan 2 06:59:03 2020 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Jan 2 18:33:58 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27037007
dev-libs/nss: remove unused patches
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/14210
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
dev-libs/nss/files/nss-3.21-enable-pem.patch | 11 -
dev-libs/nss/files/nss-3.32-gentoo-fixups.patch | 274 ------------
dev-libs/nss/files/nss-3.36.7-fix-cms.patch | 531 ------------------------
3 files changed, 816 deletions(-)
diff --git a/dev-libs/nss/files/nss-3.21-enable-pem.patch b/dev-libs/nss/files/nss-3.21-enable-pem.patch
deleted file mode 100644
index e6de275787d..00000000000
--- a/dev-libs/nss/files/nss-3.21-enable-pem.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- nss/lib/ckfw/manifest.mn
-+++ nss/lib/ckfw/manifest.mn
-@@ -5,7 +5,7 @@
-
- CORE_DEPTH = ../..
-
--DIRS = builtins
-+DIRS = builtins pem
-
- PRIVATE_EXPORTS = \
- ck.h \
diff --git a/dev-libs/nss/files/nss-3.32-gentoo-fixups.patch b/dev-libs/nss/files/nss-3.32-gentoo-fixups.patch
deleted file mode 100644
index 1773da98819..00000000000
--- a/dev-libs/nss/files/nss-3.32-gentoo-fixups.patch
+++ /dev/null
@@ -1,274 +0,0 @@
-From 8e49e1c92dadc2e7a41cad44637f4a224e4f5b39 Mon Sep 17 00:00:00 2001
-From: "Jory A. Pratt" <anarchy@gentoo.org>
-Date: Fri, 28 Jul 2017 14:00:41 -0500
-Subject: [PATCH] add pkg-config file
-
-Signed-off-by: Jory A. Pratt <anarchy@gentoo.org>
----
- Makefile | 11 +---
- config/Makefile | 40 ++++++++++++++
- config/nss-config.in | 145 +++++++++++++++++++++++++++++++++++++++++++++++++++
- config/nss.pc.in | 12 +++++
- manifest.mn | 2 +-
- 5 files changed, 199 insertions(+), 11 deletions(-)
- create mode 100644 config/Makefile
- create mode 100644 config/nss-config.in
- create mode 100644 config/nss.pc.in
-
-diff --git a/Makefile b/Makefile
-index 48bae37..9850883 100644
---- a/Makefile
-+++ b/Makefile
-@@ -47,7 +47,7 @@ include $(CORE_DEPTH)/coreconf/rules.mk
- # (7) Execute "local" rules. (OPTIONAL). #
- #######################################################################
-
--nss_build_all: build_nspr all latest
-+nss_build_all: all latest
-
- nss_clean_all: clobber_nspr clobber
-
-@@ -135,15 +135,6 @@ $(NSPR_CONFIG_STATUS): $(NSPR_CONFIGURE)
- --prefix='$(NSS_GYP_PREFIX)'
- endif
-
--build_nspr: $(NSPR_CONFIG_STATUS)
-- $(MAKE) -C $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME)
--
--install_nspr: build_nspr
-- $(MAKE) -C $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME) install
--
--clobber_nspr: $(NSPR_CONFIG_STATUS)
-- $(MAKE) -C $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME) clobber
--
- build_docs:
- $(MAKE) -C $(CORE_DEPTH)/doc
-
-diff --git a/config/Makefile b/config/Makefile
-new file mode 100644
-index 0000000..600fe48
---- /dev/null
-+++ b/config/Makefile
-@@ -0,0 +1,40 @@
-+CORE_DEPTH = ..
-+DEPTH = ..
-+
-+include $(CORE_DEPTH)/coreconf/config.mk
-+
-+NSS_MAJOR_VERSION = `grep "NSS_VMAJOR" ../lib/nss/nss.h | awk '{print $$3}'`
-+NSS_MINOR_VERSION = `grep "NSS_VMINOR" ../lib/nss/nss.h | awk '{print $$3}'`
-+NSS_PATCH_VERSION = `grep "NSS_VPATCH" ../lib/nss/nss.h | awk '{print $$3}'`
-+PREFIX = /usr
-+
-+all: export libs
-+
-+export:
-+ # Create the nss.pc file
-+ mkdir -p $(DIST)/lib/pkgconfig
-+ sed -e "s,@prefix@,$(PREFIX)," \
-+ -e "s,@exec_prefix@,\$${prefix}," \
-+ -e "s,@libdir@,\$${prefix}/lib64," \
-+ -e "s,@includedir@,\$${prefix}/include/nss," \
-+ -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION),g" \
-+ -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \
-+ -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \
-+ nss.pc.in > nss.pc
-+ chmod 0644 nss.pc
-+ ln -sf ../../../../config/nss.pc $(DIST)/lib/pkgconfig
-+
-+ # Create the nss-config script
-+ mkdir -p $(DIST)/bin
-+ sed -e "s,@prefix@,$(PREFIX)," \
-+ -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION)," \
-+ -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \
-+ -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \
-+ nss-config.in > nss-config
-+ chmod 0755 nss-config
-+ ln -sf ../../../config/nss-config $(DIST)/bin
-+
-+libs:
-+
-+dummy: all export libs
-+
-diff --git a/config/nss-config.in b/config/nss-config.in
-new file mode 100644
-index 0000000..1d7c444
---- /dev/null
-+++ b/config/nss-config.in
-@@ -0,0 +1,145 @@
-+#!/bin/sh
-+
-+prefix=@prefix@
-+
-+major_version=@NSS_MAJOR_VERSION@
-+minor_version=@NSS_MINOR_VERSION@
-+patch_version=@NSS_PATCH_VERSION@
-+
-+usage()
-+{
-+ cat <<EOF
-+Usage: nss-config [OPTIONS] [LIBRARIES]
-+Options:
-+ [--prefix[=DIR]]
-+ [--exec-prefix[=DIR]]
-+ [--includedir[=DIR]]
-+ [--libdir[=DIR]]
-+ [--version]
-+ [--libs]
-+ [--cflags]
-+Dynamic Libraries:
-+ nss
-+ ssl
-+ smime
-+ nssutil
-+EOF
-+ exit $1
-+}
-+
-+if test $# -eq 0; then
-+ usage 1 1>&2
-+fi
-+
-+lib_ssl=yes
-+lib_smime=yes
-+lib_nss=yes
-+lib_nssutil=yes
-+
-+while test $# -gt 0; do
-+ case "$1" in
-+ -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-+ *) optarg= ;;
-+ esac
-+
-+ case $1 in
-+ --prefix=*)
-+ prefix=$optarg
-+ ;;
-+ --prefix)
-+ echo_prefix=yes
-+ ;;
-+ --exec-prefix=*)
-+ exec_prefix=$optarg
-+ ;;
-+ --exec-prefix)
-+ echo_exec_prefix=yes
-+ ;;
-+ --includedir=*)
-+ includedir=$optarg
-+ ;;
-+ --includedir)
-+ echo_includedir=yes
-+ ;;
-+ --libdir=*)
-+ libdir=$optarg
-+ ;;
-+ --libdir)
-+ echo_libdir=yes
-+ ;;
-+ --version)
-+ echo ${major_version}.${minor_version}.${patch_version}
-+ ;;
-+ --cflags)
-+ echo_cflags=yes
-+ ;;
-+ --libs)
-+ echo_libs=yes
-+ ;;
-+ ssl)
-+ lib_ssl=yes
-+ ;;
-+ smime)
-+ lib_smime=yes
-+ ;;
-+ nss)
-+ lib_nss=yes
-+ ;;
-+ nssutil)
-+ lib_nssutil=yes
-+ ;;
-+ *)
-+ usage 1 1>&2
-+ ;;
-+ esac
-+ shift
-+done
-+
-+# Set variables that may be dependent upon other variables
-+if test -z "$exec_prefix"; then
-+ exec_prefix=`pkg-config --variable=exec_prefix nss`
-+fi
-+if test -z "$includedir"; then
-+ includedir=`pkg-config --variable=includedir nss`
-+fi
-+if test -z "$libdir"; then
-+ libdir=`pkg-config --variable=libdir nss`
-+fi
-+
-+if test "$echo_prefix" = "yes"; then
-+ echo $prefix
-+fi
-+
-+if test "$echo_exec_prefix" = "yes"; then
-+ echo $exec_prefix
-+fi
-+
-+if test "$echo_includedir" = "yes"; then
-+ echo $includedir
-+fi
-+
-+if test "$echo_libdir" = "yes"; then
-+ echo $libdir
-+fi
-+
-+if test "$echo_cflags" = "yes"; then
-+ echo -I$includedir
-+fi
-+
-+if test "$echo_libs" = "yes"; then
-+ libdirs=""
-+ if test -n "$lib_ssl"; then
-+ libdirs="$libdirs -lssl${major_version}"
-+ fi
-+ if test -n "$lib_smime"; then
-+ libdirs="$libdirs -lsmime${major_version}"
-+ fi
-+ if test -n "$lib_nss"; then
-+ libdirs="$libdirs -lnss${major_version}"
-+ fi
-+ if test -n "$lib_nssutil"; then
-+ libdirs="$libdirs -lnssutil${major_version}"
-+ fi
-+ echo $libdirs
-+fi
-+
-diff --git a/config/nss.pc.in b/config/nss.pc.in
-new file mode 100644
-index 0000000..df9e2cf
---- /dev/null
-+++ b/config/nss.pc.in
-@@ -0,0 +1,12 @@
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+libdir=@libdir@
-+includedir=@includedir@
-+
-+Name: NSS
-+Description: Network Security Services
-+Version: @NSS_MAJOR_VERSION@.@NSS_MINOR_VERSION@.@NSS_PATCH_VERSION@
-+Requires: nspr >= 4.8
-+Libs: -lssl3 -lsmime3 -lnss3 -lnssutil3
-+Cflags: -I${includedir}
-+
-diff --git a/manifest.mn b/manifest.mn
-index 500a5ad..87c905e 100644
---- a/manifest.mn
-+++ b/manifest.mn
-@@ -10,4 +10,4 @@ IMPORTS = nspr20/v4.8 \
-
- RELEASE = nss
-
--DIRS = coreconf lib cmd cpputil gtests
-+DIRS = coreconf lib cmd cpputil config
---
-2.13.3
-
diff --git a/dev-libs/nss/files/nss-3.36.7-fix-cms.patch b/dev-libs/nss/files/nss-3.36.7-fix-cms.patch
deleted file mode 100644
index 57b4cdaf5a5..00000000000
--- a/dev-libs/nss/files/nss-3.36.7-fix-cms.patch
+++ /dev/null
@@ -1,531 +0,0 @@
-From d54a1f812ae23ec11d2af6ed93ba1a11609421a8 Mon Sep 17 00:00:00 2001
-From: "J.C. Jones" <jjones@mozilla.com>
-Date: Mon, 14 Jan 2019 10:35:25 -0700
-Subject: [PATCH] Bug 1507135 - Add additional null checks to CMS message
- functions r=mt
-
-Differential review: https://phabricator.services.mozilla.com//D16488
-
---HG--
-branch : NSS_3_36_BRANCH
-extra : transplant_source : 1%02%80%21%BE%C8B%D5%21%D7%0CR%00%ED%B6%EA%84a%FA%23
----
- lib/smime/cmsmessage.c | 69 ++++++++++++++++++++++++++++++++++++------
- 1 file changed, 59 insertions(+), 10 deletions(-)
-
-diff --git a/lib/smime/cmsmessage.c b/lib/smime/cmsmessage.c
-index 27d1256ec..f41a432b1 100644
---- a/lib/smime/cmsmessage.c
-+++ b/lib/smime/cmsmessage.c
-@@ -29,8 +29,9 @@ NSS_CMSMessage_Create(PLArenaPool *poolp)
-
- if (poolp == NULL) {
- poolp = PORT_NewArena(1024); /* XXX what is right value? */
-- if (poolp == NULL)
-+ if (poolp == NULL) {
- return NULL;
-+ }
- poolp_is_ours = PR_TRUE;
- }
-
-@@ -44,8 +45,9 @@ NSS_CMSMessage_Create(PLArenaPool *poolp)
- if (mark) {
- PORT_ArenaRelease(poolp, mark);
- }
-- } else
-+ } else {
- PORT_FreeArena(poolp, PR_FALSE);
-+ }
- return NULL;
- }
-
-@@ -53,8 +55,9 @@ NSS_CMSMessage_Create(PLArenaPool *poolp)
- cmsg->poolp_is_ours = poolp_is_ours;
- cmsg->refCount = 1;
-
-- if (mark)
-+ if (mark) {
- PORT_ArenaUnmark(poolp, mark);
-+ }
-
- return cmsg;
- }
-@@ -73,8 +76,13 @@ NSS_CMSMessage_SetEncodingParams(NSSCMSMessage *cmsg,
- NSSCMSGetDecryptKeyCallback decrypt_key_cb, void *decrypt_key_cb_arg,
- SECAlgorithmID **detached_digestalgs, SECItem **detached_digests)
- {
-- if (pwfn)
-+ if (cmsg == NULL) {
-+ return;
-+ }
-+ if (pwfn) {
- PK11_SetPasswordFunc(pwfn);
-+ }
-+
- cmsg->pwfn_arg = pwfn_arg;
- cmsg->decrypt_key_cb = decrypt_key_cb;
- cmsg->decrypt_key_cb_arg = decrypt_key_cb_arg;
-@@ -89,18 +97,21 @@ void
- NSS_CMSMessage_Destroy(NSSCMSMessage *cmsg)
- {
- PORT_Assert(cmsg->refCount > 0);
-- if (cmsg->refCount <= 0) /* oops */
-+ if (cmsg->refCount <= 0) { /* oops */
- return;
-+ }
-
- cmsg->refCount--; /* thread safety? */
-- if (cmsg->refCount > 0)
-+ if (cmsg->refCount > 0) {
- return;
-+ }
-
- NSS_CMSContentInfo_Destroy(&(cmsg->contentInfo));
-
- /* if poolp is not NULL, cmsg is the owner of its arena */
-- if (cmsg->poolp_is_ours)
-+ if (cmsg->poolp_is_ours) {
- PORT_FreeArena(cmsg->poolp, PR_FALSE); /* XXX clear it? */
-+ }
- }
-
- /*
-@@ -112,8 +123,9 @@ NSS_CMSMessage_Destroy(NSSCMSMessage *cmsg)
- NSSCMSMessage *
- NSS_CMSMessage_Copy(NSSCMSMessage *cmsg)
- {
-- if (cmsg == NULL)
-+ if (cmsg == NULL) {
- return NULL;
-+ }
-
- PORT_Assert(cmsg->refCount > 0);
-
-@@ -127,6 +139,10 @@ NSS_CMSMessage_Copy(NSSCMSMessage *cmsg)
- PLArenaPool *
- NSS_CMSMessage_GetArena(NSSCMSMessage *cmsg)
- {
-+ if (cmsg == NULL) {
-+ return NULL;
-+ }
-+
- return cmsg->poolp;
- }
-
-@@ -136,6 +152,10 @@ NSS_CMSMessage_GetArena(NSSCMSMessage *cmsg)
- NSSCMSContentInfo *
- NSS_CMSMessage_GetContentInfo(NSSCMSMessage *cmsg)
- {
-+ if (cmsg == NULL) {
-+ return NULL;
-+ }
-+
- return &(cmsg->contentInfo);
- }
-
-@@ -147,6 +167,10 @@ NSS_CMSMessage_GetContentInfo(NSSCMSMessage *cmsg)
- SECItem *
- NSS_CMSMessage_GetContent(NSSCMSMessage *cmsg)
- {
-+ if (cmsg == NULL) {
-+ return NULL;
-+ }
-+
- /* this is a shortcut */
- NSSCMSContentInfo *cinfo = NSS_CMSMessage_GetContentInfo(cmsg);
- SECItem *pItem = NSS_CMSContentInfo_GetInnerContent(cinfo);
-@@ -164,6 +188,10 @@ NSS_CMSMessage_ContentLevelCount(NSSCMSMessage *cmsg)
- int count = 0;
- NSSCMSContentInfo *cinfo;
-
-+ if (cmsg == NULL) {
-+ return 0;
-+ }
-+
- /* walk down the chain of contentinfos */
- for (cinfo = &(cmsg->contentInfo); cinfo != NULL;) {
- count++;
-@@ -183,6 +211,10 @@ NSS_CMSMessage_ContentLevel(NSSCMSMessage *cmsg, int n)
- int count = 0;
- NSSCMSContentInfo *cinfo;
-
-+ if (cmsg == NULL) {
-+ return NULL;
-+ }
-+
- /* walk down the chain of contentinfos */
- for (cinfo = &(cmsg->contentInfo); cinfo != NULL && count < n;
- cinfo = NSS_CMSContentInfo_GetChildContentInfo(cinfo)) {
-@@ -200,6 +232,10 @@ NSS_CMSMessage_ContainsCertsOrCrls(NSSCMSMessage *cmsg)
- {
- NSSCMSContentInfo *cinfo;
-
-+ if (cmsg == NULL) {
-+ return PR_FALSE;
-+ }
-+
- /* descend into CMS message */
- for (cinfo = &(cmsg->contentInfo); cinfo != NULL;
- cinfo = NSS_CMSContentInfo_GetChildContentInfo(cinfo)) {
-@@ -221,6 +257,10 @@ NSS_CMSMessage_IsEncrypted(NSSCMSMessage *cmsg)
- {
- NSSCMSContentInfo *cinfo;
-
-+ if (cmsg == NULL) {
-+ return PR_FALSE;
-+ }
-+
- /* walk down the chain of contentinfos */
- for (cinfo = &(cmsg->contentInfo); cinfo != NULL;
- cinfo = NSS_CMSContentInfo_GetChildContentInfo(cinfo)) {
-@@ -251,13 +291,21 @@ NSS_CMSMessage_IsSigned(NSSCMSMessage *cmsg)
- {
- NSSCMSContentInfo *cinfo;
-
-+ if (cmsg == NULL) {
-+ return PR_FALSE;
-+ }
-+
- /* walk down the chain of contentinfos */
- for (cinfo = &(cmsg->contentInfo); cinfo != NULL;
- cinfo = NSS_CMSContentInfo_GetChildContentInfo(cinfo)) {
- switch (NSS_CMSContentInfo_GetContentTypeTag(cinfo)) {
- case SEC_OID_PKCS7_SIGNED_DATA:
-- if (!NSS_CMSArray_IsEmpty((void **)cinfo->content.signedData->signerInfos))
-+ if (cinfo->content.signedData == NULL) {
-+ return PR_FALSE;
-+ }
-+ if (!NSS_CMSArray_IsEmpty((void **)cinfo->content.signedData->signerInfos)) {
- return PR_TRUE;
-+ }
- break;
- default:
- /* callback here for generic wrappers? */
-@@ -278,8 +326,9 @@ NSS_CMSMessage_IsContentEmpty(NSSCMSMessage *cmsg, unsigned int minLen)
- {
- SECItem *item = NULL;
-
-- if (cmsg == NULL)
-+ if (cmsg == NULL) {
- return PR_TRUE;
-+ }
-
- item = NSS_CMSContentInfo_GetContent(NSS_CMSMessage_GetContentInfo(cmsg));
-
-From fa26771e9515cc82c941fcef689dd797a3e308c3 Mon Sep 17 00:00:00 2001
-From: "J.C. Jones" <jjones@mozilla.com>
-Date: Fri, 11 Jan 2019 22:33:16 -0700
-Subject: [PATCH] Bug 1507174 - Add additional null checks to other CMS
- functions r=mt
-
-Differential review: https://phabricator.services.mozilla.com//D16383
-
---HG--
-branch : NSS_3_36_BRANCH
-extra : transplant_source : %B5%A8su%96%5B%BE%F9%CD%93%E0%EE%93a4c%1BYp%09
----
- lib/smime/cmscinfo.c | 92 ++++++++++++++++++++++++++++++++++++------
- lib/smime/cmsdigdata.c | 4 +-
- lib/smime/cmsencdata.c | 4 +-
- lib/smime/cmsenvdata.c | 5 +++
- lib/smime/cmsmessage.c | 3 ++
- lib/smime/cmsudf.c | 2 +-
- 6 files changed, 95 insertions(+), 15 deletions(-)
-
-diff --git a/lib/smime/cmscinfo.c b/lib/smime/cmscinfo.c
-index 08db662f8..453ccaada 100644
---- a/lib/smime/cmscinfo.c
-+++ b/lib/smime/cmscinfo.c
-@@ -51,6 +51,10 @@ NSS_CMSContentInfo_Destroy(NSSCMSContentInfo *cinfo)
- {
- SECOidTag kind;
-
-+ if (cinfo == NULL) {
-+ return;
-+ }
-+
- kind = NSS_CMSContentInfo_GetContentTypeTag(cinfo);
- switch (kind) {
- case SEC_OID_PKCS7_ENVELOPED_DATA:
-@@ -86,6 +90,11 @@ NSSCMSContentInfo *
- NSS_CMSContentInfo_GetChildContentInfo(NSSCMSContentInfo *cinfo)
- {
- NSSCMSContentInfo *ccinfo = NULL;
-+
-+ if (cinfo == NULL) {
-+ return NULL;
-+ }
-+
- SECOidTag tag = NSS_CMSContentInfo_GetContentTypeTag(cinfo);
- switch (tag) {
- case SEC_OID_PKCS7_SIGNED_DATA:
-@@ -127,6 +136,9 @@ SECStatus
- NSS_CMSContentInfo_SetDontStream(NSSCMSContentInfo *cinfo, PRBool dontStream)
- {
- SECStatus rv;
-+ if (cinfo == NULL) {
-+ return SECFailure;
-+ }
-
- rv = NSS_CMSContentInfo_Private_Init(cinfo);
- if (rv != SECSuccess) {
-@@ -145,15 +157,20 @@ NSS_CMSContentInfo_SetContent(NSSCMSMessage *cmsg, NSSCMSContentInfo *cinfo,
- SECOidTag type, void *ptr)
- {
- SECStatus rv;
-+ if (cinfo == NULL || cmsg == NULL) {
-+ return SECFailure;
-+ }
-
- cinfo->contentTypeTag = SECOID_FindOIDByTag(type);
-- if (cinfo->contentTypeTag == NULL)
-+ if (cinfo->contentTypeTag == NULL) {
- return SECFailure;
-+ }
-
- /* do not copy the oid, just create a reference */
- rv = SECITEM_CopyItem(cmsg->poolp, &(cinfo->contentType), &(cinfo->contentTypeTag->oid));
-- if (rv != SECSuccess)
-+ if (rv != SECSuccess) {
- return SECFailure;
-+ }
-
- cinfo->content.pointer = ptr;
-
-@@ -185,8 +202,9 @@ SECStatus
- NSS_CMSContentInfo_SetContent_Data(NSSCMSMessage *cmsg, NSSCMSContentInfo *cinfo,
- SECItem *data, PRBool detached)
- {
-- if (NSS_CMSContentInfo_SetContent(cmsg, cinfo, SEC_OID_PKCS7_DATA, (void *)data) != SECSuccess)
-+ if (NSS_CMSContentInfo_SetContent(cmsg, cinfo, SEC_OID_PKCS7_DATA, (void *)data) != SECSuccess) {
- return SECFailure;
-+ }
- if (detached) {
- cinfo->rawContent = NULL;
- }
-@@ -230,6 +248,10 @@ NSS_CMSContentInfo_SetContent_EncryptedData(NSSCMSMessage *cmsg, NSSCMSContentIn
- void *
- NSS_CMSContentInfo_GetContent(NSSCMSContentInfo *cinfo)
- {
-+ if (cinfo == NULL) {
-+ return NULL;
-+ }
-+
- SECOidTag tag = cinfo->contentTypeTag
- ? cinfo->contentTypeTag->offset
- : SEC_OID_UNKNOWN;
-@@ -260,6 +282,10 @@ NSS_CMSContentInfo_GetInnerContent(NSSCMSContentInfo *cinfo)
- SECOidTag tag;
- SECItem *pItem = NULL;
-
-+ if (cinfo == NULL) {
-+ return NULL;
-+ }
-+
- tag = NSS_CMSContentInfo_GetContentTypeTag(cinfo);
- if (NSS_CMSType_IsData(tag)) {
- pItem = cinfo->content.data;
-@@ -282,6 +308,10 @@ NSS_CMSContentInfo_GetInnerContent(NSSCMSContentInfo *cinfo)
- SECOidTag
- NSS_CMSContentInfo_GetContentTypeTag(NSSCMSContentInfo *cinfo)
- {
-+ if (cinfo == NULL) {
-+ return SEC_OID_UNKNOWN;
-+ }
-+
- if (cinfo->contentTypeTag == NULL)
- cinfo->contentTypeTag = SECOID_FindOID(&(cinfo->contentType));
-
-@@ -294,11 +324,17 @@ NSS_CMSContentInfo_GetContentTypeTag(NSSCMSContentInfo *cinfo)
- SECItem *
- NSS_CMSContentInfo_GetContentTypeOID(NSSCMSContentInfo *cinfo)
- {
-- if (cinfo->contentTypeTag == NULL)
-+ if (cinfo == NULL) {
-+ return NULL;
-+ }
-+
-+ if (cinfo->contentTypeTag == NULL) {
- cinfo->contentTypeTag = SECOID_FindOID(&(cinfo->contentType));
-+ }
-
-- if (cinfo->contentTypeTag == NULL)
-+ if (cinfo->contentTypeTag == NULL) {
- return NULL;
-+ }
-
- return &(cinfo->contentTypeTag->oid);
- }
-@@ -310,8 +346,13 @@ NSS_CMSContentInfo_GetContentTypeOID(NSSCMSContentInfo *cinfo)
- SECOidTag
- NSS_CMSContentInfo_GetContentEncAlgTag(NSSCMSContentInfo *cinfo)
- {
-- if (cinfo->contentEncAlgTag == SEC_OID_UNKNOWN)
-+ if (cinfo == NULL) {
-+ return SEC_OID_UNKNOWN;
-+ }
-+
-+ if (cinfo->contentEncAlgTag == SEC_OID_UNKNOWN) {
- cinfo->contentEncAlgTag = SECOID_GetAlgorithmTag(&(cinfo->contentEncAlg));
-+ }
-
- return cinfo->contentEncAlgTag;
- }
-@@ -322,6 +363,10 @@ NSS_CMSContentInfo_GetContentEncAlgTag(NSSCMSContentInfo *cinfo)
- SECAlgorithmID *
- NSS_CMSContentInfo_GetContentEncAlg(NSSCMSContentInfo *cinfo)
- {
-+ if (cinfo == NULL) {
-+ return NULL;
-+ }
-+
- return &(cinfo->contentEncAlg);
- }
-
-@@ -330,10 +375,14 @@ NSS_CMSContentInfo_SetContentEncAlg(PLArenaPool *poolp, NSSCMSContentInfo *cinfo
- SECOidTag bulkalgtag, SECItem *parameters, int keysize)
- {
- SECStatus rv;
-+ if (cinfo == NULL) {
-+ return SECFailure;
-+ }
-
- rv = SECOID_SetAlgorithmID(poolp, &(cinfo->contentEncAlg), bulkalgtag, parameters);
-- if (rv != SECSuccess)
-+ if (rv != SECSuccess) {
- return SECFailure;
-+ }
- cinfo->keysize = keysize;
- return SECSuccess;
- }
-@@ -343,27 +392,42 @@ NSS_CMSContentInfo_SetContentEncAlgID(PLArenaPool *poolp, NSSCMSContentInfo *cin
- SECAlgorithmID *algid, int keysize)
- {
- SECStatus rv;
-+ if (cinfo == NULL) {
-+ return SECFailure;
-+ }
-
- rv = SECOID_CopyAlgorithmID(poolp, &(cinfo->contentEncAlg), algid);
-- if (rv != SECSuccess)
-+ if (rv != SECSuccess) {
- return SECFailure;
-- if (keysize >= 0)
-+ }
-+ if (keysize >= 0) {
- cinfo->keysize = keysize;
-+ }
- return SECSuccess;
- }
-
- void
- NSS_CMSContentInfo_SetBulkKey(NSSCMSContentInfo *cinfo, PK11SymKey *bulkkey)
- {
-- cinfo->bulkkey = PK11_ReferenceSymKey(bulkkey);
-- cinfo->keysize = PK11_GetKeyStrength(cinfo->bulkkey, &(cinfo->contentEncAlg));
-+ if (cinfo == NULL) {
-+ return;
-+ }
-+
-+ if (bulkkey == NULL) {
-+ cinfo->bulkkey = NULL;
-+ cinfo->keysize = 0;
-+ } else {
-+ cinfo->bulkkey = PK11_ReferenceSymKey(bulkkey);
-+ cinfo->keysize = PK11_GetKeyStrength(cinfo->bulkkey, &(cinfo->contentEncAlg));
-+ }
- }
-
- PK11SymKey *
- NSS_CMSContentInfo_GetBulkKey(NSSCMSContentInfo *cinfo)
- {
-- if (cinfo->bulkkey == NULL)
-+ if (cinfo == NULL || cinfo->bulkkey == NULL) {
- return NULL;
-+ }
-
- return PK11_ReferenceSymKey(cinfo->bulkkey);
- }
-@@ -371,5 +435,9 @@ NSS_CMSContentInfo_GetBulkKey(NSSCMSContentInfo *cinfo)
- int
- NSS_CMSContentInfo_GetBulkKeySize(NSSCMSContentInfo *cinfo)
- {
-+ if (cinfo == NULL) {
-+ return 0;
-+ }
-+
- return cinfo->keysize;
- }
-diff --git a/lib/smime/cmsdigdata.c b/lib/smime/cmsdigdata.c
-index 9ea22702e..a249686bb 100644
---- a/lib/smime/cmsdigdata.c
-+++ b/lib/smime/cmsdigdata.c
-@@ -56,7 +56,9 @@ void
- NSS_CMSDigestedData_Destroy(NSSCMSDigestedData *digd)
- {
- /* everything's in a pool, so don't worry about the storage */
-- NSS_CMSContentInfo_Destroy(&(digd->contentInfo));
-+ if (digd != NULL) {
-+ NSS_CMSContentInfo_Destroy(&(digd->contentInfo));
-+ }
- return;
- }
-
-diff --git a/lib/smime/cmsencdata.c b/lib/smime/cmsencdata.c
-index c3a4549ad..8b520b439 100644
---- a/lib/smime/cmsencdata.c
-+++ b/lib/smime/cmsencdata.c
-@@ -87,7 +87,9 @@ void
- NSS_CMSEncryptedData_Destroy(NSSCMSEncryptedData *encd)
- {
- /* everything's in a pool, so don't worry about the storage */
-- NSS_CMSContentInfo_Destroy(&(encd->contentInfo));
-+ if (encd != NULL) {
-+ NSS_CMSContentInfo_Destroy(&(encd->contentInfo));
-+ }
- return;
- }
-
-diff --git a/lib/smime/cmsenvdata.c b/lib/smime/cmsenvdata.c
-index f2c8e171d..9bc77be8b 100644
---- a/lib/smime/cmsenvdata.c
-+++ b/lib/smime/cmsenvdata.c
-@@ -144,6 +144,11 @@ NSS_CMSEnvelopedData_Encode_BeforeStart(NSSCMSEnvelopedData *envd)
- poolp = envd->cmsg->poolp;
- cinfo = &(envd->contentInfo);
-
-+ if (cinfo == NULL) {
-+ PORT_SetError(SEC_ERROR_BAD_DATA);
-+ goto loser;
-+ }
-+
- recipientinfos = envd->recipientInfos;
- if (recipientinfos == NULL) {
- PORT_SetError(SEC_ERROR_BAD_DATA);
-diff --git a/lib/smime/cmsmessage.c b/lib/smime/cmsmessage.c
-index f41a432b1..366b71aba 100644
---- a/lib/smime/cmsmessage.c
-+++ b/lib/smime/cmsmessage.c
-@@ -96,6 +96,9 @@ NSS_CMSMessage_SetEncodingParams(NSSCMSMessage *cmsg,
- void
- NSS_CMSMessage_Destroy(NSSCMSMessage *cmsg)
- {
-+ if (cmsg == NULL)
-+ return;
-+
- PORT_Assert(cmsg->refCount > 0);
- if (cmsg->refCount <= 0) { /* oops */
- return;
-diff --git a/lib/smime/cmsudf.c b/lib/smime/cmsudf.c
-index 3ef4268d4..5c8a81e6d 100644
---- a/lib/smime/cmsudf.c
-+++ b/lib/smime/cmsudf.c
-@@ -239,7 +239,7 @@ NSS_CMSGenericWrapperData_Destroy(SECOidTag type, NSSCMSGenericWrapperData *gd)
- {
- const nsscmstypeInfo *typeInfo = nss_cmstype_lookup(type);
-
-- if (typeInfo && typeInfo->destroy) {
-+ if (typeInfo && (typeInfo->destroy) && (gd != NULL)) {
- (*typeInfo->destroy)(gd);
- }
- }
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/nss/files/
@ 2020-03-09 10:44 Lars Wendler
0 siblings, 0 replies; 8+ messages in thread
From: Lars Wendler @ 2020-03-09 10:44 UTC (permalink / raw
To: gentoo-commits
commit: cb259fa219c08da7840594b6ab6bb004877c34aa
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 9 10:44:36 2020 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Mar 9 10:44:36 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb259fa2
dev-libs/nss: Whitespace fixes
Package-Manager: Portage-2.3.93, Repoman-2.3.20
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
dev-libs/nss/files/nss-3.47-gentoo-fixups.patch | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/dev-libs/nss/files/nss-3.47-gentoo-fixups.patch b/dev-libs/nss/files/nss-3.47-gentoo-fixups.patch
index 9bf9e016357..29b3a2a7232 100644
--- a/dev-libs/nss/files/nss-3.47-gentoo-fixups.patch
+++ b/dev-libs/nss/files/nss-3.47-gentoo-fixups.patch
@@ -131,8 +131,8 @@
+ nss)
+ lib_nss=yes
+ ;;
-+ nssutil)
-+ lib_nssutil=yes
++ nssutil)
++ lib_nssutil=yes
+ ;;
+ *)
+ usage 1 1>&2
@@ -187,7 +187,7 @@
+ libdirs="$libdirs -lnssutil${major_version}"
+ fi
+ echo $libdirs
-+fi
++fi
+
--- a/config/nss.pc.in
+++ b/config/nss.pc.in
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/nss/files/
@ 2020-06-29 21:03 Georgy Yakovlev
0 siblings, 0 replies; 8+ messages in thread
From: Georgy Yakovlev @ 2020-06-29 21:03 UTC (permalink / raw
To: gentoo-commits
commit: 5c5607e394bfaf88ebba5792ff2354e26c5707ee
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 29 20:59:31 2020 +0000
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Mon Jun 29 21:02:18 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c5607e3
dev-libs/nss: update ppc abi patch
Bug: https://bugs.gentoo.org/722110
Closes: https://bugs.gentoo.org/730172
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
dev-libs/nss/files/nss-3.53-fix-building-on-ppc.patch | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/dev-libs/nss/files/nss-3.53-fix-building-on-ppc.patch b/dev-libs/nss/files/nss-3.53-fix-building-on-ppc.patch
index be2d4802c4c..962b9cb1eed 100644
--- a/dev-libs/nss/files/nss-3.53-fix-building-on-ppc.patch
+++ b/dev-libs/nss/files/nss-3.53-fix-building-on-ppc.patch
@@ -1,9 +1,9 @@
https://bugzilla.mozilla.org/show_bug.cgi?id=1642174
-From 9e4f30b3168a95243df0c0891e3e432bc95382ad Mon Sep 17 00:00:00 2001
+From a7a862bab5e4aae4615ddae3cbe230345f92ed0d Mon Sep 17 00:00:00 2001
From: Lauri Kasanen <cand@gmx.com>
Date: Mon, 1 Jun 2020 12:11:45 +0300
-Subject: [PATCH v2] Bug 1642174 /usr/bin/ld: OBJS/Linux_SINGLE_SHLIB/sha512-p8.o:
+Subject: [PATCH v3] Bug 1642174 /usr/bin/ld: OBJS/Linux_SINGLE_SHLIB/sha512-p8.o:
ABI version 2 is not compatible with ABI version 1 output
Don't try to build the SHA-2 accelerated asm on old-ABI ppc.
@@ -17,7 +17,7 @@ Signed-off-by: Lauri Kasanen <cand@gmx.com>
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/lib/freebl/Makefile b/lib/freebl/Makefile
-index 5f7384429..d01587c7a 100644
+index 5f7384429..e0461c7d3 100644
--- a/lib/freebl/Makefile
+++ b/lib/freebl/Makefile
@@ -267,9 +267,12 @@ ifeq ($(CPU_ARCH),arm)
@@ -25,9 +25,9 @@ index 5f7384429..d01587c7a 100644
ifeq ($(CPU_ARCH),ppc)
EXTRA_SRCS += gcm-ppc.c
- ASFILES += sha512-p8.s
-+ PPC_ABI := $(shell $(CC) -dM -E - < /dev/null | grep _CALL_ELF | awk '{ print $3 }')
ifdef USE_64
DEFINES += -DNSS_NO_INIT_SUPPORT
++ PPC_ABI := $(shell $(CC) -dM -E - < /dev/null | awk '$$2 == "_CALL_ELF" {print $$3}')
+ ifeq ($(PPC_ABI),2)
+ ASFILES += sha512-p8.s
+ endif
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/nss/files/
@ 2024-01-13 18:51 Michał Górny
0 siblings, 0 replies; 8+ messages in thread
From: Michał Górny @ 2024-01-13 18:51 UTC (permalink / raw
To: gentoo-commits
commit: afd1d6dc608570610696906ba10fb5e07ae01e92
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sat Jan 13 14:46:38 2024 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Jan 13 18:50:51 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=afd1d6dc
dev-libs/nss: remove unused patches
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
.../nss/files/nss-3.79-fix-client-cert-crash.patch | 23 ---------------
dev-libs/nss/files/nss-3.79-gcc-13.patch | 33 ----------------------
2 files changed, 56 deletions(-)
diff --git a/dev-libs/nss/files/nss-3.79-fix-client-cert-crash.patch b/dev-libs/nss/files/nss-3.79-fix-client-cert-crash.patch
deleted file mode 100644
index 5f80fdc09b7e..000000000000
--- a/dev-libs/nss/files/nss-3.79-fix-client-cert-crash.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/lib/ssl/authcert.c b/lib/ssl/authcert.c
---- a/lib/ssl/authcert.c
-+++ b/lib/ssl/authcert.c
-@@ -212,17 +212,17 @@ NSS_GetClientAuthData(void *arg,
- pw_arg);
- } else {
- int nnames = 0;
- char **names = ssl_DistNamesToStrings(caNames, &nnames);
- rv = CERT_FilterCertListByCANames(certList, nnames, names,
- certUsageSSLClient);
- ssl_FreeDistNamesStrings(names, nnames);
- }
-- if ((rv != SECSuccess) || CERT_LIST_EMPTY(certList)) {
-+ if ((rv != SECSuccess) || (certList && CERT_LIST_EMPTY(certList))) {
- CERT_DestroyCertList(certList);
- certList = NULL;
- }
- }
- if (certList == NULL) {
- /* no user certs meeting the nickname/usage requirements found */
- return SECFailure;
- }
-
diff --git a/dev-libs/nss/files/nss-3.79-gcc-13.patch b/dev-libs/nss/files/nss-3.79-gcc-13.patch
deleted file mode 100644
index 04bd977f3020..000000000000
--- a/dev-libs/nss/files/nss-3.79-gcc-13.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-https://github.com/nss-dev/nss/commit/edf5cb12af8a4668997b7edb65c7add4a1390b09
-https://bugs.gentoo.org/849005
-
-From: Sergei Trofimovich <slyich@gmail.com>
-Date: Thu, 26 May 2022 08:08:39 +0000
-Subject: [PATCH] Bug 1771273 - cpputil/databuffer.h: add missing <cstdint>
- include r=nss-reviewers,mt
-
-Without the change build fails on this week's gcc-13 snapshot as:
-
- ../../cpputil/databuffer.h:20:20: error: 'uint8_t' does not name a type
- 20 | DataBuffer(const uint8_t* d, size_t l) : data_(nullptr), len_(0) {
- | ^~~~~~~
- ../../cpputil/databuffer.h:14:1: note: 'uint8_t' is defined in header '<cstdint>'; did you forget to '#include <cstdint>'?
- 13 | #include <iostream>
- +++ |+#include <cstdint>
- 14 |
-
-Differential Revision: https://phabricator.services.mozilla.com/D147404
-
---HG--
-extra : moz-landing-system : lando
---- a/cpputil/databuffer.h
-+++ b/cpputil/databuffer.h
-@@ -11,6 +11,7 @@
- #include <cstring>
- #include <iomanip>
- #include <iostream>
-+#include <cstdint>
-
- namespace nss_test {
-
-
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/nss/files/
@ 2024-04-18 19:32 Conrad Kostecki
0 siblings, 0 replies; 8+ messages in thread
From: Conrad Kostecki @ 2024-04-18 19:32 UTC (permalink / raw
To: gentoo-commits
commit: 3441fc53dc9616596df31c1aefc57cbc0c803b13
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Thu Apr 18 18:04:06 2024 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Thu Apr 18 19:31:43 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3441fc53
dev-libs/nss: remove unused patch
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
dev-libs/nss/files/nss-3.23-hppa-byte_order.patch | 16 ----------------
1 file changed, 16 deletions(-)
diff --git a/dev-libs/nss/files/nss-3.23-hppa-byte_order.patch b/dev-libs/nss/files/nss-3.23-hppa-byte_order.patch
deleted file mode 100644
index 63cfaddb808c..000000000000
--- a/dev-libs/nss/files/nss-3.23-hppa-byte_order.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- nss/lib/dbm/include/mcom_db.h
-+++ nss/lib/dbm/include/mcom_db.h
-@@ -110,11 +110,13 @@
- #endif /* !BYTE_ORDER */
- #endif /* __sun */
-
-+#ifndef BYTE_ORDER
- #if defined(__hpux) || defined(__hppa)
- #define BYTE_ORDER BIG_ENDIAN
- #define BIG_ENDIAN 4321
- #define LITTLE_ENDIAN 1234 /* LSB first: i386, vax, all NT risc */
- #endif
-+#endif /* !BYTE_ORDER */
-
- #if defined(AIXV3) || defined(AIX)
- /* BYTE_ORDER, LITTLE_ENDIAN, BIG_ENDIAN are all defined here */
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/nss/files/
@ 2024-11-22 23:22 Conrad Kostecki
0 siblings, 0 replies; 8+ messages in thread
From: Conrad Kostecki @ 2024-11-22 23:22 UTC (permalink / raw
To: gentoo-commits
commit: de7582c0b7f83aea822b0ee037ec32a7a695b369
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Wed Nov 20 16:48:36 2024 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Fri Nov 22 23:21:59 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de7582c0
dev-libs/nss: remove unused patch
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
.../nss/files/nss-3.106-disable-broken-tests.patch | 30 ----------------------
1 file changed, 30 deletions(-)
diff --git a/dev-libs/nss/files/nss-3.106-disable-broken-tests.patch b/dev-libs/nss/files/nss-3.106-disable-broken-tests.patch
deleted file mode 100644
index 2e711070344e..000000000000
--- a/dev-libs/nss/files/nss-3.106-disable-broken-tests.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff '--color=auto' -Naur a/tests/tools/tools.sh b/tests/tools/tools.sh
---- a/tests/tools/tools.sh 2024-10-27 18:25:18.489626868 +0200
-+++ b/tests/tools/tools.sh 2024-10-27 18:29:33.732940327 +0200
-@@ -540,26 +540,6 @@
- ret=$?
- html_msg $ret 0 "Importing private key pbmac1 hmac-sha-512 from PKCS#12 file"
- check_tmpfile
--
-- echo "${BINDIR}/pk12util -l ${TOOLSDIR}/data/pbmac1-invalid-bad-iter.p12 -d ${P_R_COPYDIR} -k ${R_PWFILE} -W '1234'"
-- ${BINDIR}/pk12util -l ${TOOLSDIR}/data/pbmac1-invalid-bad-iter.p12 -d ${P_R_COPYDIR} -k ${R_PWFILE} -W '1234' 2>&1
-- ret=$?
-- html_msg $ret 19 "Fail to list private key with bad iterator"
-- check_tmpfile
--
-- echo "${BINDIR}/pk12util -l ${TOOLSDIR}/data/pbmac1-invalid-bad-salt.p12 -d ${P_R_COPYDIR} -k ${R_PWFILE} -W '1234'"
-- ${BINDIR}/pk12util -l ${TOOLSDIR}/data/pbmac1-invalid-bad-salt.p12 -d ${P_R_COPYDIR} -k ${R_PWFILE} -W '1234' 2>&1
-- ret=$?
-- echo "Fail to list private key with bad salt val=$ret"
-- html_msg $ret 19 "Fail to import private key with bad salt"
-- check_tmpfile
--
-- echo "${BINDIR}/pk12util -l ${TOOLSDIR}/data/pbmac1-invalid-no-length.p12 -d ${P_R_COPYDIR} -k ${R_PWFILE} -W '1234'"
-- ${BINDIR}/pk12util -l ${TOOLSDIR}/data/pbmac1-invalid-no-length.p12 -d ${P_R_COPYDIR} -k ${R_PWFILE} -W '1234' 2>&1
-- ret=$?
-- echo "Fail to import private key with no length val=$ret"
-- html_msg $ret 19 "Fail to import private key with no length"
-- check_tmpfile
- }
-
- ############################## tools_p12 ###############################
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/nss/files/
@ 2025-01-04 22:47 Conrad Kostecki
0 siblings, 0 replies; 8+ messages in thread
From: Conrad Kostecki @ 2025-01-04 22:47 UTC (permalink / raw
To: gentoo-commits
commit: d04c1df10dda5f9494befc12dfc2ab2de6f2d575
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Fri Jan 3 15:31:40 2025 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sat Jan 4 22:47:06 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d04c1df1
dev-libs/nss: remove unused patches
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
...s-3.106-bmo-1927096-fix-broken-test-files.patch | 33 ---------
.../nss-3.90-remove-support-of-curve25519.patch | 78 ----------------------
.../nss/files/nss-3.90.2-backport-D180718.patch | 35 ----------
...-1885749-disable-ASM-C25519-on-non-X86_64.patch | 35 ----------
4 files changed, 181 deletions(-)
diff --git a/dev-libs/nss/files/nss-3.106-bmo-1927096-fix-broken-test-files.patch b/dev-libs/nss/files/nss-3.106-bmo-1927096-fix-broken-test-files.patch
deleted file mode 100644
index 069e97e6aacf..000000000000
--- a/dev-libs/nss/files/nss-3.106-bmo-1927096-fix-broken-test-files.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/tests/tools/tools.sh b/tests/tools/tools.sh
---- a/tests/tools/tools.sh
-+++ b/tests/tools/tools.sh
-@@ -542,25 +542,25 @@
- check_tmpfile
-
- echo "${BINDIR}/pk12util -l ${TOOLSDIR}/data/pbmac1-invalid-bad-iter.p12 -d ${P_R_COPYDIR} -k ${R_PWFILE} -W '1234'"
- ${BINDIR}/pk12util -l ${TOOLSDIR}/data/pbmac1-invalid-bad-iter.p12 -d ${P_R_COPYDIR} -k ${R_PWFILE} -W '1234' 2>&1
- ret=$?
-- html_msg $ret 19 "Fail to list private key with bad iterator"
-+ html_msg $ret 17 "Fail to list private key with bad iterator"
- check_tmpfile
-
- echo "${BINDIR}/pk12util -l ${TOOLSDIR}/data/pbmac1-invalid-bad-salt.p12 -d ${P_R_COPYDIR} -k ${R_PWFILE} -W '1234'"
- ${BINDIR}/pk12util -l ${TOOLSDIR}/data/pbmac1-invalid-bad-salt.p12 -d ${P_R_COPYDIR} -k ${R_PWFILE} -W '1234' 2>&1
- ret=$?
- echo "Fail to list private key with bad salt val=$ret"
-- html_msg $ret 19 "Fail to import private key with bad salt"
-+ html_msg $ret 17 "Fail to import private key with bad salt"
- check_tmpfile
-
- echo "${BINDIR}/pk12util -l ${TOOLSDIR}/data/pbmac1-invalid-no-length.p12 -d ${P_R_COPYDIR} -k ${R_PWFILE} -W '1234'"
- ${BINDIR}/pk12util -l ${TOOLSDIR}/data/pbmac1-invalid-no-length.p12 -d ${P_R_COPYDIR} -k ${R_PWFILE} -W '1234' 2>&1
- ret=$?
- echo "Fail to import private key with no length val=$ret"
-- html_msg $ret 19 "Fail to import private key with no length"
-+ html_msg $ret 17 "Fail to import private key with no length"
- check_tmpfile
- }
-
- ############################## tools_p12 ###############################
- # local shell function to test basic functionality of pk12util
-
diff --git a/dev-libs/nss/files/nss-3.90-remove-support-of-curve25519.patch b/dev-libs/nss/files/nss-3.90-remove-support-of-curve25519.patch
deleted file mode 100644
index d883db8181d1..000000000000
--- a/dev-libs/nss/files/nss-3.90-remove-support-of-curve25519.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-# HG changeset patch
-# User Natalia Kulatova <nkulatova@mozilla.com>
-# Date 1687519432 0
-# Fri Jun 23 11:23:52 2023 +0000
-# Node ID 653f4c1b58425219c0e9c005d555994a3fe1fa72
-# Parent f095bf91ffaa273ea38ca6df34c905e5442de012
-Bug 1836925 - Removing the support of Curve25519 r=bbeurdouche,nss-reviewers
-
-Differential Revision: https://phabricator.services.mozilla.com/D180068
-
-diff -r f095bf91ffaa -r 653f4c1b5842 lib/freebl/Makefile
---- a/lib/freebl/Makefile Fri Jun 23 08:56:27 2023 +0000
-+++ b/lib/freebl/Makefile Fri Jun 23 11:23:52 2023 +0000
-@@ -568,9 +568,6 @@
- HAVE_INT128_SUPPORT = 1
- DEFINES += -DHAVE_INT128_SUPPORT
- else ifeq (1,$(CC_IS_GCC))
-- ifeq ($(CPU_ARCH),x86_64)
-- SUPPORTS_VALE_CURVE25519 = 1
-- endif
- ifneq (,$(filter 4.6 4.7 4.8 4.9,$(word 1,$(GCC_VERSION)).$(word 2,$(GCC_VERSION))))
- HAVE_INT128_SUPPORT = 1
- DEFINES += -DHAVE_INT128_SUPPORT
-@@ -595,11 +592,6 @@
- DEFINES += -DKRML_VERIFIED_UINT128
- endif
-
--ifdef SUPPORTS_VALE_CURVE25519
-- VERIFIED_SRCS += Hacl_Curve25519_64.c
-- DEFINES += -DHACL_CAN_COMPILE_INLINE_ASM
--endif
--
- ifndef NSS_DISABLE_CHACHAPOLY
- ifeq ($(CPU_ARCH),x86_64)
- ifndef NSS_DISABLE_AVX2
-diff -r f095bf91ffaa -r 653f4c1b5842 lib/freebl/freebl.gyp
---- a/lib/freebl/freebl.gyp Fri Jun 23 08:56:27 2023 +0000
-+++ b/lib/freebl/freebl.gyp Fri Jun 23 11:23:52 2023 +0000
-@@ -866,12 +866,6 @@
- }],
- ],
- }],
-- [ 'supports_vale_curve25519==1', {
-- 'defines': [
-- # The Makefile does version-tests on GCC, but we're not doing that here.
-- 'HACL_CAN_COMPILE_INLINE_ASM',
-- ],
-- }],
- [ 'OS=="linux" or OS=="android"', {
- 'conditions': [
- [ 'target_arch=="x64"', {
-@@ -934,11 +928,6 @@
- 'variables': {
- 'module': 'nss',
- 'conditions': [
-- [ 'target_arch=="x64" and cc_is_gcc==1', {
-- 'supports_vale_curve25519%': 1,
-- }, {
-- 'supports_vale_curve25519%': 0,
-- }],
- [ 'target_arch=="x64" or target_arch=="arm64" or target_arch=="aarch64"', {
- 'have_int128_support%': 1,
- }, {
-diff -r f095bf91ffaa -r 653f4c1b5842 lib/freebl/freebl_base.gypi
---- a/lib/freebl/freebl_base.gypi Fri Jun 23 08:56:27 2023 +0000
-+++ b/lib/freebl/freebl_base.gypi Fri Jun 23 11:23:52 2023 +0000
-@@ -154,11 +154,6 @@
- 'ecl/curve25519_32.c',
- ],
- }],
-- ['supports_vale_curve25519==1', {
-- 'sources': [
-- 'verified/Hacl_Curve25519_64.c',
-- ],
-- }],
- ['(target_arch!="ppc64" and target_arch!="ppc64le") or disable_altivec==1', {
- 'sources': [
- # Gyp does not support per-file cflags, so working around like this.
diff --git a/dev-libs/nss/files/nss-3.90.2-backport-D180718.patch b/dev-libs/nss/files/nss-3.90.2-backport-D180718.patch
deleted file mode 100644
index 102ed5227488..000000000000
--- a/dev-libs/nss/files/nss-3.90.2-backport-D180718.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-https://github.com/nss-dev/nss/commit/6ab861ba652985ce5985a3fb1ddc87a15aac5027
-https://bugzilla.mozilla.org/show_bug.cgi?id=1835357
-https://phabricator.services.mozilla.com/D180718
-
-From 6ab861ba652985ce5985a3fb1ddc87a15aac5027 Mon Sep 17 00:00:00 2001
-From: Robert Relyea <rrelyea@redhat.com>
-Date: Mon, 12 Jun 2023 11:18:03 -0700
-Subject: [PATCH] Bug 1835357 dbtests.sh failure in "certutil dump keys with
- explicit default trust flags" r=jschanck
-
- Fix the time value so we don't fail on slower or overloaded platforms.
-
- bob
-
-Differential Revision: https://phabricator.services.mozilla.com/D180718
-
---HG--
-extra : rebase_source : 3fb50de29dbf5f635cae10e962eb995c25cd108a
----
- tests/dbtests/dbtests.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/dbtests/dbtests.sh b/tests/dbtests/dbtests.sh
-index b0b195d4d0..c82ea85caf 100755
---- a/tests/dbtests/dbtests.sh
-+++ b/tests/dbtests/dbtests.sh
-@@ -366,7 +366,7 @@ dbtest_main()
- RARRAY=($dtime)
- TIMEARRAY=(${RARRAY[1]//./ })
- echo "${TIMEARRAY[0]} seconds"
-- test ${TIMEARRAY[0]} -lt 2
-+ test ${TIMEARRAY[0]} -lt 5
- ret=$?
- html_msg ${ret} 0 "certutil dump keys with explicit default trust flags"
- fi
diff --git a/dev-libs/nss/files/nss-3.90.2-bmo-1885749-disable-ASM-C25519-on-non-X86_64.patch b/dev-libs/nss/files/nss-3.90.2-bmo-1885749-disable-ASM-C25519-on-non-X86_64.patch
deleted file mode 100644
index e5769308144c..000000000000
--- a/dev-libs/nss/files/nss-3.90.2-bmo-1885749-disable-ASM-C25519-on-non-X86_64.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-
-# HG changeset patch
-# User Natalia Kulatova <nkulatova@mozilla.com>
-# Date 1685981398 0
-# Node ID 52a5d8fe37410d940e7d3ca244146ebc46a7d52a
-# Parent 52969cff7db635e0ee10fad66eed2c0cfdcf999b
-Bug 1836781 - Disabling ASM C25519 for A but X86_64 r=bbeurdouche,nss-reviewers
-
-Differential Revision: https://phabricator.services.mozilla.com/D179969
-
-diff --git a/lib/freebl/Makefile b/lib/freebl/Makefile
---- a/lib/freebl/Makefile
-+++ b/lib/freebl/Makefile
-@@ -563,17 +563,19 @@ endif # target == SunO
- ifdef USE_64
- # no __int128 at least up to lcc 1.23 (pretending to be gcc5)
- # NB: CC_NAME is not defined here
- ifneq ($(shell $(CC) -? 2>&1 >/dev/null </dev/null | sed -e 's/:.*//;1q'),lcc)
- ifdef CC_IS_CLANG
- HAVE_INT128_SUPPORT = 1
- DEFINES += -DHAVE_INT128_SUPPORT
- else ifeq (1,$(CC_IS_GCC))
-- SUPPORTS_VALE_CURVE25519 = 1
-+ ifeq ($(CPU_ARCH),x86_64)
-+ SUPPORTS_VALE_CURVE25519 = 1
-+ endif
- ifneq (,$(filter 4.6 4.7 4.8 4.9,$(word 1,$(GCC_VERSION)).$(word 2,$(GCC_VERSION))))
- HAVE_INT128_SUPPORT = 1
- DEFINES += -DHAVE_INT128_SUPPORT
- endif
- ifneq (,$(filter 0 1 2 3 4,$(word 1,$(GCC_VERSION))))
- NSS_DISABLE_AVX2 = 1
- endif
- ifeq (,$(filter 0 1 2 3 4,$(word 1,$(GCC_VERSION))))
-
^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2025-01-04 22:47 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-05-12 20:54 [gentoo-commits] repo/gentoo:master commit in: dev-libs/nss/files/ Lars Wendler
-- strict thread matches above, loose matches on Subject: below --
2020-01-02 18:34 Thomas Deutschmann
2020-03-09 10:44 Lars Wendler
2020-06-29 21:03 Georgy Yakovlev
2024-01-13 18:51 Michał Górny
2024-04-18 19:32 Conrad Kostecki
2024-11-22 23:22 Conrad Kostecki
2025-01-04 22:47 Conrad Kostecki
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox