diff options
| author | Bodo Möller <bodo@openssl.org> | 2002-03-14 09:52:03 +0000 |
|---|---|---|
| committer | Bodo Möller <bodo@openssl.org> | 2002-03-14 09:52:03 +0000 |
| commit | 690ecff7953193cc8e66b588216805f3014df778 (patch) | |
| tree | c21fb14c3d0b01ae50dd4c9d8a485b8824d78e35 /apps/apps.c | |
| parent | 234c73767daf1dfadbdbff3f884d7cfffff2846c (diff) | |
Fixes for 'no-hw' combined with 'no-SOME_CIPHER'.
Fix dsaparam usage output.
Submitted by: Nils Larsch
Diffstat (limited to 'apps/apps.c')
| -rw-r--r-- | apps/apps.c | 8 |
1 files changed, 4 insertions, 4 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) |