diff options
| author | ian.mcgreer%sun.com <devnull@localhost> | 2001-10-10 19:54:22 +0000 |
|---|---|---|
| committer | ian.mcgreer%sun.com <devnull@localhost> | 2001-10-10 19:54:22 +0000 |
| commit | 8b7731110a68a15001455b2429e5169c59945d1e (patch) | |
| tree | 70a43e2e2077458eb3ac6180d85d5213e52b9b87 /security/nss/cmd/modutil/pk11.c | |
| parent | 56bb5f0b5a1666fc8f3c6ba7f6b26becab352812 (diff) | |
| download | nss-hg-8b7731110a68a15001455b2429e5169c59945d1e.tar.gz | |
fix prompts to STDIN when using file passwords, bug 103942
Diffstat (limited to 'security/nss/cmd/modutil/pk11.c')
| -rw-r--r-- | security/nss/cmd/modutil/pk11.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/security/nss/cmd/modutil/pk11.c b/security/nss/cmd/modutil/pk11.c index cb10b2442..7f8433e8b 100644 --- a/security/nss/cmd/modutil/pk11.c +++ b/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: "); |