diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2009-04-23 17:16:40 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2009-04-23 17:16:40 +0000 |
| commit | 7134507de0cc51f08b482987d87b87830816f2a6 (patch) | |
| tree | 83326e3e8f886da2d3479f0f49101949ec35af53 /apps/apps.c | |
| parent | fe41d9853c38b578d601e27a7508e69f70b91005 (diff) | |
Make no-rsa, no-dsa and no-dh compile again.
Diffstat (limited to 'apps/apps.c')
| -rw-r--r-- | apps/apps.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/apps/apps.c b/apps/apps.c index 7294c26f31..b04bfbd3c3 100644 --- a/apps/apps.c +++ b/apps/apps.c @@ -921,11 +921,13 @@ EVP_PKEY *load_key(BIO *err, const char *file, int format, int maybe_stdin, &pkey, NULL, NULL)) goto end; } +#if !defined(OPENSSL_NO_RSA) && !defined(OPENSSL_NO_DSA) else if (format == FORMAT_MSBLOB) pkey = b2i_PrivateKey_bio(key); else if (format == FORMAT_PVK) pkey = b2i_PVK_bio(key, (pem_password_cb *)password_callback, &cb_data); +#endif else { BIO_printf(err,"bad input format specified for key file\n"); @@ -989,6 +991,7 @@ EVP_PKEY *load_pubkey(BIO *err, const char *file, int format, int maybe_stdin, { pkey=d2i_PUBKEY_bio(key, NULL); } +#ifndef OPENSSL_NO_RSA else if (format == FORMAT_ASN1RSA) { RSA *rsa; @@ -1018,7 +1021,7 @@ EVP_PKEY *load_pubkey(BIO *err, const char *file, int format, int maybe_stdin, else pkey = NULL; } - +#endif else if (format == FORMAT_PEM) { pkey=PEM_read_bio_PUBKEY(key,NULL, @@ -1028,8 +1031,10 @@ EVP_PKEY *load_pubkey(BIO *err, const char *file, int format, int maybe_stdin, else if (format == FORMAT_NETSCAPE || format == FORMAT_IISSGC) pkey = load_netscape_key(err, key, file, key_descrip, format); #endif +#if !defined(OPENSSL_NO_RSA) && !defined(OPENSSL_NO_DSA) else if (format == FORMAT_MSBLOB) pkey = b2i_PublicKey_bio(key); +#endif else { BIO_printf(err,"bad input format specified for key file\n"); |