diff options
| author | Kai Engert <kaie@kuix.de> | 2013-06-11 21:14:37 +0200 |
|---|---|---|
| committer | Kai Engert <kaie@kuix.de> | 2013-06-11 21:14:37 +0200 |
| commit | d4128557f4a186c1bc7d16fa121f293c43353ac7 (patch) | |
| tree | 523d92c477dca5dbc9603dde2d5fa4109270872e /cmd/crlutil | |
| parent | 1e62b3cbbb3c71a6d269ae6a5215331ca813c894 (diff) | |
| download | nss-hg-d4128557f4a186c1bc7d16fa121f293c43353ac7.tar.gz | |
Bug 876352 - certutil: (a) Warn if importing PEM file with private key (b) fail if user attempts to import cert with requested "u" trust, r=rrelyea
Diffstat (limited to 'cmd/crlutil')
| -rw-r--r-- | cmd/crlutil/crlutil.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cmd/crlutil/crlutil.c b/cmd/crlutil/crlutil.c index 301746b5d..dd9f4932e 100644 --- a/cmd/crlutil/crlutil.c +++ b/cmd/crlutil/crlutil.c @@ -232,7 +232,7 @@ SECStatus ImportCRL (CERTCertDBHandle *certHandle, char *url, int type, /* Read in the entire file specified with the -f argument */ - rv = SECU_ReadDERFromFile(&crlDER, inFile, PR_FALSE); + rv = SECU_ReadDERFromFile(&crlDER, inFile, PR_FALSE, PR_FALSE); if (rv != SECSuccess) { SECU_PrintError(progName, "unable to read input file"); return (SECFailure); @@ -291,7 +291,7 @@ SECStatus DumpCRL(PRFileDesc *inFile) crlDER.data = NULL; /* Read in the entire file specified with the -f argument */ - rv = SECU_ReadDERFromFile(&crlDER, inFile, PR_FALSE); + rv = SECU_ReadDERFromFile(&crlDER, inFile, PR_FALSE, PR_FALSE); if (rv != SECSuccess) { SECU_PrintError(progName, "unable to read input file"); return (SECFailure); @@ -386,7 +386,7 @@ CreateModifiedCRLCopy(PLArenaPool *arena, CERTCertDBHandle *certHandle, } if (inFile != NULL) { - rv = SECU_ReadDERFromFile(&crlDER, inFile, PR_FALSE); + rv = SECU_ReadDERFromFile(&crlDER, inFile, PR_FALSE, PR_FALSE); if (rv != SECSuccess) { SECU_PrintError(progName, "unable to read input file"); PORT_FreeArena(modArena, PR_FALSE); |