fixup commit for tag 'NSS_3_12_ALPHA1B' NSS_3_12_ALPHA1B
authorcvs2hg
Fri, 03 Aug 2007 17:32:30 +0000
changeset 7983 ce87e265fdfbd02bd259b31360333291a2a72cd7
parent 7900 7cfa79e317400a7007c8c18449a9b1fe29be73ab (current diff)
parent 7982 f5535ece0ef482b6917d91c9f80313d34a982f22 (diff)
child 7984 ffa3e350045f3abec295540390270d332eb741fe
push idunknown
push userunknown
push dateunknown
fixup commit for tag 'NSS_3_12_ALPHA1B'
--- a/security/nss/cmd/platlibs.mk
+++ b/security/nss/cmd/platlibs.mk
@@ -67,21 +67,17 @@ ifeq ($(USE_64), 1)
 EXTRA_SHARED_LIBS += \
 -Wl,+b,'$$ORIGIN/../../lib/pa20_64:$$ORIGIN/../../lib/64:$$ORIGIN/../lib'
 else
 EXTRA_SHARED_LIBS += -Wl,+b,'$$ORIGIN/../lib'
 endif
 endif
 endif
 
-SQLITE=$(DIST)/lib/$(LIB_PREFIX)sqlite.$(LIB_SUFFIX)
-ifdef NSS_USE_SYSTEM_SQLITE
-	SQLITE=-lsqlite3
-endif
-
+SQLITE=-lsqlite3
 
 ifdef USE_STATIC_LIBS
 
 # can't do this in manifest.mn because OS_ARCH isn't defined there.
 ifeq ($(OS_ARCH), WINNT)
 
 DEFINES += -DNSS_USE_STATIC_LIBS
 # $(PROGRAM) has explicit dependencies on $(EXTRA_LIBS)
@@ -122,17 +118,17 @@ EXTRA_LIBS += \
 	$(DIST)/lib/$(LIB_PREFIX)softokn.$(LIB_SUFFIX) \
 	$(CRYPTOLIB) \
 	$(DIST)/lib/$(LIB_PREFIX)secutil.$(LIB_SUFFIX) \
 	$(DIST)/lib/$(LIB_PREFIX)nsspki.$(LIB_SUFFIX) \
 	$(DIST)/lib/$(LIB_PREFIX)nssdev.$(LIB_SUFFIX) \
 	$(DIST)/lib/$(LIB_PREFIX)nssb.$(LIB_SUFFIX) \
 	$(PKIXLIB) \
 	$(DIST)/lib/$(LIB_PREFIX)dbm.$(LIB_SUFFIX) \
