diff options
| author | kirke%netscape.com <devnull@localhost> | 2001-01-31 23:25:02 +0000 |
|---|---|---|
| committer | kirke%netscape.com <devnull@localhost> | 2001-01-31 23:25:02 +0000 |
| commit | 610623b37cae851c5c5185b28c5099116e16a653 (patch) | |
| tree | a0a3dc737bddde8ff0c72e4aac065fdd4b536d66 /security/nss/cmd/pk12util | |
| parent | 4eb7618433660c6ff612fc8856130fca595bdfbd (diff) | |
| download | nss-hg-610623b37cae851c5c5185b28c5099116e16a653.tar.gz | |
Resolves bug 66244 - Many NSS command do not detect failure of NSS_Init* functions. Introduced SECU_PrintPRandOSError(progName); to print on failure. Each command is responsible for exiting with appropriate status to distinguish failure points.
Diffstat (limited to 'security/nss/cmd/pk12util')
| -rw-r--r-- | security/nss/cmd/pk12util/pk12util.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/security/nss/cmd/pk12util/pk12util.c b/security/nss/cmd/pk12util/pk12util.c index 5f5770cec..a08cdbf8b 100644 --- a/security/nss/cmd/pk12util/pk12util.c +++ b/security/nss/cmd/pk12util/pk12util.c @@ -42,7 +42,7 @@ #define PKCS12_IN_BUFFER_SIZE 200 -char *progName; +static char *progName; PRIntn pk12uErrno = 0; @@ -784,10 +784,18 @@ loser: static PRUintn P12U_Init(char *dir) { + SECStatus rv; PK11_SetPasswordFunc(SECU_GetModulePassword); PR_Init(PR_SYSTEM_THREAD, PR_PRIORITY_NORMAL, 1); - NSS_InitReadWrite(dir); + rv = NSS_InitReadWrite(dir); + if (rv != SECSuccess) { + SECU_PrintPRandOSError(progName); + exit(-1); + } + + /* enable all ciphers */ + p12u_EnableAllCiphers(); /* setup unicode callback functions */ PORT_SetUCS2_ASCIIConversionFunction(p12u_ucs2_ascii_conversion_function); |