Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix prompts to STDIN when using file passwords, bug 103942

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@105059 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
ian.mcgreer%sun.com 2001-10-10 19:54:22 +00:00
parent ee4ac695a8
commit d37dd4ed78
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mozilla/security/nss/cmd/modutil/pk11.c
View File

@ -566,7 +566,7 @@ ChangePW(char *tokenName, char *pwFile, char *newpwFile)
/* Get old password */
if(! PK11_NeedUserInit(slot)) {
if(pwFile) {
oldpw = SECU_GetPasswordString(pwFile, "");
oldpw = SECU_FilePasswd(NULL, PR_FALSE, pwFile);
if(PK11_CheckUserPassword(slot, oldpw) != SECSuccess) {
PR_fprintf(PR_STDERR, errStrings[BAD_PW_ERR]);
ret=BAD_PW_ERR;
@ -586,7 +586,7 @@ ChangePW(char *tokenName, char *pwFile, char *newpwFile)
/* Get new password */
if(newpwFile) {
newpw = SECU_GetPasswordString(newpwFile, "");
newpw = SECU_FilePasswd(NULL, PR_FALSE, newpwFile);
} else {
for(matching=PR_FALSE; !matching; ) {
newpw = SECU_GetPasswordString(NULL, "Enter new password: ");