-	$(SQLITE) \
+	$(DIST)/lib/$(LIB_PREFIX)sqlite3.$(LIB_SUFFIX) \
 	$(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plc4.$(LIB_SUFFIX) \
 	$(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plds4.$(LIB_SUFFIX) \
 	$(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)nspr4.$(LIB_SUFFIX) \
 	$(NULL)
 
 # $(PROGRAM) has NO explicit dependencies on $(OS_LIBS)
 #OS_LIBS += \
 	wsock32.lib \
@@ -199,16 +195,17 @@ endif
 ifdef XP_OS2_VACPP
 EXTRA_SHARED_LIBS += \
 	$(NSPR_LIB_DIR)/plc4.lib \
 	$(NSPR_LIB_DIR)/plds4.lib \
 	$(NSPR_LIB_DIR)/nspr4.lib \
 	$(NULL)
 else
 EXTRA_SHARED_LIBS += \
+	-L$(DIST)/lib \
 	$(SQLITE) \
 	-L$(NSPR_LIB_DIR) \
 	-lplc4 \
 	-lplds4 \
 	-lnspr4 \
 	$(NULL)
 endif
 
--- a/security/nss/lib/Makefile
+++ b/security/nss/lib/Makefile
@@ -57,19 +57,21 @@ include $(CORE_DEPTH)/coreconf/config.mk
 #######################################################################
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
 
 ifeq ($(OS_TARGET), WINCE)
 DIRS := $(filter-out fortcrypt,$(DIRS))
 endif
 
+ifndef MOZILLA_CLIENT
 ifndef NSS_USE_SYSTEM_SQLITE
 DIRS := sqlite $(DIRS)
 endif
+endif
 
 #######################################################################
 # (5) Execute "global" rules. (OPTIONAL)                              #
 #######################################################################
 
 include $(CORE_DEPTH)/coreconf/rules.mk
 
 #######################################################################
--- a/security/nss/lib/softoken/legacydb/lgattr.c
+++ b/security/nss/lib/softoken/legacydb/lgattr.c
@@ -1732,18 +1732,18 @@ lg_SetAttributeValue(SDB *sdb, CK_OBJECT
     /* Write any collected changes out for private and secret keys.
      *  don't do the write for just the label */
     if (writePrivate) {
 	NSSLOWKEYPrivateKey *privKey = lg_GetPrivateKey(obj);
 	SECStatus rv = SECFailure;
 	char * label = lg_FindKeyNicknameByPublicKey(obj->sdb, &obj->dbKey);
 
 	if (privKey) {
-	    rv = nsslowkey_StoreKeyByPublicKey(lg_getKeyDB(sdb), privKey, 
-		&obj->dbKey, label, sdb );
+	    rv = nsslowkey_StoreKeyByPublicKeyAlg(lg_getKeyDB(sdb), privKey, 
+		&obj->dbKey, label, sdb, PR_TRUE );
 	}
 	if (rv != SECSuccess) {
 	    crv = CKR_DEVICE_ERROR;
 	}
     }
 
     lg_DestroyObjectCache(obj);
     return crvCollect;
--- a/security/nss/lib/softoken/legacydb/manifest.mn
+++ b/security/nss/lib/softoken/legacydb/manifest.mn
@@ -41,28 +41,27 @@ MODULE = nss
 REQUIRES = dbm 
 
 LIBRARY_NAME = nssdbm
 LIBRARY_VERSION = 3
 MAPFILE = $(OBJDIR)/nssdbm.def
 
 DEFINES += -DSHLIB_SUFFIX=\"$(DLL_SUFFIX)\" -DSHLIB_PREFIX=\"$(DLL_PREFIX)\" -DSOFTOKEN_LIB_NAME=\"$(notdir $(SHARED_LIBRARY))\"
 
+ifdef MOZILLA_CLIENT
+INCLUDES += -I$(DIST)/include/sqlite3
+endif
 
 CSRCS = \
 	dbmshim.c \
 	keydb.c \
 	lgattr.c \
 	lgcreate.c \
 	lgdestroy.c \
 	lgfind.c \
 	lginit.c \
 	lgutil.c \
 	lowcert.c \
 	lowkey.c \
 	pcertdb.c \
 	pk11db.c \
 	$(NULL)
 
-ifdef NSS_ENABLE_ECC
-DEFINES += -DNSS_ENABLE_ECC
-endif
-
--- a/security/nss/lib/softoken/manifest.mn
+++ b/security/nss/lib/softoken/manifest.mn
@@ -42,16 +42,19 @@ DIRS = legacydb
 REQUIRES = dbm
 
 LIBRARY_NAME = softokn
 LIBRARY_VERSION = 3
 MAPFILE = $(OBJDIR)/softokn.def
 
 DEFINES += -DSHLIB_SUFFIX=\"$(DLL_SUFFIX)\" -DSHLIB_PREFIX=\"$(DLL_PREFIX)\" -DSOFTOKEN_LIB_NAME=\"$(notdir $(SHARED_LIBRARY))\" -DSHLIB_VERSION=\"$(LIBRARY_VERSION)\"
 
+ifdef MOZILLA_CLIENT
+INCLUDES += -I$(DIST)/include/sqlite3
+endif
 
 EXPORTS = \
 	pkcs11.h \
 	pkcs11f.h \
 	pkcs11p.h \
 	pkcs11t.h \
 	pkcs11n.h \
 	pkcs11u.h \
@@ -85,16 +88,12 @@ CSRCS = \
 	rsawrapr.c  \
 	sdb.c  \
 	sftkdb.c  \
 	sftkpars.c  \
 	softkver.c  \
 	tlsprf.c   \
 	$(NULL)
 
-ifdef NSS_ENABLE_ECC
-DEFINES += -DNSS_ENABLE_ECC
-endif
-
 ifdef SQLITE_UNSAFE_THREADS
 DEFINES += -DSQLITE_UNSAFE_THREADS
 endif