diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2008-12-20 17:04:09 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2008-12-20 17:04:09 +0000 |
| commit | 2cad035c011841248fbd8dfc4810bb1188ef190e (patch) | |
| tree | a6c31f42d0db70e6f776c703dff683fd1d8c93b2 /apps | |
| parent | 2a76c68842594b4ab4b5b7cf439515b5015ad9bf (diff) | |
Make no-engine work again...
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/dsa.c | 2 | ||||
| -rw-r--r-- | apps/engine.c | 2 | ||||
| -rw-r--r-- | apps/s_client.c | 3 | ||||
| -rw-r--r-- | apps/s_server.c | 2 |
4 files changed, 3 insertions, 6 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; |