From 00a37b5a9b295c1b55ca9a1c1f207d347ad5b24a Mon Sep 17 00:00:00 2001 From: "Dr. Stephen Henson" Date: Tue, 6 Apr 2010 11:18:59 +0000 Subject: PR: 2220 Fixes to make OpenSSL compile with no-rc4 --- apps/apps.c | 2 +- apps/dsa.c | 2 +- apps/rsa.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'apps') diff --git a/apps/apps.c b/apps/apps.c index 3edb76c871..200f1963f5 100644 --- a/apps/apps.c +++ b/apps/apps.c @@ -923,7 +923,7 @@ 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) +#if !defined(OPENSSL_NO_RSA) && !defined(OPENSSL_NO_DSA) && !defined (OPENSSL_NO_RC4) else if (format == FORMAT_MSBLOB) pkey = b2i_PrivateKey_bio(key); else if (format == FORMAT_PVK) diff --git a/apps/dsa.c b/apps/dsa.c index 1109346f78..5222487ab9 100644 --- a/apps/dsa.c +++ b/apps/dsa.c @@ -334,7 +334,7 @@ bad: i=PEM_write_bio_DSA_PUBKEY(out,dsa); else i=PEM_write_bio_DSAPrivateKey(out,dsa,enc, NULL,0,NULL, passout); -#ifndef OPENSSL_NO_RSA +#if !defined(OPENSSL_NO_RSA) && !defined(OPENSSL_NO_RC4) } else if (outformat == FORMAT_MSBLOB || outformat == FORMAT_PVK) { EVP_PKEY *pk; pk = EVP_PKEY_new(); diff --git a/apps/rsa.c b/apps/rsa.c index b3c8aff7e3..a17708fe9c 100644 --- a/apps/rsa.c +++ b/apps/rsa.c @@ -409,7 +409,7 @@ bad: } else i=PEM_write_bio_RSAPrivateKey(out,rsa, enc,NULL,0,NULL,passout); -#ifndef OPENSSL_NO_DSA +#if !defined(OPENSSL_NO_DSA) && !defined(OPENSSL_NO_RC4) } else if (outformat == FORMAT_MSBLOB || outformat == FORMAT_PVK) { EVP_PKEY *pk; pk = EVP_PKEY_new(); -- cgit v1.2.3