diff options
| author | Bodo Möller <bodo@openssl.org> | 2002-03-14 09:53:30 +0000 |
|---|---|---|
| committer | Bodo Möller <bodo@openssl.org> | 2002-03-14 09:53:30 +0000 |
| commit | d80f6e0f8c61cbbca55a2d2cd900e5052a5b8d36 (patch) | |
| tree | 9ee98bfccbec59fb9b85689cc56b614d523da987 /apps | |
| parent | 13962f0b151a8e821a5c3e80c16bb045eaec6780 (diff) | |
Fixes for 'no-hw' combined with 'no-SOME_CIPHER'.
Fix dsaparam usage output.
Submitted by: Nils Larsch (for 0.9.8-dev; backported to 0.9.7-dev)
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/apps.c | 8 | ||||
| -rw-r--r-- | apps/dsaparam.c | 1 | ||||
| -rw-r--r-- | apps/pkcs8.c | 2 | ||||
| -rw-r--r-- | apps/speed.c | 3 |
4 files changed, 7 insertions, 7 deletions
diff --git a/apps/apps.c b/apps/apps.c index f0c280c38d..e797796e30 100644 --- a/apps/apps.c +++ b/apps/apps.c @@ -147,7 +147,7 @@ static UI_METHOD *ui_method = NULL; static int set_table_opts(unsigned long *flags, const char *arg, const NAME_EX_TBL *in_tbl); static int set_multi_opts(unsigned long *flags, const char *arg, const NAME_EX_TBL *in_tbl); -#ifndef OPENSSL_NO_RC4 +#if !defined(OPENSSL_NO_RC4) && !defined(OPENSSL_NO_RSA) /* Looks like this stuff is worth moving into separate function */ static EVP_PKEY * load_netscape_key(BIO *err, BIO *key, const char *file, @@ -832,7 +832,7 @@ EVP_PKEY *load_key(BIO *err, const char *file, int format, pkey=PEM_read_bio_PrivateKey(key,NULL, (pem_password_cb *)password_callback, &cb_data); } -#ifndef OPENSSL_NO_RC4 +#if !defined(OPENSSL_NO_RC4) && !defined(OPENSSL_NO_RSA) else if (format == FORMAT_NETSCAPE || format == FORMAT_IISSGC) pkey = load_netscape_key(err, key, file, key_descrip, format); #endif @@ -901,7 +901,7 @@ EVP_PKEY *load_pubkey(BIO *err, const char *file, int format, pkey=PEM_read_bio_PUBKEY(key,NULL, (pem_password_cb *)password_callback, &cb_data); } -#ifndef OPENSSL_NO_RC4 +#if !defined(OPENSSL_NO_RC4) && !defined(OPENSSL_NO_RSA) else if (format == FORMAT_NETSCAPE || format == FORMAT_IISSGC) pkey = load_netscape_key(err, key, file, key_descrip, format); #endif @@ -917,7 +917,7 @@ EVP_PKEY *load_pubkey(BIO *err, const char *file, int format, return(pkey); } -#ifndef OPENSSL_NO_RC4 +#if !defined(OPENSSL_NO_RC4) && !defined(OPENSSL_NO_RSA) EVP_PKEY * load_netscape_key(BIO *err, BIO *key, const char *file, const char *key_descrip, int format) diff --git a/apps/dsaparam.c b/apps/dsaparam.c index d54c77d93e..c6ecc48904 100644 --- a/apps/dsaparam.c +++ b/apps/dsaparam.c @@ -189,6 +189,7 @@ bad: BIO_printf(bio_err," -text print the key in text\n"); BIO_printf(bio_err," -C Output C code\n"); BIO_printf(bio_err," -noout no output\n"); + BIO_printf(bio_err," -genkey generate a DSA key\n"); BIO_printf(bio_err," -rand files to use for random number input\n"); BIO_printf(bio_err," -engine e use engine e, possibly a hardware device.\n"); BIO_printf(bio_err," number number of bits to use for generating private key\n"); diff --git a/apps/pkcs8.c b/apps/pkcs8.c index ea8c04dffa..ba91caee6b 100644 --- a/apps/pkcs8.c +++ b/apps/pkcs8.c @@ -83,7 +83,7 @@ int MAIN(int argc, char **argv) int nocrypt = 0; X509_SIG *p8; PKCS8_PRIV_KEY_INFO *p8inf; - EVP_PKEY *pkey; + EVP_PKEY *pkey=NULL; char pass[50], *passin = NULL, *passout = NULL, *p8pass = NULL; int badarg = 0; char *engine=NULL; diff --git a/apps/speed.c b/apps/speed.c index b451a49af3..e817a0df15 100644 --- a/apps/speed.c +++ b/apps/speed.c @@ -372,11 +372,10 @@ int MAIN(int argc, char **argv) ENGINE *e = NULL; unsigned char *buf=NULL,*buf2=NULL; int mret=1; - long count=0,save_count=0; + long count=0,save_count=0, rsa_count; int i,j,k; #ifndef OPENSSL_NO_RSA unsigned rsa_num; - long rsa_count; #endif unsigned char md[EVP_MAX_MD_SIZE]; #ifndef OPENSSL_NO_MD2 |