Commit 2cad035c authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Make no-engine work again...

parent 2a76c688

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/s_client.c

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

	struct timeval tv;

#endif

apps/s_server.c

+0 −2
Original line number Diff line number Diff line
@@ -764,9 +764,7 @@ int MAIN(int argc, char *argv[]) 
	int state=0;

	SSL_METHOD *meth=NULL;

        int socket_type=SOCK_STREAM;

#ifndef OPENSSL_NO_ENGINE

	ENGINE *e=NULL;

#endif

	char *inrand=NULL;

	int s_cert_format = FORMAT_PEM, s_key_format = FORMAT_PEM;

	char *passarg = NULL, *pass = NULL;

crypto/engine/enginetest.c

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


#include <stdio.h>

#include <string.h>

#include <openssl/e_os2.h>



#ifdef OPENSSL_NO_ENGINE

int main(int argc, char *argv[])
@@ -66,7 +67,6 @@ int main(int argc, char *argv[]) 
    return(0);

}

#else

#include <openssl/e_os2.h>

#include <openssl/buffer.h>

#include <openssl/crypto.h>

#include <openssl/engine.h>