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

fixes RFE from bug 49316 (will test on NT before verifying)

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@78982 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
mcgreer%netscape.com 2000-09-13 06:43:52 +00:00
parent b8ee668672
commit a945d82e5a
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -562,7 +562,7 @@ printCertCB(CERTCertificate *cert, void *arg)
static SECStatus
ListCerts(CERTCertDBHandle *handle, char *name, PK11SlotInfo *slot,
PRBool raw, PRBool ascii)
PRBool raw, PRBool ascii, PRFileDesc *outfile)
{
SECStatus rv;
CERTCertificate *cert;
@ -594,10 +594,10 @@ ListCerts(CERTCertDBHandle *handle, char *name, PK11SlotInfo *slot,
data.data = cert->derCert.data;
data.len = cert->derCert.len;
if (ascii) {
PR_fprintf(PR_STDOUT, "%s\n%s\n%s\n", NS_CERT_HEADER,
PR_fprintf(outfile, "%s\n%s\n%s\n", NS_CERT_HEADER,
BTOA_DataToAscii(data.data, data.len), NS_CERT_TRAILER);
} else if (raw) {
numBytes = PR_Write(PR_STDOUT, data.data, data.len);
numBytes = PR_Write(outfile, data.data, data.len);
if (numBytes != data.len) {
SECU_PrintSystemError(progName, "error writing raw cert");
return SECFailure;
@ -2422,7 +2422,8 @@ main(int argc, char **argv)
if (certutil.commands[cmd_ListCerts].activated) {
rv = ListCerts(certHandle, name, slot,
certutil.options[opt_BinaryDER].activated,
certutil.options[opt_ASCIIForIO].activated);
certutil.options[opt_ASCIIForIO].activated,
(outFile) ? outFile : PR_STDOUT);
return !rv - 1;
}
/* XXX needs work */