diff options
| author | wtc%netscape.com <devnull@localhost> | 2002-07-02 18:19:06 +0000 |
|---|---|---|
| committer | wtc%netscape.com <devnull@localhost> | 2002-07-02 18:19:06 +0000 |
| commit | 8111397ae69abe504bdf5a4d1cad4677f679fae0 (patch) | |
| tree | e0ea3c32b00d230859a9072000f8ad2fa98a0c73 | |
| parent | 0b2403acaee0d9517e49b1a694c4404b2a1eb117 (diff) | |
| parent | c44ec1c461db27e77c2099c20a74b682d180b9bd (diff) | |
| download | nss-hg-8111397ae69abe504bdf5a4d1cad4677f679fae0.tar.gz | |
Set NSS version to 3.5.1 Beta.
Tag: NSS_3_5_BRANCH
| -rw-r--r-- | security/coreconf/Darwin.mk | 2 | ||||
| -rw-r--r-- | security/coreconf/rules.mk | 5 | ||||
| -rw-r--r-- | security/nss/lib/certdb/stanpcertdb.c | 19 | ||||
| -rw-r--r-- | security/nss/lib/nss/nss.h | 6 |
4 files changed, 28 insertions, 4 deletions
diff --git a/security/coreconf/Darwin.mk b/security/coreconf/Darwin.mk index 6c2b93c9d..59f5af8fd 100644 --- a/security/coreconf/Darwin.mk +++ b/security/coreconf/Darwin.mk @@ -70,5 +70,7 @@ DSO_LDOPTS = -dynamiclib -compatibility_version 1 -current_version 1 -install_na MKSHLIB = $(CC) -arch $(CPU_ARCH) $(DSO_LDOPTS) DLL_SUFFIX = dylib +PROCESS_MAP_FILE = grep -v ';+' $(LIBRARY_NAME).def | grep -v ';-' | \ + sed -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,,' -e 's,^,_,' > $@ G++INCLUDES = -I/usr/include/g++ diff --git a/security/coreconf/rules.mk b/security/coreconf/rules.mk index 76043627a..c53c1ffc5 100644 --- a/security/coreconf/rules.mk +++ b/security/coreconf/rules.mk @@ -364,6 +364,11 @@ endif ifeq ($(OS_TARGET),OpenVMS) @echo "`translate $@`" > $(@:$(DLL_SUFFIX)=vms) endif +ifeq ($(OS_TARGET),Darwin) +ifdef MAPFILE + nmedit -s $(MAPFILE) $@ +endif +endif endif endif diff --git a/security/nss/lib/certdb/stanpcertdb.c b/security/nss/lib/certdb/stanpcertdb.c index 654da08dd..3f52f438e 100644 --- a/security/nss/lib/certdb/stanpcertdb.c +++ b/security/nss/lib/certdb/stanpcertdb.c @@ -747,7 +747,24 @@ CERT_SaveSMimeProfile(CERTCertificate *cert, SECItem *emailProfile, NSSCryptoContext *cc; nssSMIMEProfile *stanProfile = NULL; PRBool freeOldProfile = PR_FALSE; - + PK11SlotInfo* internalslot = PK11_GetInternalKeySlot(); + + if (cert && cert->slot != internalslot) { + /* this cert comes from an external source, we need to add it + to the cert db before creating an S/MIME profile */ + rv = PK11_ImportCert(internalslot, cert, + CK_INVALID_HANDLE, NULL, PR_FALSE); + + PK11_FreeSlot(internalslot); + + if (rv != SECSuccess ) + { + return SECFailure; + } + } else { + PK11_FreeSlot(internalslot); + } + emailAddr = cert->emailAddr; if ( emailAddr == NULL ) { diff --git a/security/nss/lib/nss/nss.h b/security/nss/lib/nss/nss.h index 0c7b71fa9..d842ad51b 100644 --- a/security/nss/lib/nss/nss.h +++ b/security/nss/lib/nss/nss.h @@ -49,11 +49,11 @@ SEC_BEGIN_PROTOS * The format of the version string should be * "<major version>.<minor version>[.<patch level>] [<Beta>]" */ -#define NSS_VERSION "3.5" +#define NSS_VERSION "3.5.1 Beta" #define NSS_VMAJOR 3 #define NSS_VMINOR 5 -#define NSS_VPATCH 0 -#define NSS_BETA PR_FALSE +#define NSS_VPATCH 1 +#define NSS_BETA PR_TRUE /* |