Rename functions that are shared by pk11wrap and softoken from sftk_ to

secmod_.  Bug 286685. r=relyea.

1 files changed, 73 insertions, 71 deletions

diff --git a/security/nss/lib/softoken/pk11db.c b/security/nss/lib/softoken/pk11db.c
index ad6d2887b..391803329 100644
--- a/security/nss/lib/softoken/pk11db.c
+++ b/security/nss/lib/softoken/pk11db.c
@@ -49,24 +49,24 @@
 
 static void
 secmod_parseTokenFlags(char *tmp, sftk_token_parameters *parsed) { 
-    parsed->readOnly = sftk_argHasFlag("flags","readOnly",tmp);
-    parsed->noCertDB = sftk_argHasFlag("flags","noCertDB",tmp);
-    parsed->noKeyDB = sftk_argHasFlag("flags","noKeyDB",tmp);
-    parsed->forceOpen = sftk_argHasFlag("flags","forceOpen",tmp);
-    parsed->pwRequired = sftk_argHasFlag("flags","passwordRequired",tmp);
-    parsed->optimizeSpace = sftk_argHasFlag("flags","optimizeSpace",tmp);
+    parsed->readOnly = secmod_argHasFlag("flags","readOnly",tmp);
+    parsed->noCertDB = secmod_argHasFlag("flags","noCertDB",tmp);
+    parsed->noKeyDB = secmod_argHasFlag("flags","noKeyDB",tmp);
+    parsed->forceOpen = secmod_argHasFlag("flags","forceOpen",tmp);
+    parsed->pwRequired = secmod_argHasFlag("flags","passwordRequired",tmp);
+    parsed->optimizeSpace = secmod_argHasFlag("flags","optimizeSpace",tmp);
     return;
 }
 
 static void
 secmod_parseFlags(char *tmp, sftk_parameters *parsed) { 
-    parsed->noModDB = sftk_argHasFlag("flags","noModDB",tmp);
-    parsed->readOnly = sftk_argHasFlag("flags","readOnly",tmp);
+    parsed->noModDB = secmod_argHasFlag("flags","noModDB",tmp);
+    parsed->readOnly = secmod_argHasFlag("flags","readOnly",tmp);
     /* keep legacy interface working */
-    parsed->noCertDB = sftk_argHasFlag("flags","noCertDB",tmp);
-    parsed->forceOpen = sftk_argHasFlag("flags","forceOpen",tmp);
-    parsed->pwRequired = sftk_argHasFlag("flags","passwordRequired",tmp);
-    parsed->optimizeSpace = sftk_argHasFlag("flags","optimizeSpace",tmp);
+    parsed->noCertDB = secmod_argHasFlag("flags","noCertDB",tmp);
+    parsed->forceOpen = secmod_argHasFlag("flags","forceOpen",tmp);
+    parsed->pwRequired = secmod_argHasFlag("flags","passwordRequired",tmp);
+    parsed->optimizeSpace = secmod_argHasFlag("flags","optimizeSpace",tmp);
     return;
 }
 
@@ -76,19 +76,19 @@ secmod_parseTokenParameters(char *param, sftk_token_parameters *parsed)
     int next;
     char *tmp;
     char *index;
