diff options
| author | Richard Levitte <levitte@openssl.org> | 2002-08-01 16:28:40 +0000 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2002-08-01 16:28:40 +0000 |
| commit | da9b97246695c370702d15be2b3778427cf57082 (patch) | |
| tree | 9ef594c01fa55c710cc254495f366e6763b368fc /apps/x509.c | |
| parent | bd45950f4a85d04eb23a4d3846ed5a3c13bd19e0 (diff) | |
| download | openssl-da9b97246695c370702d15be2b3778427cf57082.tar.gz | |
Make it possible to load keys from stdin, and restore that
functionality in the programs that had that before.
Part fo PR 164
Diffstat (limited to 'apps/x509.c')
| -rw-r--r-- | apps/x509.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/apps/x509.c b/apps/x509.c index dd98eb3b08..67476e34cf 100644 --- a/apps/x509.c +++ b/apps/x509.c @@ -861,8 +861,8 @@ bad: if (Upkey == NULL) { Upkey=load_key(bio_err, - keyfile,keyformat, passin, e, - "Private key"); + keyfile, keyformat, 0, + passin, e, "Private key"); if (Upkey == NULL) goto end; } #ifndef OPENSSL_NO_DSA @@ -884,8 +884,9 @@ bad: if (CAkeyfile != NULL) { CApkey=load_key(bio_err, - CAkeyfile,CAkeyformat, passin, - e, "CA Private Key"); + CAkeyfile, CAkeyformat, + 0, passin, e, + "CA Private Key"); if (CApkey == NULL) goto end; } #ifndef OPENSSL_NO_DSA @@ -916,8 +917,8 @@ bad: else { pk=load_key(bio_err, - keyfile,FORMAT_PEM, passin, e, - "request key"); + keyfile, FORMAT_PEM, 0, + passin, e, "request key"); if (pk == NULL) goto end; } |