svn commit: r533941 - in branches/2020Q2/security: ca_root_nss nss nss/files

[Jan Beich]

Author: jbeich
Date: Mon May  4 18:27:51 2020
New Revision: 533941
URL: https://svnweb.freebsd.org/changeset/ports/533941

Log:
  MFH: r533597
  
  security/nss: update to 3.52
  
  Changes:	https://developer.mozilla.org/docs/Mozilla/Projects/NSS/NSS_3.52_release_notes
  Changes:	https://hg.mozilla.org/projects/nss/shortlog/NSS_3_52_RTM
  ABI:		https://abi-laboratory.pro/tracker/timeline/nss/
  Approved by:	ports-secteam blanket (required by Firefox 77)

Modified:
  branches/2020Q2/security/ca_root_nss/Makefile
  branches/2020Q2/security/ca_root_nss/distinfo
  branches/2020Q2/security/nss/Makefile
  branches/2020Q2/security/nss/distinfo
  branches/2020Q2/security/nss/files/patch-lib_softoken_pkcs11c.c
Directory Properties:
  branches/2020Q2/   (props changed)

Modified: branches/2020Q2/security/ca_root_nss/Makefile
==============================================================================
--- branches/2020Q2/security/ca_root_nss/Makefile	Mon May  4 18:27:51 2020	(r533940)
+++ branches/2020Q2/security/ca_root_nss/Makefile	Mon May  4 18:27:51 2020	(r533941)
@@ -32,7 +32,7 @@ PLIST_SUB+=	CERTDIR=${CERTDIR}
 # !!!  Please DO NOT submit patches for new version until it has !!!
 # !!!  been committed there first.                               !!!
 # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-VERSION_NSS=	3.51.1
+VERSION_NSS=	3.52
 #NSS_SUFFIX=	-with-ckbi-1.98
 CERTDATA_TXT_PATH=	nss-${VERSION_NSS}/nss/lib/ckfw/builtins/certdata.txt
 BUNDLE_PROCESSOR=	MAca-bundle.pl

Modified: branches/2020Q2/security/ca_root_nss/distinfo
==============================================================================
--- branches/2020Q2/security/ca_root_nss/distinfo	Mon May  4 18:27:51 2020	(r533940)
+++ branches/2020Q2/security/ca_root_nss/distinfo	Mon May  4 18:27:51 2020	(r533941)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1585948897
-SHA256 (nss-3.51.1.tar.gz) = 085c5eaceef040eddea639e2e068e70f0e368f840327a678ef74ae3d6c15ca78
-SIZE (nss-3.51.1.tar.gz) = 78310874
+TIMESTAMP = 1588367335
+SHA256 (nss-3.52.tar.gz) = 0a0aeb0cdda65ddcb64f746223df58b150f6803f4bfa1a4e876bbe6f9c4c1561
+SIZE (nss-3.52.tar.gz) = 81220587

Modified: branches/2020Q2/security/nss/Makefile
==============================================================================
--- branches/2020Q2/security/nss/Makefile	Mon May  4 18:27:51 2020	(r533940)
+++ branches/2020Q2/security/nss/Makefile	Mon May  4 18:27:51 2020	(r533941)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	nss
-PORTVERSION=	3.51.1
+PORTVERSION=	3.52
 CATEGORIES=	security
 MASTER_SITES=	MOZILLA/security/${PORTNAME}/releases/${DISTNAME:tu:C/[-.]/_/g}_RTM/src
 

Modified: branches/2020Q2/security/nss/distinfo
==============================================================================
--- branches/2020Q2/security/nss/distinfo	Mon May  4 18:27:51 2020	(r533940)
+++ branches/2020Q2/security/nss/distinfo	Mon May  4 18:27:51 2020	(r533941)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1585948897
-SHA256 (nss-3.51.1.tar.gz) = 085c5eaceef040eddea639e2e068e70f0e368f840327a678ef74ae3d6c15ca78
-SIZE (nss-3.51.1.tar.gz) = 78310874
+TIMESTAMP = 1588367335
+SHA256 (nss-3.52.tar.gz) = 0a0aeb0cdda65ddcb64f746223df58b150f6803f4bfa1a4e876bbe6f9c4c1561
+SIZE (nss-3.52.tar.gz) = 81220587

Modified: branches/2020Q2/security/nss/files/patch-lib_softoken_pkcs11c.c
==============================================================================
--- branches/2020Q2/security/nss/files/patch-lib_softoken_pkcs11c.c	Mon May  4 18:27:51 2020	(r533940)
+++ branches/2020Q2/security/nss/files/patch-lib_softoken_pkcs11c.c	Mon May  4 18:27:51 2020	(r533941)
@@ -1,20 +1,20 @@
---- lib/softoken/pkcs11c.c.orig	2018-08-31 12:55:53 UTC
+--- lib/softoken/pkcs11c.c.orig	2020-05-01 21:08:55 UTC
 +++ lib/softoken/pkcs11c.c
-@@ -5772,9 +5772,6 @@ sftk_unwrapPrivateKey(SFTKObject *key, SECItem *bpki)
+@@ -6106,9 +6106,6 @@ sftk_unwrapPrivateKey(SFTKObject *key, SECItem *bpki)
              break;
          case NSSLOWKEYDSAKey:
              keyType = CKK_DSA;
--            crv = (sftk_hasAttribute(key, CKA_NETSCAPE_DB)) ? CKR_OK : CKR_KEY_TYPE_INCONSISTENT;
+-            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)
-@@ -5814,9 +5811,6 @@ sftk_unwrapPrivateKey(SFTKObject *key, SECItem *bpki)
+@@ -6148,9 +6145,6 @@ sftk_unwrapPrivateKey(SFTKObject *key, SECItem *bpki)
          /* what about fortezza??? */
          case NSSLOWKEYECKey:
              keyType = CKK_EC;
--            crv = (sftk_hasAttribute(key, CKA_NETSCAPE_DB)) ? CKR_OK : CKR_KEY_TYPE_INCONSISTENT;
+-            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,