From 2cad035c011841248fbd8dfc4810bb1188ef190e Mon Sep 17 00:00:00 2001
From: "Dr. Stephen Henson" <steve@openssl.org>
Date: Sat, 20 Dec 2008 17:04:09 +0000
Subject: [PATCH] Make no-engine work again...

---
 apps/dsa.c                 | 2 --
 apps/engine.c              | 2 +-
 apps/s_client.c            | 3 ++-
 apps/s_server.c            | 2 --
 crypto/engine/enginetest.c | 2 +-
 5 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/apps/dsa.c b/apps/dsa.c
index 7518a2fe96..cbc1fe3f81 100644
--- a/apps/dsa.c
+++ b/apps/dsa.c
@@ -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;
diff --git a/apps/engine.c b/apps/engine.c
index 25c8617107..1d0dd9bfbc 100644
--- a/apps/engine.c
+++ b/apps/engine.c
@@ -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>
 
diff --git a/apps/s_client.c b/apps/s_client.c
index dc1308b288..4974f5fc93 100644
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -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
diff --git a/apps/s_server.c b/apps/s_server.c
index fcf9e402e5..84b1b28461 100644
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -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;
diff --git a/crypto/engine/enginetest.c b/crypto/engine/enginetest.c
index cf82f490db..e3834611db 100644
--- a/crypto/engine/enginetest.c
+++ b/crypto/engine/enginetest.c
@@ -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>