diff options
| author | Jan Beich <jbeich@FreeBSD.org> | 2020-05-04 18:27:51 +0000 |
|---|---|---|
| committer | Jan Beich <jbeich@FreeBSD.org> | 2020-05-04 18:27:51 +0000 |
| commit | 23dc7dffef4cb31eeb2fb5f2712b398ed23cd339 (patch) | |
| tree | 5274e0f9631d746fd00faafa10733c0165746c50 /security | |
| parent | d255ff958e1078926f9f0af158d514a591c7f284 (diff) | |
| download | ports-23dc7dffef4cb31eeb2fb5f2712b398ed23cd339.tar.gz ports-23dc7dffef4cb31eeb2fb5f2712b398ed23cd339.zip | |
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)
Notes
Notes:
svn path=/branches/2020Q2/; revision=533941
Diffstat (limited to 'security')
| -rw-r--r-- | security/ca_root_nss/Makefile | 2 | ||||
| -rw-r--r-- | security/ca_root_nss/distinfo | 6 | ||||
| -rw-r--r-- | security/nss/Makefile | 2 | ||||
| -rw-r--r-- | security/nss/distinfo | 6 | ||||
| -rw-r--r-- | security/nss/files/patch-lib_softoken_pkcs11c.c | 10 |
5 files changed, 13 insertions, 13 deletions
diff --git a/security/ca_root_nss/Makefile b/security/ca_root_nss/Makefile index c36f59b0e128..b578c58825c0 100644 --- a/security/ca_root_nss/Makefile +++ b/security/ca_root_nss/Makefile @@ -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 diff --git a/security/ca_root_nss/distinfo b/security/ca_root_nss/distinfo index 8baf596c29bc..6d486736039c 100644 --- a/security/ca_root_nss/distinfo +++ b/security/ca_root_nss/distinfo @@ -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 diff --git a/security/nss/Makefile b/security/nss/Makefile index 6563d8594347..9572662aa4a4 100644 --- a/security/nss/Makefile +++ b/security/nss/Makefile @@ -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 diff --git a/security/nss/distinfo b/security/nss/distinfo index 8baf596c29bc..6d486736039c 100644 --- a/security/nss/distinfo +++ b/security/nss/distinfo @@ -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 diff --git a/security/nss/files/patch-lib_softoken_pkcs11c.c b/security/nss/files/patch-lib_softoken_pkcs11c.c index 939bd87d241d..5acfe3f87c7b 100644 --- a/security/nss/files/patch-lib_softoken_pkcs11c.c +++ b/security/nss/files/patch-lib_softoken_pkcs11c.c @@ -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, |