diff options
| author | Job Bautista <jobbautista9@aol.com> | 2023-03-04 13:13:49 +0800 |
|---|---|---|
| committer | Job Bautista <jobbautista9@aol.com> | 2023-03-04 13:13:49 +0800 |
| commit | 43c816cd19e73b37d797b17105e4aede8772a6cf (patch) | |
| tree | c9fc76105f89915411a61ab5ab515c855e138aca /security/nss/lib/smime | |
| parent | 409d3e66de6517039165ec43dabd9b063a86d29b (diff) | |
| download | uxp-43c816cd19e73b37d797b17105e4aede8772a6cf.tar.gz | |
Issue #1693 - Update NSS to 3.79.4
Diffstat (limited to 'security/nss/lib/smime')
| -rw-r--r-- | security/nss/lib/smime/cmsutil.c | 4 | ||||
| -rw-r--r-- | security/nss/lib/smime/config.mk | 7 | ||||
| -rw-r--r-- | security/nss/lib/smime/manifest.mn | 2 |
3 files changed, 5 insertions, 8 deletions
diff --git a/security/nss/lib/smime/cmsutil.c b/security/nss/lib/smime/cmsutil.c index 713b94aacb..844fd22a93 100644 --- a/security/nss/lib/smime/cmsutil.c +++ b/security/nss/lib/smime/cmsutil.c @@ -306,6 +306,10 @@ NSS_CMSContent_GetContentInfo(void *msg, SECOidTag type) cinfo = &(c.genericData->contentInfo); } } + /* We are using a union as a form of 'safe casting'. This + * syntax confuses cppcheck, so tell it it's OK (and any human + * who happens along to verify any other scanner warnings) */ + /* cppcheck-suppress returnDanglingLifetime */ return cinfo; } diff --git a/security/nss/lib/smime/config.mk b/security/nss/lib/smime/config.mk index 85d39e825f..76aab75442 100644 --- a/security/nss/lib/smime/config.mk +++ b/security/nss/lib/smime/config.mk @@ -7,13 +7,6 @@ RELEASE_LIBS = $(TARGETS) ifeq (,$(filter-out WIN%,$(OS_TARGET))) -# don't want the 32 in the shared library name -SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX) -IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION)$(IMPORT_LIB_SUFFIX) - -RES = $(OBJDIR)/smime.res -RESNAME = smime.rc - ifdef NS_USE_GCC EXTRA_SHARED_LIBS += \ -L$(DIST)/lib \ diff --git a/security/nss/lib/smime/manifest.mn b/security/nss/lib/smime/manifest.mn index e049d8873a..f453d25949 100644 --- a/security/nss/lib/smime/manifest.mn +++ b/security/nss/lib/smime/manifest.mn @@ -17,7 +17,6 @@ PRIVATE_EXPORTS = \ $(NULL) MODULE = nss -MAPFILE = $(OBJDIR)/smime.def CSRCS = \ cmsarray.c \ @@ -46,6 +45,7 @@ CSRCS = \ LIBRARY_NAME = smime LIBRARY_VERSION = 3 +MAPFILE = $(OBJDIR)/$(LIBRARY_NAME).def # This part of the code, including all sub-dirs, can be optimized for size export ALLOW_OPT_CODE_SIZE = 1 |