Commit 70531c14 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Make no-engine work again.

parent 75bbf6e1

apps/dsa.c

+0 −2
Original line number Diff line number Diff line
@@ -96,9 +96,7 @@ int MAIN(int, char **); 


int MAIN(int argc, char **argv)

	{

#ifndef OPENSSL_NO_ENGINE

	ENGINE *e = NULL;

#endif

	int ret=1;

	DSA *dsa=NULL;

	int i,badops=0;

apps/engine.c

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,6 @@ 
 *

 */



#ifndef OPENSSL_NO_ENGINE



#include <stdio.h>

#include <stdlib.h>
@@ -66,6 +65,7 @@ 
#endif

#include "apps.h"

#include <openssl/err.h>

#ifndef OPENSSL_NO_ENGINE

#include <openssl/engine.h>

#include <openssl/ssl.h>

apps/genpkey.c

+2 −0
Original line number Diff line number Diff line
@@ -376,8 +376,10 @@ int init_gen_str(BIO *err, EVP_PKEY_CTX **pctx, 


	ameth = EVP_PKEY_asn1_find_str(&tmpeng, algname, -1);



#ifndef OPENSSL_NO_ENGINE

	if (!ameth && e)

		ameth = ENGINE_get_pkey_asn1_meth_str(e, algname, -1);

#endif



	if (!ameth)

		{

apps/pkeyparam.c

+3 −1
Original line number Diff line number Diff line
@@ -68,13 +68,13 @@ int MAIN(int, char **); 


int MAIN(int argc, char **argv)

	{

	ENGINE *e = NULL;

	char **args, *infile = NULL, *outfile = NULL;

	BIO *in = NULL, *out = NULL;

	int text = 0, noout = 0;

	EVP_PKEY *pkey=NULL;

	int badarg = 0;

#ifndef OPENSSL_NO_ENGINE

	ENGINE *e = NULL;

	char *engine=NULL;

#endif

	int ret = 1;
@@ -125,7 +125,9 @@ int MAIN(int argc, char **argv) 


	if (badarg)

		{

#ifndef OPENSSL_NO_ENGINE

		bad:

#endif

		BIO_printf(bio_err, "Usage pkeyparam [options]\n");

		BIO_printf(bio_err, "where options are\n");

		BIO_printf(bio_err, "-in file        input file\n");

apps/s_client.c

+2 −1
Original line number Diff line number Diff line
@@ -413,8 +413,9 @@ int MAIN(int argc, char **argv) 
#ifndef OPENSSL_NO_ENGINE

	char *engine_id=NULL;

	char *ssl_client_engine_id=NULL;

	ENGINE *e=NULL, *ssl_client_engine=NULL;

	ENGINE *ssl_client_engine=NULL;

#endif

	ENGINE *e=NULL;

#if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_MSDOS) || defined(OPENSSL_SYS_NETWARE) || defined(OPENSSL_SYS_BEOS_R5)

	struct timeval tv;

#if defined(OPENSSL_SYS_BEOS_R5)