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

Bug 285208 Fixes ext processing bug introduced by previous patch.

Browse Source 
r=nelson


git-svn-id: svn://10.0.0.236/trunk@170816 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
neil.williams%sun.com 2005-03-17 01:43:47 +00:00
parent 7db82a2e87
commit e36019c5db
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
mozilla/security/nss/cmd/certutil/certutil.c
View File

@ -2939,9 +2939,8 @@ secuCommandFlag certutil_options[] =
* Certificate request
*/
/* Make a cert request (-R or -S). */
if (certutil.commands[cmd_CreateAndAddCert].activated ||
certutil.commands[cmd_CertReq].activated) {
/* Make a cert request (-R). */
if (certutil.commands[cmd_CertReq].activated) {
rv = CertReq(privkey, pubkey, keytype, hashAlgTag, subject,
certutil.options[opt_PhoneNumber].arg,
certutil.options[opt_ASCIIForIO].activated,
@ -2963,10 +2962,26 @@ secuCommandFlag certutil_options[] =
* Certificate creation
*/
/* If making and adding a cert, load the cert request file
/* If making and adding a cert, create a cert request file first without
* any extensions, then load it with the command line extensions
* and output the cert to another file.
*/
if (certutil.commands[cmd_CreateAndAddCert].activated) {
rv = CertReq(privkey, pubkey, keytype, hashAlgTag, subject,
certutil.options[opt_PhoneNumber].arg,
certutil.options[opt_ASCIIForIO].activated,
NULL,
NULL,
PR_FALSE,
PR_FALSE,
PR_FALSE,
PR_FALSE,
PR_FALSE,
PR_FALSE,
outFile ? outFile : PR_STDOUT);
if (rv)
goto shutdown;
privkey->wincx = &pwdata;
PR_Close(outFile);
inFile = PR_Open(certreqfile, PR_RDONLY, 0);
if (!inFile) {