fixup commit for tag 'MOZILLA_1_9a8_RELEASE'MOZILLA_1_9a8_RELEASE

5 files changed, 13 insertions, 16 deletions

diff --git a/security/nss/cmd/platlibs.mk b/security/nss/cmd/platlibs.mk
index 51fd903a3..f18d47bcf 100644
--- a/security/nss/cmd/platlibs.mk
+++ b/security/nss/cmd/platlibs.mk
@@ -72,11 +72,7 @@ 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
 
@@ -127,7 +123,7 @@ EXTRA_LIBS += \
 	$(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) \
@@ -204,6 +200,7 @@ EXTRA_SHARED_LIBS += \
 	$(NULL)
 else
 EXTRA_SHARED_LIBS += \
+	-L$(DIST)/lib \
 	$(SQLITE) \
 	-L$(NSPR_LIB_DIR) \
 	-lplc4 \
diff --git a/security/nss/lib/Makefile b/security/nss/lib/Makefile
index fe201b2be..a111275bd 100644
--- a/security/nss/lib/Makefile
+++ b/security/nss/lib/Makefile
@@ -62,9 +62,11 @@ 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)                              #
diff --git a/security/nss/lib/softoken/legacydb/lgattr.c b/security/nss/lib/softoken/legacydb/lgattr.c
index 2416a6b18..1e6eec3c7 100644
--- a/security/nss/lib/softoken/legacydb/lgattr.c
+++ b/security/nss/lib/softoken/legacydb/lgattr.c
@@ -1737,8 +1737,8 @@ lg_SetAttributeValue(SDB *sdb, CK_OBJECT_HANDLE handle,
 	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;
diff --git a/security/nss/lib/softoken/legacydb/manifest.mn b/security/nss/lib/softoken/legacydb/manifest.mn
index e62dff85c..c3048646e 100644
--- a/security/nss/lib/softoken/legacydb/manifest.mn
+++ b/security/nss/lib/softoken/legacydb/manifest.mn
@@ -46,6 +46,9 @@ 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 \
@@ -62,7 +65,3 @@ CSRCS = \
 	pk11db.c \
 	$(NULL)
 
-ifdef NSS_ENABLE_ECC
-DEFINES += -DNSS_ENABLE_ECC
-endif
-
diff --git a/security/nss/lib/softoken/manifest.mn b/security/nss/lib/softoken/manifest.mn
index 88756f630..2537aac82 100644
--- a/security/nss/lib/softoken/manifest.mn
+++ b/security/nss/lib/softoken/manifest.mn
@@ -47,6 +47,9 @@ 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 \
@@ -90,10 +93,6 @@ CSRCS = \
 	tlsprf.c   \
 	$(NULL)
 
-ifdef NSS_ENABLE_ECC
-DEFINES += -DNSS_ENABLE_ECC
-endif
-
 ifdef SQLITE_UNSAFE_THREADS
 DEFINES += -DSQLITE_UNSAFE_THREADS
 endif