Make no-engine work again...

diff --git a/apps/dsa.c b/apps/dsa.c
index 7518a2fe964a6ce25709bf66808aa4af396e62b3..cbc1fe3f81972715941d45233a13a6cb44533d8d 100644 (file)
--- 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 25c86171079966bdfb7f23c67592f3e82b49d012..1d0dd9bfbc4f4ff632b2920abae484d0b32baed3 100644 (file)
--- 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 dc1308b28822334e870399ab2c946932bb7a73ca..4974f5fc935ba372e6e0e4c4becc16c58ffd0d3d 100644 (file)
--- 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 fcf9e402e5f0dce1294cdb0c72a9de17240a61d0..84b1b284613fbf10875260ef5224be21842bc3f7 100644 (file)
--- 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 cf82f490dbb5e0542c59d12b9addd2707f4283c2..e3834611dbdbe91bd05fab50d7f4bdcb1e5de4e1 100644 (file)
--- 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>