aboutsummaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2000-07-12 23:55:30 +0000
committerDr. Stephen Henson <steve@openssl.org>2000-07-12 23:55:30 +0000
commitfd13f0ee52122e7a1f6deec1c4fd73fa1a0cb36b (patch)
tree613018755fbdbd583f7734cf51697206f997a615 /apps
parentb364e5d27bb23433f5cbe3543add1ccdc0681006 (diff)
downloadopenssl-fd13f0ee52122e7a1f6deec1c4fd73fa1a0cb36b.tar.gz
Make req seed the PRNG if signing with
an already existing DSA key. Document the new smime options.
Diffstat (limited to 'apps')
-rw-r--r--apps/req.c5
-rw-r--r--apps/smime.c3
2 files changed, 8 insertions, 0 deletions
diff --git a/apps/req.c b/apps/req.c
index fd26ed8343..6a225bb431 100644
--- a/apps/req.c
+++ b/apps/req.c
@@ -547,6 +547,11 @@ bad:
BIO_printf(bio_err,"unable to load Private key\n");
goto end;
}
+ if (EVP_PKEY_type(pkey->type) == EVP_PKEY_DSA)
+ {
+ char *randfile = CONF_get_string(req_conf,SECTION,"RANDFILE");
+ app_RAND_load_file(randfile, bio_err, 0);
+ }
}
if (newreq && (pkey == NULL))
diff --git a/apps/smime.c b/apps/smime.c
index ebc0eb6af4..e380443d6c 100644
--- a/apps/smime.c
+++ b/apps/smime.c
@@ -277,8 +277,11 @@ int MAIN(int argc, char **argv)
BIO_printf (bio_err, "-signer file signer certificate file\n");
BIO_printf (bio_err, "-recip file recipient certificate file for decryption\n");
BIO_printf (bio_err, "-in file input file\n");
+ BIO_printf (bio_err, "-inform arg input format SMIME (default), PEM or DER\n");
BIO_printf (bio_err, "-inkey file input private key (if not signer or recipient)\n");
BIO_printf (bio_err, "-out file output file\n");
+ BIO_printf (bio_err, "-outform arg output format SMIME (default), PEM or DER\n");
+ BIO_printf (bio_err, "-content file supply or override content for detached signature\n");
BIO_printf (bio_err, "-to addr to address\n");
BIO_printf (bio_err, "-from ad from address\n");
BIO_printf (bio_err, "-subject s subject\n");