Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-26 22:32:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

when doing file passwords, only open the file once to retrieve the password, then keep it in memory. Seems to fix scripting problems (especially in FIPS, which hits the password prompt a lot).

Browse Source
This commit is contained in:
mcgreer%netscape.com 2001-08-09 13:58:30 +00:00
parent 876dcfc210
commit d454f0472f
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
security/nss/cmd/lib/secutil.c
View File

@ -216,6 +216,7 @@ SECU_GetModulePassword(PK11SlotInfo *slot, PRBool retry, void *arg)
char prompt[255];
secuPWData *pwdata = arg;
secuPWData pwnull = { PW_NONE, 0 };
char *pw;
if (arg == NULL)
pwdata = &pwnull;
@ -225,14 +226,20 @@ SECU_GetModulePassword(PK11SlotInfo *slot, PRBool retry, void *arg)
return NULL;
}
sprintf(prompt, "Enter Password or Pin for \"%s\":",
PK11_GetTokenName(slot));
switch (pwdata->source) {
case PW_NONE:
sprintf(prompt, "Enter Password or Pin for \"%s\":",
PK11_GetTokenName(slot));
return SECU_GetPasswordString(NULL, prompt);
case PW_FROMFILE:
return SECU_FilePasswd(slot, retry, pwdata->data);
/* Instead of opening and closing the file every time, get the pw
* once, then keep it in memory (duh).
*/
pw = SECU_FilePasswd(slot, retry, pwdata->data);
pwdata->source = PW_PLAINTEXT;
pwdata->data = PL_strdup(pw);
/* it's already been dup'ed */
return pw;
case PW_PLAINTEXT:
return PL_strdup(pwdata->data);
default: