Commit 00a37b5a authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

PR: 2220 

Fixes to make OpenSSL compile with no-rc4
parent bc494872

apps/apps.c

+1 −1
Original line number Diff line number Diff line
@@ -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)

apps/dsa.c

+1 −1
Original line number Diff line number Diff line
@@ -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();

apps/rsa.c

+1 −1
Original line number Diff line number Diff line
@@ -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();

crypto/pem/pem.h

+2 −1
Original line number Diff line number Diff line
@@ -548,10 +548,11 @@ EVP_PKEY *b2i_PrivateKey_bio(BIO *in); 
EVP_PKEY *b2i_PublicKey_bio(BIO *in);

int i2b_PrivateKey_bio(BIO *out, EVP_PKEY *pk);

int i2b_PublicKey_bio(BIO *out, EVP_PKEY *pk);



#ifndef OPENSSL_NO_RC4

EVP_PKEY *b2i_PVK_bio(BIO *in, pem_password_cb *cb, void *u);

int i2b_PVK_bio(BIO *out, EVP_PKEY *pk, int enclevel,

		pem_password_cb *cb, void *u);

#endif





/* BEGIN ERROR CODES */

crypto/pem/pvkfmt.c

+5 −0
Original line number Diff line number Diff line
@@ -654,6 +654,8 @@ int i2b_PublicKey_bio(BIO *out, EVP_PKEY *pk) 
	return do_i2b_bio(out, pk, 1);

	}



#ifndef OPENSSL_NO_RC4



static int do_PVK_header(const unsigned char **in, unsigned int length,

		int skip_magic,

	       	unsigned int *psaltlen, unsigned int *pkeylen)
@@ -946,4 +948,7 @@ int i2b_PVK_bio(BIO *out, EVP_PKEY *pk, int enclevel, 
		}

	return -1;

	}



#endif



#endif