Commit 7134507d authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Make no-rsa, no-dsa and no-dh compile again.

parent fe41d985

Configure

+2 −1
Changes for Configure: 2 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -918,7 +918,8 @@ if (defined($disabled{"tls1"})) 
	$disabled{"tlsext"} = "forced";

	}



if (defined($disabled{"ec"}))

if (defined($disabled{"ec"}) || defined($disabled{"dsa"})

    || defined($disabled{"dh"}))

	{

	$disabled{"gost"} = "forced";

	}

apps/apps.c

+6 −1
Changes for apps/apps.c: 6 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -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");

apps/dh.c

+6 −0
Changes for apps/dh.c: 6 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -349,4 +349,10 @@ end: 
	apps_shutdown();

	OPENSSL_EXIT(ret);

	}

#else /* !OPENSSL_NO_DH */



# if PEDANTIC

static void *dummy=&dummy;

# endif



#endif

apps/dhparam.c

+6 −0
Changes for apps/dhparam.c: 6 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -554,4 +554,10 @@ static int MS_CALLBACK dh_cb(int p, int n, BN_GENCB *cb) 
	return 1;

	}



#else /* !OPENSSL_NO_DH */



# if PEDANTIC

static void *dummy=&dummy;

# endif



#endif

apps/dsa.c

+8 −0
Changes for apps/dsa.c: 8 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -334,6 +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

	} else if (outformat == FORMAT_MSBLOB || outformat == FORMAT_PVK) {

		EVP_PKEY *pk;

		pk = EVP_PKEY_new();
@@ -345,6 +346,7 @@ bad: 
		else

			i = i2b_PrivateKey_bio(out, pk);

		EVP_PKEY_free(pk);

#endif

	} else {

		BIO_printf(bio_err,"bad output format specified for outfile\n");

		goto end;
@@ -365,4 +367,10 @@ end: 
	apps_shutdown();

	OPENSSL_EXIT(ret);

	}

#else /* !OPENSSL_NO_DSA */



# if PEDANTIC

static void *dummy=&dummy;

# endif



#endif