From d37dd4ed78a80c5decd5508994f04d41c2ac559c Mon Sep 17 00:00:00 2001 From: "ian.mcgreer%sun.com" Date: Wed, 10 Oct 2001 19:54:22 +0000 Subject: [PATCH] fix prompts to STDIN when using file passwords, bug 103942 git-svn-id: svn://10.0.0.236/trunk@105059 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/security/nss/cmd/modutil/pk11.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mozilla/security/nss/cmd/modutil/pk11.c b/mozilla/security/nss/cmd/modutil/pk11.c index cb10b2442ea..7f8433e8b7c 100644 --- a/mozilla/security/nss/cmd/modutil/pk11.c +++ b/mozilla/security/nss/cmd/modutil/pk11.c @@ -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: ");