diff options
| author | Moonchild <moonchild@palemoon.org> | 2022-01-14 19:30:51 +0000 |
|---|---|---|
| committer | Moonchild <moonchild@palemoon.org> | 2022-01-14 22:39:26 +0000 |
| commit | d8d7e0bcb1bf744387d0a79be48e53bffaa94559 (patch) | |
| tree | dc8169ce2f945f0b757b2afd310795e7c267ed3f | |
| parent | 9cef16da76f2ee18a9bcb857526b25d961ec9f1f (diff) | |
| download | uxp-RC_20220114.tar.gz | |
[NSS] check for missing signedData field and bump versionRELBASE_20220118RC_20220114
| -rw-r--r-- | CLOBBER | 2 | ||||
| -rw-r--r-- | security/nss/lib/nss/nss.h | 4 | ||||
| -rw-r--r-- | security/nss/lib/pkcs7/certread.c | 5 | ||||
| -rw-r--r-- | security/nss/lib/softoken/softkver.h | 4 | ||||
| -rw-r--r-- | security/nss/lib/util/nssutil.h | 4 |
5 files changed, 12 insertions, 7 deletions
@@ -22,4 +22,4 @@ # changes to stick? As of bug 928195, this shouldn't be necessary! Please # don't change CLOBBER for WebIDL changes any more. -Clobber for NSS update +Clobber for NSS update
\ No newline at end of file diff --git a/security/nss/lib/nss/nss.h b/security/nss/lib/nss/nss.h index 967e20147f..58ce4a3891 100644 --- a/security/nss/lib/nss/nss.h +++ b/security/nss/lib/nss/nss.h @@ -22,10 +22,10 @@ * The format of the version string should be * "<major version>.<minor version>[.<patch level>[.<build number>]][ <ECC>][ <Beta>]" */ -#define NSS_VERSION "3.52.2" _NSS_CUSTOMIZED +#define NSS_VERSION "3.52.3" _NSS_CUSTOMIZED #define NSS_VMAJOR 3 #define NSS_VMINOR 52 -#define NSS_VPATCH 2 +#define NSS_VPATCH 3 #define NSS_VBUILD 0 #define NSS_BETA PR_FALSE diff --git a/security/nss/lib/pkcs7/certread.c b/security/nss/lib/pkcs7/certread.c index 3091f9947e..15094f2d78 100644 --- a/security/nss/lib/pkcs7/certread.c +++ b/security/nss/lib/pkcs7/certread.c @@ -139,6 +139,11 @@ SEC_ReadPKCS7Certs(SECItem *pkcs7Item, CERTImportCertificateFunc f, void *arg) goto done; } + if (contentInfo.content.signedData == NULL) { + PORT_SetError(SEC_ERROR_BAD_DER); + goto done; + } + rv = SECSuccess; certs = contentInfo.content.signedData->certificates; diff --git a/security/nss/lib/softoken/softkver.h b/security/nss/lib/softoken/softkver.h index 056b7da7a4..9c1a6bdb06 100644 --- a/security/nss/lib/softoken/softkver.h +++ b/security/nss/lib/softoken/softkver.h @@ -17,10 +17,10 @@ * The format of the version string should be * "<major version>.<minor version>[.<patch level>[.<build number>]][ <ECC>][ <Beta>]" */ -#define SOFTOKEN_VERSION "3.52.2" SOFTOKEN_ECC_STRING +#define SOFTOKEN_VERSION "3.52.3" SOFTOKEN_ECC_STRING #define SOFTOKEN_VMAJOR 3 #define SOFTOKEN_VMINOR 52 -#define SOFTOKEN_VPATCH 2 +#define SOFTOKEN_VPATCH 3 #define SOFTOKEN_VBUILD 0 #define SOFTOKEN_BETA PR_FALSE diff --git a/security/nss/lib/util/nssutil.h b/security/nss/lib/util/nssutil.h index 1e147b4a49..968c99f281 100644 --- a/security/nss/lib/util/nssutil.h +++ b/security/nss/lib/util/nssutil.h @@ -19,10 +19,10 @@ * The format of the version string should be * "<major version>.<minor version>[.<patch level>[.<build number>]][ <Beta>]" */ -#define NSSUTIL_VERSION "3.52.2" +#define NSSUTIL_VERSION "3.52.3" #define NSSUTIL_VMAJOR 3 #define NSSUTIL_VMINOR 52 -#define NSSUTIL_VPATCH 2 +#define NSSUTIL_VPATCH 3 #define NSSUTIL_VBUILD 0 #define NSSUTIL_BETA PR_FALSE |