nss: Update to 3.62

* Change header files installation suggested by markd@.
  Do not install dbm header files and install nss header files
  under nss, not nss/nss.

Changelog:
Bugs fixed in NSS 3.62

    Bug 1688374 - Fix parallel build NSS-3.61 with make.
    Bug 1682044 - pkix_Build_GatherCerts() + pkix_CacheCert_Add() can corrupt "cachedCertTable".
    Bug 1690583 - Fix CH padding extension size calculation.
    Bug 1690421 - Adjust 3.62 ABI report formatting for new libabigail.
    Bug 1690421 - Install packaged libabigail in docker-builds image.
    Bug 1689228 - Minor ECH -09 fixes for interop testing, fuzzing.
    Bug 1674819 - Fixup a51fae403328, enum type may be signed.
    Bug 1681585 - Add ECH support to selfserv.
    Bug 1681585 - Update ECH to Draft-09.
    Bug 1678398 - Add Export/Import functions for HPKE context.
    Bug 1678398 - Update HPKE to draft-07.

3 files changed, 110 insertions, 113 deletions

diff --git a/devel/nss/Makefile b/devel/nss/Makefile
index 5a2e7fb2998..9ab5bdfd431 100644
--- a/devel/nss/Makefile
+++ b/devel/nss/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.197 2021/01/27 16:28:20 ryoon Exp $
+# $NetBSD: Makefile,v 1.198 2021/03/09 03:44:23 ryoon Exp $
 
 DISTNAME=		nss-${NSS_RELEASE:S/.0$//}
-NSS_RELEASE=		3.61.0
+NSS_RELEASE=		3.62.0
 CATEGORIES=		devel security
 MASTER_SITES=		${MASTER_SITE_MOZILLA_ALL:=security/nss/releases/NSS_${NSS_DIST_DIR_VERSION:S/_0$//}_RTM/src/}
 
@@ -121,7 +121,7 @@ post-extract:
 	${CP} ${FILESDIR}/nss-config.in ${WRKSRC}/nss-config
 
 do-install:
-	(cd ${DIST}/public && pax -Lrw . ${DESTDIR}${PREFIX}/include/nss/ )
+	(cd ${DIST}/public/nss && pax -Lrw . ${DESTDIR}${PREFIX}/include/nss )
 	(cd ${DIST}/*_OPT.OBJ/lib && \
 		pax -Lrw *.${SO_SUFFIX} ${DESTDIR}${PREFIX}/lib/nss/ )
 	${INSTALL_DATA} ${DIST}/*_OPT.OBJ/lib/libcrmf.a \
diff --git a/devel/nss/PLIST b/devel/nss/PLIST
index c66594c86e1..5fea64060dd 100644
--- a/devel/nss/PLIST
+++ b/devel/nss/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.26 2020/10/31 19:36:30 wiz Exp $
+@comment $NetBSD: PLIST,v 1.27 2021/03/09 03:44:23 ryoon Exp $
 bin/certutil
 bin/cmsutil
 bin/crlutil
@@ -23,110 +23,107 @@ bin/strsclnt
 bin/symkeyutil
 bin/vfychain
 bin/vfyserv
-include/nss/dbm/mcom_db.h
-include/nss/dbm/ncompat.h
-include/nss/dbm/winfile.h
-include/nss/nss/base64.h
-include/nss/nss/blapit.h
-include/nss/nss/cert.h
-include/nss/nss/certdb.h
-include/nss/nss/certt.h
-include/nss/nss/ciferfam.h
-include/nss/nss/cmmf.h
-include/nss/nss/cmmft.h
-include/nss/nss/cms.h
-include/nss/nss/cmsreclist.h
-include/nss/nss/cmst.h
-include/nss/nss/crmf.h
-include/nss/nss/crmft.h
-include/nss/nss/cryptohi.h
-include/nss/nss/cryptoht.h
-include/nss/nss/eccutil.h
-include/nss/nss/ecl-exp.h
-include/nss/nss/hasht.h
-include/nss/nss/jar-ds.h
-include/nss/nss/jar.h
-include/nss/nss/jarfile.h
-include/nss/nss/key.h
-include/nss/nss/keyhi.h
-include/nss/nss/keyt.h
-include/nss/nss/keythi.h
-include/nss/nss/lowkeyi.h
-include/nss/nss/lowkeyti.h
-include/nss/nss/nss.h
-include/nss/nss/nssb64.h
-include/nss/nss/nssb64t.h
-include/nss/nss/nssbase.h
-include/nss/nss/nssbaset.h
-include/nss/nss/nssck.api
-include/nss/nss/nssckbi.h
-include/nss/nss/nssckepv.h
-include/nss/nss/nssckft.h
-include/nss/nss/nssckfw.h
-include/nss/nss/nssckfwc.h
-include/nss/nss/nssckfwt.h
-include/nss/nss/nssckg.h
-include/nss/nss/nssckmdt.h
-include/nss/nss/nssckt.h
-include/nss/nss/nssilckt.h
-include/nss/nss/nssilock.h
-include/nss/nss/nsslocks.h
-include/nss/nss/nssrwlk.h
-include/nss/nss/nssrwlkt.h
-include/nss/nss/nssutil.h
-include/nss/nss/ocsp.h
-include/nss/nss/ocspt.h
-include/nss/nss/p12.h
-include/nss/nss/p12plcy.h
-include/nss/nss/p12t.h
-include/nss/nss/pk11func.h
-include/nss/nss/pk11hpke.h
-include/nss/nss/pk11pqg.h
-include/nss/nss/pk11priv.h
-include/nss/nss/pk11pub.h
-include/nss/nss/pk11sdr.h
-include/nss/nss/pkcs11.h
-include/nss/nss/pkcs11f.h
-include/nss/nss/pkcs11n.h
-include/nss/nss/pkcs11p.h
-include/nss/nss/pkcs11t.h
-include/nss/nss/pkcs11u.h
-include/nss/nss/pkcs11uri.h
-include/nss/nss/pkcs12.h
-include/nss/nss/pkcs12t.h
-include/nss/nss/pkcs1sig.h
-include/nss/nss/pkcs7t.h
-include/nss/nss/portreg.h
-include/nss/nss/preenc.h
-include/nss/nss/secasn1.h
-include/nss/nss/secasn1t.h
-include/nss/nss/seccomon.h
-include/nss/nss/secder.h
-include/nss/nss/secdert.h
-include/nss/nss/secdig.h
-include/nss/nss/secdigt.h
-include/nss/nss/secerr.h
-include/nss/nss/sechash.h
-include/nss/nss/secitem.h
-include/nss/nss/secmime.h
-include/nss/nss/secmod.h
-include/nss/nss/secmodt.h
-include/nss/nss/secoid.h
-include/nss/nss/secoidt.h
-include/nss/nss/secpkcs5.h
-include/nss/nss/secpkcs7.h
-include/nss/nss/secport.h
-include/nss/nss/shsign.h
-include/nss/nss/smime.h
-include/nss/nss/ssl.h
-include/nss/nss/sslerr.h
-include/nss/nss/sslexp.h
-include/nss/nss/sslproto.h
-include/nss/nss/sslt.h
-include/nss/nss/utilmodt.h
-include/nss/nss/utilpars.h
-include/nss/nss/utilparst.h
-include/nss/nss/utilrename.h
+include/nss/base64.h
+include/nss/blapit.h
+include/nss/cert.h
+include/nss/certdb.h
+include/nss/certt.h
+include/nss/ciferfam.h
+include/nss/cmmf.h
+include/nss/cmmft.h
+include/nss/cms.h
+include/nss/cmsreclist.h
+include/nss/cmst.h
+include/nss/crmf.h
+include/nss/crmft.h
+include/nss/cryptohi.h
+include/nss/cryptoht.h
+include/nss/eccutil.h
+include/nss/ecl-exp.h
+include/nss/hasht.h
+include/nss/jar-ds.h
+include/nss/jar.h
+include/nss/jarfile.h
+include/nss/key.h
+include/nss/keyhi.h
+include/nss/keyt.h
+include/nss/keythi.h
+include/nss/lowkeyi.h
+include/nss/lowkeyti.h
+include/nss/nss.h
+include/nss/nssb64.h
+include/nss/nssb64t.h
+include/nss/nssbase.h
+include/nss/nssbaset.h
+include/nss/nssck.api
+include/nss/nssckbi.h
+include/nss/nssckepv.h
+include/nss/nssckft.h
+include/nss/nssckfw.h
+include/nss/nssckfwc.h
+include/nss/nssckfwt.h
+include/nss/nssckg.h
+include/nss/nssckmdt.h
+include/nss/nssckt.h
+include/nss/nssilckt.h
+include/nss/nssilock.h
+include/nss/nsslocks.h
+include/nss/nssrwlk.h
+include/nss/nssrwlkt.h
+include/nss/nssutil.h
+include/nss/ocsp.h
+include/nss/ocspt.h
+include/nss/p12.h
+include/nss/p12plcy.h
+include/nss/p12t.h
+include/nss/pk11func.h
+include/nss/pk11hpke.h
+include/nss/pk11pqg.h
+include/nss/pk11priv.h
+include/nss/pk11pub.h
+include/nss/pk11sdr.h
+include/nss/pkcs11.h
+include/nss/pkcs11f.h
+include/nss/pkcs11n.h
+include/nss/pkcs11p.h
+include/nss/pkcs11t.h
+include/nss/pkcs11u.h
+include/nss/pkcs11uri.h
+include/nss/pkcs12.h
+include/nss/pkcs12t.h
+include/nss/pkcs1sig.h
+include/nss/pkcs7t.h
+include/nss/portreg.h
+include/nss/preenc.h
+include/nss/secasn1.h
+include/nss/secasn1t.h
+include/nss/seccomon.h
+include/nss/secder.h
+include/nss/secdert.h
+include/nss/secdig.h
+include/nss/secdigt.h
+include/nss/secerr.h
+include/nss/sechash.h
+include/nss/secitem.h
+include/nss/secmime.h
+include/nss/secmod.h
+include/nss/secmodt.h
+include/nss/secoid.h
+include/nss/secoidt.h
+include/nss/secpkcs5.h
+include/nss/secpkcs7.h
+include/nss/secport.h
+include/nss/shsign.h
+include/nss/smime.h
+include/nss/ssl.h
+include/nss/sslerr.h
+include/nss/sslexp.h
+include/nss/sslproto.h
+include/nss/sslt.h
+include/nss/utilmodt.h
+include/nss/utilpars.h
+include/nss/utilparst.h
+include/nss/utilrename.h
 lib/nss/libcrmf.a
 lib/nss/libfreebl3.so
 lib/nss/libnss3.so
diff --git a/devel/nss/distinfo b/devel/nss/distinfo
index 02f5023b9da..b0065d6b5b7 100644
--- a/devel/nss/distinfo
+++ b/devel/nss/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.122 2021/01/27 16:28:20 ryoon Exp $
+$NetBSD: distinfo,v 1.123 2021/03/09 03:44:23 ryoon Exp $
 
-SHA1 (nss-3.61.tar.gz) = 26ffe516cb4b374f765c0818cca03afe09e15292
-RMD160 (nss-3.61.tar.gz) = 56fcd9d617f4b537314f849fc8b3e79e3e0f03bf
-SHA512 (nss-3.61.tar.gz) = b2fb2288d20b49097b6b24286ee39ec839ebabe2a84afe2d6a31dbefa9c2d1386dc85c97e41011eb11b12b1e4a410242c84648ac19bbabb7432dba460305bb37
-Size (nss-3.61.tar.gz) = 82034245 bytes
+SHA1 (nss-3.62.tar.gz) = 288bd0533ecc02e0480b17408e24f76d40cc9097
+RMD160 (nss-3.62.tar.gz) = dcac4d4a32520fd63d4f3dc9e280a61417a49de8
+SHA512 (nss-3.62.tar.gz) = 7044008ea8e5d6f658da96e202a896e24a1ffa29d7ca862f32ed37cfa09adf8c2d5fbc371e3af6bc5151b2d1216c38207976b41888d5ad8efd4dc3049cb5831d
+Size (nss-3.62.tar.gz) = 82159506 bytes
 SHA1 (patch-am) = fea682bf03bc8b645049f93ed58554ca45f47aca
 SHA1 (patch-an) = 4ab22f2a575676b5b640bc9a760b83eb05c75e69
 SHA1 (patch-md) = 8547c9414332c02221b96719dea1e09cb741f4d1