diff --git a/security/nss/cmd/signtool/javascript.c b/security/nss/cmd/signtool/javascript.c
index 31cd24fcad39..26bf39f9b375 100644
--- a/security/nss/cmd/signtool/javascript.c
+++ b/security/nss/cmd/signtool/javascript.c
@@ -1038,7 +1038,7 @@ TagTypeToString(TAG_TYPE type)
 	case STYLE_TAG:
 		return "STYLE";
 	default:
-		return "unknown";
+		break;
 	}
 	return "unknown";
 }
diff --git a/security/nss/cmd/signtool/sign.c b/security/nss/cmd/signtool/sign.c
index b46c2f16ac65..c5fbcf168650 100644
--- a/security/nss/cmd/signtool/sign.c
+++ b/security/nss/cmd/signtool/sign.c
@@ -643,8 +643,8 @@ SignFile (FILE *outFile, FILE *inFile, CERTCertificate *cert)
     }
 
 	if(password) {
-		rv = SEC_PKCS7Encode(cinfo, SignOut, outFile, NULL, password_hardcode,
-			NULL);
+		rv = SEC_PKCS7Encode(cinfo, SignOut, outFile, NULL, 
+			(SECKEYGetPasswordKey) password_hardcode, NULL);
 	} else {
 		rv = SEC_PKCS7Encode(cinfo, SignOut, outFile, NULL, NULL,
 			NULL);
diff --git a/security/nss/cmd/signtool/signtool.h b/security/nss/cmd/signtool/signtool.h
index 3b11a4507ef0..741c4d6b9363 100644
--- a/security/nss/cmd/signtool/signtool.h
+++ b/security/nss/cmd/signtool/signtool.h
@@ -112,7 +112,7 @@ char* chop(char*);
 void out_of_memory(void);
 void FatalError(char *msg);
 char* get_default_cert_dir(void);
-SECItem *password_hardcode(void *arg, SECKEYKeyDBHandle *handle);
+SECItem *password_hardcode(void *arg, void *handle);
 char* pk11_password_hardcode(PK11SlotInfo *slot, PRBool retry, void *arg);
 int rm_dash_r(char *path);
 char* pr_fgets(char *buf, int size, PRFileDesc *file);
diff --git a/security/nss/cmd/signtool/util.c b/security/nss/cmd/signtool/util.c
index 8f871786432e..1c9452ff3440 100644
--- a/security/nss/cmd/signtool/util.c
+++ b/security/nss/cmd/signtool/util.c
@@ -445,12 +445,12 @@ static int is_dir (char *filename)
  *
  */
 SECItem *
-password_hardcode(void *arg, SECKEYKeyDBHandle *handle)
+password_hardcode(void *arg, void *handle)
 {
   SECItem *pw = NULL;
   if (password) {
     pw = SECITEM_AllocItem(NULL, NULL, PL_strlen(password));
-    pw->data = PL_strdup(password);
+    pw->data = (unsigned char *)PL_strdup(password);
     password = NULL;
   }
   return pw;