diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2008-12-20 17:04:40 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2008-12-20 17:04:40 +0000 |
| commit | 70531c147c2d38b03f109312a270ccc0af6cf8d6 (patch) | |
| tree | 0ef375be374bef4018aa0a2c560aaec44c9e6464 /apps | |
| parent | 75bbf6e14c14583a7fd3c1ca03888d4eb5568d4f (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/genpkey.c | 2 | ||||
| -rw-r--r-- | apps/pkeyparam.c | 4 | ||||
| -rw-r--r-- | apps/s_client.c | 3 | ||||
| -rw-r--r-- | apps/s_server.c | 2 | ||||
| -rw-r--r-- | apps/ts.c | 3 |
7 files changed, 10 insertions, 8 deletions
diff --git a/apps/dsa.c b/apps/dsa.c index 0ebba0862d..5911f11873 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 b51244acc8..baee8243db 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/genpkey.c b/apps/genpkey.c index dc69e743b2..6dfda08b9e 100644 --- a/apps/genpkey.c +++ b/apps/genpkey.c @@ -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) { diff --git a/apps/pkeyparam.c b/apps/pkeyparam.c index 0b911af636..4319eb4de5 100644 --- a/apps/pkeyparam.c +++ b/apps/pkeyparam.c @@ -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"); diff --git a/apps/s_client.c b/apps/s_client.c index f0783bcd58..dcc289b798 100644 --- a/apps/s_client.c +++ b/apps/s_client.c @@ -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) diff --git a/apps/s_server.c b/apps/s_server.c index 12d39c35bb..b6cc5eecb7 100644 --- a/apps/s_server.c +++ b/apps/s_server.c @@ -849,9 +849,7 @@ int MAIN(int argc, char *argv[]) int state=0; const 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; @@ -813,9 +813,10 @@ static TS_RESP *create_response(CONF *conf, const char *section, char *engine, /* Setting serial number provider callback. */ if (!TS_CONF_set_serial(conf, section, serial_cb, resp_ctx)) goto end; - +#ifndef OPENSSL_NO_ENGINE /* Setting default OpenSSL engine. */ if (!TS_CONF_set_crypto_device(conf, section, engine)) goto end; +#endif /* Setting TSA signer certificate. */ if (!TS_CONF_set_signer_cert(conf, section, signer, resp_ctx)) goto end; |