Fix for bug 286685. rename SFTK symbols to SECMOD. r=rrelyea, nelson

2 files changed, 8 insertions, 8 deletions

diff --git a/security/nss/lib/softoken/pk11db.c b/security/nss/lib/softoken/pk11db.c
index 49ae19739..c60e87780 100644
--- a/security/nss/lib/softoken/pk11db.c
+++ b/security/nss/lib/softoken/pk11db.c
@@ -445,10 +445,10 @@ secmod_EncodeData(DBT *data, char * module)
     encoded->isCritical = (unsigned char) 
 			(secmod_argHasFlag("flags","critical",nss) ? 1 : 0);
 
-    order = secmod_argReadLong("trustOrder", nss, SFTK_DEFAULT_TRUST_ORDER, 
+    order = secmod_argReadLong("trustOrder", nss, SECMOD_DEFAULT_TRUST_ORDER, 
                                NULL);
     SECMOD_PUTLONG(encoded->trustOrder,order);
-    order = secmod_argReadLong("cipherOrder", nss, SFTK_DEFAULT_CIPHER_ORDER, 
+    order = secmod_argReadLong("cipherOrder", nss, SECMOD_DEFAULT_CIPHER_ORDER, 
                                NULL);
     SECMOD_PUTLONG(encoded->cipherOrder,order);
 
@@ -551,8 +551,8 @@ secmod_DecodeData(char *defParams, DBT *data, PRBool *retInternal)
     unsigned long slotID;
     unsigned long defaultFlags;
     unsigned long timeout;
-    unsigned long trustOrder	=SFTK_DEFAULT_TRUST_ORDER;
-    unsigned long cipherOrder	=SFTK_DEFAULT_CIPHER_ORDER;
+    unsigned long trustOrder	=SECMOD_DEFAULT_TRUST_ORDER;
+    unsigned long cipherOrder	=SECMOD_DEFAULT_CIPHER_ORDER;
     unsigned short len;
     unsigned short namesOffset  = 0;	/* start of the names block */
     unsigned long namesRunningOffset;	/* offset to name we are 
diff --git a/security/nss/lib/softoken/pk11pars.h b/security/nss/lib/softoken/pk11pars.h
index 7a2b028eb..ebb1d1b2b 100644
--- a/security/nss/lib/softoken/pk11pars.h
+++ b/security/nss/lib/softoken/pk11pars.h
@@ -64,8 +64,8 @@ struct secmodargSlotFlagTable {
     unsigned long value;
 };
 
-#define SFTK_DEFAULT_CIPHER_ORDER 0
-#define SFTK_DEFAULT_TRUST_ORDER 50
+#define SECMOD_DEFAULT_CIPHER_ORDER 0
+#define SECMOD_DEFAULT_TRUST_ORDER 50
 
 
 #define SECMOD_ARG_ENTRY(arg,flag) \
@@ -822,9 +822,9 @@ secmod_mkNSS(char **slotStrings, int slotCount, PRBool internal, PRBool isFIPS,
     ciphers = secmod_mkCipherFlags(ssl0, ssl1);
 
     trustOrderPair=secmod_formatIntPair("trustOrder",trustOrder,
-					SFTK_DEFAULT_TRUST_ORDER);
+					SECMOD_DEFAULT_TRUST_ORDER);
     cipherOrderPair=secmod_formatIntPair("cipherOrder",cipherOrder,
-					SFTK_DEFAULT_CIPHER_ORDER);
+					SECMOD_DEFAULT_CIPHER_ORDER);
     slotPair=secmod_formatPair("slotParams",slotParams,'{'); /* } */
     if (slotParams) PORT_Free(slotParams);
     cipherPair=secmod_formatPair("ciphers",ciphers,'\'');