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

fix bug 63447 where certutil was opening an unneccessary output terminal.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@83934 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
mcgreer%netscape.com 2000-12-21 01:51:37 +00:00
parent 069309c7bf
commit a55d64f4d5
1 changed files with 24 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
mozilla/security/nss/cmd/lib/secutil.c
View File

@ -313,37 +313,31 @@ secu_InitSlotPassword(PK11SlotInfo *slot, PRBool retry, void *arg)
FILE *input, *output;
secuPWData *pwdata = arg;
if (pwdata->source == PW_NONE) {
/* open terminal */
#ifdef _WINDOWS
input = stdin;
#else
input = fopen(consoleName, "r");
#endif
if (input == NULL) {
PR_fprintf(PR_STDERR, "Error opening input terminal for read\n");
return NULL;
}
/* we have no password, so initialize database with one */
PR_fprintf(PR_STDERR,
"In order to finish creating your database, you\n");
PR_fprintf(PR_STDERR, "must enter a password which will be used to\n");
PR_fprintf(PR_STDERR, "encrypt this key and any future keys.\n\n");
PR_fprintf(PR_STDERR,
"The password must be at least 8 characters long,\n");
PR_fprintf(PR_STDERR, "and must contain at least one non-alphabetic ");
PR_fprintf(PR_STDERR, "character.\n\n");
} else if (pwdata->source == PW_FROMFILE) {
input = fopen(pwdata->data, "r");
if (input == NULL) {
PR_fprintf(PR_STDERR, "Error opening \"%s\" for read\n",
pwdata->data);
return NULL;
}
} else {
p0 = PL_strdup(pwdata->data);
if (pwdata->source == PW_FROMFILE) {
return SECU_FilePasswd(slot, retry, pwdata->data);
} else if (pwdata->source == PW_PLAINTEXT) {
return PL_strdup(pwdata->data);
}
/* PW_NONE - get it from tty */
/* open terminal */
#ifdef _WINDOWS
input = stdin;
#else
input = fopen(consoleName, "r");
#endif
if (input == NULL) {
PR_fprintf(PR_STDERR, "Error opening input terminal for read\n");
return NULL;
}
/* we have no password, so initialize database with one */
PR_fprintf(PR_STDERR, "In order to finish creating your database, you\n");
PR_fprintf(PR_STDERR, "must enter a password which will be used to\n");
PR_fprintf(PR_STDERR, "encrypt this key and any future keys.\n\n");
PR_fprintf(PR_STDERR, "The password must be at least 8 characters long,\n");
PR_fprintf(PR_STDERR, "and must contain at least one non-alphabetic ");
PR_fprintf(PR_STDERR, "character.\n\n");
output = fopen(consoleName, "w");
if (output == NULL) {