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 /crypto | |
| parent | 75bbf6e14c14583a7fd3c1ca03888d4eb5568d4f (diff) | |
Make no-engine work again.
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/engine/enginetest.c | 2 | ||||
| -rw-r--r-- | crypto/ts/ts_conf.c | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/crypto/engine/enginetest.c b/crypto/engine/enginetest.c index 3c1d2b4fbe..f4d70e7e0a 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> diff --git a/crypto/ts/ts_conf.c b/crypto/ts/ts_conf.c index fbd294b4ba..c39be76f28 100644 --- a/crypto/ts/ts_conf.c +++ b/crypto/ts/ts_conf.c @@ -61,7 +61,9 @@ #include <openssl/crypto.h> #include "cryptlib.h" #include <openssl/pem.h> +#ifndef OPENSSL_NO_ENGINE #include <openssl/engine.h> +#endif #include <openssl/ts.h> /* Macro definitions for the configuration file. */ @@ -185,6 +187,8 @@ int TS_CONF_set_serial(CONF *conf, const char *section, TS_serial_cb cb, return ret; } +#ifndef OPENSSL_NO_ENGINE + int TS_CONF_set_crypto_device(CONF *conf, const char *section, const char *device) { @@ -230,6 +234,8 @@ int TS_CONF_set_default_engine(const char *name) return ret; } +#endif + int TS_CONF_set_signer_cert(CONF *conf, const char *section, const char *cert, TS_RESP_CTX *ctx) { |