-    index = sftk_argStrip(param);
+    index = secmod_argStrip(param);
 
     while (*index) {
-	SFTK_HANDLE_STRING_ARG(index,parsed->configdir,"configDir=",;)
-	SFTK_HANDLE_STRING_ARG(index,parsed->certPrefix,"certPrefix=",;)
-	SFTK_HANDLE_STRING_ARG(index,parsed->keyPrefix,"keyPrefix=",;)
-	SFTK_HANDLE_STRING_ARG(index,parsed->tokdes,"tokenDescription=",;)
-	SFTK_HANDLE_STRING_ARG(index,parsed->slotdes,"slotDescription=",;)
-	SFTK_HANDLE_STRING_ARG(index,tmp,"minPWLen=", 
+	SECMOD_HANDLE_STRING_ARG(index,parsed->configdir,"configDir=",;)
+	SECMOD_HANDLE_STRING_ARG(index,parsed->certPrefix,"certPrefix=",;)
+	SECMOD_HANDLE_STRING_ARG(index,parsed->keyPrefix,"keyPrefix=",;)
+	SECMOD_HANDLE_STRING_ARG(index,parsed->tokdes,"tokenDescription=",;)
+	SECMOD_HANDLE_STRING_ARG(index,parsed->slotdes,"slotDescription=",;)
+	SECMOD_HANDLE_STRING_ARG(index,tmp,"minPWLen=", 
 			if(tmp) { parsed->minPW=atoi(tmp); PORT_Free(tmp); })
-	SFTK_HANDLE_STRING_ARG(index,tmp,"flags=", 
+	SECMOD_HANDLE_STRING_ARG(index,tmp,"flags=", 
 	   if(tmp) { secmod_parseTokenFlags(param,parsed); PORT_Free(tmp); })
-	SFTK_HANDLE_FINAL_ARG(index)
+	SECMOD_HANDLE_FINAL_ARG(index)
    }
    return CKR_OK;
 }
@@ -103,8 +103,8 @@ secmod_parseTokens(char *tokenParams, sftk_parameters *parsed)
     if ((tokenParams == NULL) || (*tokenParams == 0))  return;
 
     /* first count the number of slots */
-    for (tokenIndex = sftk_argStrip(tokenParams); *tokenIndex;
-		tokenIndex = sftk_argStrip(sftk_argSkipParameter(tokenIndex))) {
+    for (tokenIndex = secmod_argStrip(tokenParams); *tokenIndex;
+	 tokenIndex = secmod_argStrip(secmod_argSkipParameter(tokenIndex))) {
 	count++;
     }
 
@@ -113,18 +113,18 @@ secmod_parseTokens(char *tokenParams, sftk_parameters *parsed)
 			PORT_ZAlloc(count*sizeof(sftk_token_parameters));
     if (tokens == NULL) return;
 
-    for (tokenIndex = sftk_argStrip(tokenParams), i = 0;
+    for (tokenIndex = secmod_argStrip(tokenParams), i = 0;
 					*tokenIndex && i < count ; i++ ) {
 	char *name;
-	name = sftk_argGetName(tokenIndex,&next);
+	name = secmod_argGetName(tokenIndex,&next);
 	tokenIndex += next;
 
-	tokens[i].slotID = sftk_argDecodeNumber(name);
+	tokens[i].slotID = secmod_argDecodeNumber(name);
         tokens[i].readOnly = PR_TRUE;
 	tokens[i].noCertDB = PR_TRUE;
 	tokens[i].noKeyDB = PR_TRUE;
-	if (!sftk_argIsBlank(*tokenIndex)) {
-	    char *args = sftk_argFetchValue(tokenIndex,&next);
+	if (!secmod_argIsBlank(*tokenIndex)) {
+	    char *args = secmod_argFetchValue(tokenIndex,&next);
 	    tokenIndex += next;
 	    if (args) {
 		secmod_parseTokenParameters(args,&tokens[i]);
@@ -132,7 +132,7 @@ secmod_parseTokens(char *tokenParams, sftk_parameters *parsed)
 	    }
 	}
 	if (name) PORT_Free(name);
-	tokenIndex = sftk_argStrip(tokenIndex);
+	tokenIndex = secmod_argStrip(tokenIndex);
     }
     parsed->token_count = i;
     parsed->tokens = tokens;
@@ -150,31 +150,31 @@ secmod_parseParameters(char *param, sftk_parameters *parsed, PRBool isFIPS)
     char *slotdes = NULL, *pslotdes = NULL;
     char *fslotdes = NULL, *fpslotdes = NULL;
     char *minPW = NULL;
-    index = sftk_argStrip(param);
+    index = secmod_argStrip(param);
 
     PORT_Memset(parsed, 0, sizeof(sftk_parameters));
 
     while (*index) {
-	SFTK_HANDLE_STRING_ARG(index,parsed->configdir,"configDir=",;)
-	SFTK_HANDLE_STRING_ARG(index,parsed->secmodName,"secmod=",;)
-	SFTK_HANDLE_STRING_ARG(index,parsed->man,"manufacturerID=",;)
-	SFTK_HANDLE_STRING_ARG(index,parsed->libdes,"libraryDescription=",;)
+	SECMOD_HANDLE_STRING_ARG(index,parsed->configdir,"configDir=",;)
+	SECMOD_HANDLE_STRING_ARG(index,parsed->secmodName,"secmod=",;)
+	SECMOD_HANDLE_STRING_ARG(index,parsed->man,"manufacturerID=",;)
+	SECMOD_HANDLE_STRING_ARG(index,parsed->libdes,"libraryDescription=",;)
 	/* constructed values, used so legacy interfaces still work */
-	SFTK_HANDLE_STRING_ARG(index,certPrefix,"certPrefix=",;)
-        SFTK_HANDLE_STRING_ARG(index,keyPrefix,"keyPrefix=",;)
-        SFTK_HANDLE_STRING_ARG(index,tokdes,"cryptoTokenDescription=",;)
-        SFTK_HANDLE_STRING_ARG(index,ptokdes,"dbTokenDescription=",;)
-        SFTK_HANDLE_STRING_ARG(index,slotdes,"cryptoSlotDescription=",;)
-        SFTK_HANDLE_STRING_ARG(index,pslotdes,"dbSlotDescription=",;)
-        SFTK_HANDLE_STRING_ARG(index,fslotdes,"FIPSSlotDescription=",;)
-        SFTK_HANDLE_STRING_ARG(index,minPW,"FIPSTokenDescription=",;)
-	SFTK_HANDLE_STRING_ARG(index,tmp,"minPWLen=",;)
-
-	SFTK_HANDLE_STRING_ARG(index,tmp,"flags=", 
+	SECMOD_HANDLE_STRING_ARG(index,certPrefix,"certPrefix=",;)
+        SECMOD_HANDLE_STRING_ARG(index,keyPrefix,"keyPrefix=",;)
+        SECMOD_HANDLE_STRING_ARG(index,tokdes,"cryptoTokenDescription=",;)
+        SECMOD_HANDLE_STRING_ARG(index,ptokdes,"dbTokenDescription=",;)
+        SECMOD_HANDLE_STRING_ARG(index,slotdes,"cryptoSlotDescription=",;)
+        SECMOD_HANDLE_STRING_ARG(index,pslotdes,"dbSlotDescription=",;)
+        SECMOD_HANDLE_STRING_ARG(index,fslotdes,"FIPSSlotDescription=",;)
+        SECMOD_HANDLE_STRING_ARG(index,minPW,"FIPSTokenDescription=",;)
+	SECMOD_HANDLE_STRING_ARG(index,tmp,"minPWLen=",;)
+
+	SECMOD_HANDLE_STRING_ARG(index,tmp,"flags=", 
 		if(tmp) { secmod_parseFlags(param,parsed); PORT_Free(tmp); })
-	SFTK_HANDLE_STRING_ARG(index,tmp,"tokens=", 
+	SECMOD_HANDLE_STRING_ARG(index,tmp,"tokens=", 
 		if(tmp) { secmod_parseTokens(tmp,parsed); PORT_Free(tmp); })
-	SFTK_HANDLE_FINAL_ARG(index)
+	SECMOD_HANDLE_FINAL_ARG(index)
     }
     if (parsed->tokens == NULL) {
 	int  count = isFIPS ? 1 : 2;
@@ -264,18 +264,18 @@ secmod_getSecmodName(char *param, char **appName, char **filename,PRBool *rw)
     char *value = NULL;
     char *save_params = param;
     const char *lconfigdir;
-    param = sftk_argStrip(param);
+    param = secmod_argStrip(param);
 	
 
     while (*param) {
-	SFTK_HANDLE_STRING_ARG(param,configdir,"configDir=",;)
-	SFTK_HANDLE_STRING_ARG(param,secmodName,"secmod=",;)
-	SFTK_HANDLE_FINAL_ARG(param)
+	SECMOD_HANDLE_STRING_ARG(param,configdir,"configDir=",;)
+	SECMOD_HANDLE_STRING_ARG(param,secmodName,"secmod=",;)
+	SECMOD_HANDLE_FINAL_ARG(param)
    }
 
    *rw = PR_TRUE;
-   if (sftk_argHasFlag("flags","readOnly",save_params) ||
-	sftk_argHasFlag("flags","noModDB",save_params)) *rw = PR_FALSE;
+   if (secmod_argHasFlag("flags","readOnly",save_params) ||
+	secmod_argHasFlag("flags","noModDB",save_params)) *rw = PR_FALSE;
 
    if (!secmodName || *secmodName == '\0') {
 	if (secmodName) PORT_Free(secmodName);
@@ -299,9 +299,9 @@ static SECStatus secmod_MakeKey(DBT *key, char * module) {
     int len = 0;
     char *commonName;
 
-    commonName = sftk_argGetParamValue("name",module);
+    commonName = secmod_argGetParamValue("name",module);
     if (commonName == NULL) {
-	commonName = sftk_argGetParamValue("library",module);
+	commonName = secmod_argGetParamValue("library",module);
     }
     if (commonName == NULL) return SECFailure;
     len = PORT_Strlen(commonName);
@@ -393,7 +393,7 @@ secmod_EncodeData(DBT *data, char * module)
     PK11PreSlotInfo *slotInfo = NULL;
     SECStatus rv = SECFailure;
 
-    rv = sftk_argParseModuleSpec(module,&dllName,&commonName,&param,&nss);
+    rv = secmod_argParseModuleSpec(module,&dllName,&commonName,&param,&nss);
     if (rv != SECSuccess) return rv;
     rv = SECFailure;
 
@@ -410,8 +410,8 @@ secmod_EncodeData(DBT *data, char * module)
 	len3 = PORT_Strlen(param);
     }
 
-    slotParams = sftk_argGetParamValue("slotParams",nss); 
-    slotInfo = sftk_argParseSlotInfo(NULL,slotParams,&count);
+    slotParams = secmod_argGetParamValue("slotParams",nss); 
+    slotInfo = secmod_argParseSlotInfo(NULL,slotParams,&count);
     if (slotParams) PORT_Free(slotParams);
 
     if (count && slotInfo == NULL) {
@@ -435,24 +435,26 @@ secmod_EncodeData(DBT *data, char * module)
     encoded->major = SECMOD_DB_VERSION_MAJOR;
     encoded->minor = SECMOD_DB_VERSION_MINOR;
     encoded->internal = (unsigned char) 
-			(sftk_argHasFlag("flags","internal",nss) ? 1 : 0);
+			(secmod_argHasFlag("flags","internal",nss) ? 1 : 0);
     encoded->fips = (unsigned char) 
-			(sftk_argHasFlag("flags","FIPS",nss) ? 1 : 0);
+			(secmod_argHasFlag("flags","FIPS",nss) ? 1 : 0);
     encoded->isModuleDB = (unsigned char) 
-			(sftk_argHasFlag("flags","isModuleDB",nss) ? 1 : 0);
+			(secmod_argHasFlag("flags","isModuleDB",nss) ? 1 : 0);
     encoded->isModuleDBOnly = (unsigned char) 
-			(sftk_argHasFlag("flags","isModuleDBOnly",nss) ? 1 : 0);
+		    (secmod_argHasFlag("flags","isModuleDBOnly",nss) ? 1 : 0);
     encoded->isCritical = (unsigned char) 
-			(sftk_argHasFlag("flags","critical",nss) ? 1 : 0);
+			(secmod_argHasFlag("flags","critical",nss) ? 1 : 0);
 
-    order = sftk_argReadLong("trustOrder",nss, SFTK_DEFAULT_TRUST_ORDER, NULL);
+    order = secmod_argReadLong("trustOrder", nss, SFTK_DEFAULT_TRUST_ORDER, 
+                               NULL);
     SECMOD_PUTLONG(encoded->trustOrder,order);
-    order = sftk_argReadLong("cipherOrder",nss,SFTK_DEFAULT_CIPHER_ORDER,NULL);
+    order = secmod_argReadLong("cipherOrder", nss, SFTK_DEFAULT_CIPHER_ORDER, 
+                               NULL);
     SECMOD_PUTLONG(encoded->cipherOrder,order);
 
    
-    ciphers = sftk_argGetParamValue("ciphers",nss); 
-    sftk_argSetNewCipherFlags(&ssl[0], ciphers);
+    ciphers = secmod_argGetParamValue("ciphers",nss); 
+    secmod_argSetNewCipherFlags(&ssl[0], ciphers);
     SECMOD_PUTLONG(encoded->ssl,ssl[0]);
     SECMOD_PUTLONG(&encoded->ssl[4],ssl[1]);
     if (ciphers) PORT_Free(ciphers);
@@ -726,14 +728,14 @@ secmod_DecodeData(char *defParams, DBT *data, PRBool *retInternal)
 	hasRootCerts = slots->hasRootCerts;
 	if (isOldVersion && internal && (slotID != 2)) {
 		unsigned long internalFlags=
-			sftk_argSlotFlags("slotFlags",SECMOD_SLOT_FLAGS);
+			secmod_argSlotFlags("slotFlags",SECMOD_SLOT_FLAGS);
 		defaultFlags |= internalFlags;
 	}
 	if (hasRootCerts && !extended) {
 	    trustOrder = 100;
 	}
 
-	slotStrings[i] = sftk_mkSlotString(slotID, defaultFlags, timeout, 
+	slotStrings[i] = secmod_mkSlotString(slotID, defaultFlags, timeout, 
 	                                   (unsigned char)slots->askpw, 
 	                                   hasRootCerts, hasRootTrust);
 	if (slotStrings[i] == NULL) {
@@ -742,13 +744,13 @@ secmod_DecodeData(char *defParams, DBT *data, PRBool *retInternal)
 	}
     }
 
-    nss = sftk_mkNSS(slotStrings, slotCount, internal, isFIPS, isModuleDB, 
+    nss = secmod_mkNSS(slotStrings, slotCount, internal, isFIPS, isModuleDB, 
 		     isModuleDBOnly, internal, trustOrder, cipherOrder, 
 		     ssl0, ssl1);
     secmod_FreeSlotStrings(slotStrings,slotCount);
     /* it's permissible (and normal) for nss to be NULL. it simply means
      * there are no NSS specific parameters in the database */
-    moduleSpec = sftk_mkNewModuleSpec(dllName,commonName,parameters,nss);
+    moduleSpec = secmod_mkNewModuleSpec(dllName,commonName,parameters,nss);
     PR_smprintf_free(nss);
     PORT_FreeArena(arena,PR_TRUE);
     return moduleSpec;