Commit 0b298100 authored by Christoph Moench-Tegeder's avatar Christoph Moench-Tegeder
Browse files

security/nss: update to 3.123 

Announcement:
  https://groups.google.com/a/mozilla.org/g/dev-tech-crypto/c/AW6VHkn6E0o

Patch patch-lib_softoken_pkcs11c.c was dropped - it is unclear if it
was still relevant. The last discussion of the problem this patch was
supposed to fix happened >15 years ago, and nothing came out of that.
parent af1bd584

security/nss/Makefile

+1 −1
Original line number Diff line number Diff line 
PORTNAME=	nss

DISTVERSION=	3.122.1

DISTVERSION=	3.123

CATEGORIES=	security

MASTER_SITES=	MOZILLA/security/${PORTNAME}/releases/${DISTNAME:tu:C/[-.]/_/g}_RTM/src

security/nss/distinfo

+3 −3
Original line number Diff line number Diff line 
TIMESTAMP = 1776190262

SHA256 (nss-3.122.1.tar.gz) = de5a655da82a67e502b802ae0b53f3eb02ea53f509c3fc0ab54a892e04493bbf

SIZE (nss-3.122.1.tar.gz) = 77656779
 
TIMESTAMP = 1776440372

SHA256 (nss-3.123.tar.gz) = 2145113398a269779a7390515a1638800836b130248e33f93243268c026d4e49

SIZE (nss-3.123.tar.gz) = 77762089

security/nss/files/patch-lib_softoken_pkcs11c.c

deleted100644 → 0
+0 −22
Original line number Diff line number Diff line 
--- lib/softoken/pkcs11c.c.orig	2020-05-01 21:08:55 UTC

+++ lib/softoken/pkcs11c.c

@@ -6106,9 +6106,6 @@ sftk_unwrapPrivateKey(SFTKObject *key, SECItem *bpki)

             break;

         case NSSLOWKEYDSAKey:

             keyType = CKK_DSA;

-            crv = (sftk_hasAttribute(key, CKA_NSS_DB)) ? CKR_OK : CKR_KEY_TYPE_INCONSISTENT;

-            if (crv != CKR_OK)

-                break;

             crv = sftk_AddAttributeType(key, CKA_KEY_TYPE, &keyType,

                                         sizeof(keyType));

             if (crv != CKR_OK)

@@ -6148,9 +6145,6 @@ sftk_unwrapPrivateKey(SFTKObject *key, SECItem *bpki)

         /* what about fortezza??? */

         case NSSLOWKEYECKey:

             keyType = CKK_EC;

-            crv = (sftk_hasAttribute(key, CKA_NSS_DB)) ? CKR_OK : CKR_KEY_TYPE_INCONSISTENT;

-            if (crv != CKR_OK)

-                break;

             crv = sftk_AddAttributeType(key, CKA_KEY_TYPE, &keyType,

                                         sizeof(keyType));

             if (crv != CKR_OK)