diff options
| author | Piotr Sikora <piotr@cloudflare.com> | 2014-07-28 12:27:57 -0700 |
|---|---|---|
| committer | Piotr Sikora <piotr@cloudflare.com> | 2014-07-28 12:27:57 -0700 |
| commit | a57394b3e948f5176e14880651f6ddf53214edd2 (patch) | |
| tree | 938292d7e99836bd56ce30975137f7ea0cb5ea2c /src | |
| parent | 5958181b1e28089a4e487511fe208f586a8b3205 (diff) | |
| download | nginx-a57394b3e948f5176e14880651f6ddf53214edd2.tar.gz nginx-a57394b3e948f5176e14880651f6ddf53214edd2.tar.bz2 | |
SSL: fix build with OPENSSL_NO_ENGINE and/or OPENSSL_NO_OCSP.
This is really just a prerequisite for building against BoringSSL,
which doesn't provide either of those features.
Signed-off-by: Piotr Sikora <piotr@cloudflare.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/event/ngx_event_openssl.c | 10 | ||||
| -rw-r--r-- | src/event/ngx_event_openssl.h | 4 | ||||
| -rw-r--r-- | src/event/ngx_event_openssl_stapling.c | 2 |
3 files changed, 15 insertions, 1 deletions
diff --git a/src/event/ngx_event_openssl.c b/src/event/ngx_event_openssl.c index d037f1367..91c752c71 100644 --- a/src/event/ngx_event_openssl.c +++ b/src/event/ngx_event_openssl.c @@ -3279,6 +3279,8 @@ ngx_openssl_create_conf(ngx_cycle_t *cycle) static char * ngx_openssl_engine(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) { +#ifndef OPENSSL_NO_ENGINE + ngx_openssl_conf_t *oscf = conf; ENGINE *engine; @@ -3313,6 +3315,12 @@ ngx_openssl_engine(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) ENGINE_free(engine); return NGX_CONF_OK; + +#else + + return "is not supported"; + +#endif } @@ -3320,5 +3328,7 @@ static void ngx_openssl_exit(ngx_cycle_t *cycle) { EVP_cleanup(); +#ifndef OPENSSL_NO_ENGINE ENGINE_cleanup(); +#endif } diff --git a/src/event/ngx_event_openssl.h b/src/event/ngx_event_openssl.h index 174c8651d..408694035 100644 --- a/src/event/ngx_event_openssl.h +++ b/src/event/ngx_event_openssl.h @@ -18,9 +18,13 @@ #include <openssl/conf.h> #include <openssl/crypto.h> #include <openssl/dh.h> +#ifndef OPENSSL_NO_ENGINE #include <openssl/engine.h> +#endif #include <openssl/evp.h> +#ifndef OPENSSL_NO_OCSP #include <openssl/ocsp.h> +#endif #include <openssl/rand.h> #include <openssl/rsa.h> #include <openssl/x509.h> diff --git a/src/event/ngx_event_openssl_stapling.c b/src/event/ngx_event_openssl_stapling.c index 69340b37b..2fa067309 100644 --- a/src/event/ngx_event_openssl_stapling.c +++ b/src/event/ngx_event_openssl_stapling.c @@ -11,7 +11,7 @@ #include <ngx_event_connect.h> -#ifdef SSL_CTRL_SET_TLSEXT_STATUS_REQ_CB +#if (!defined OPENSSL_NO_OCSP && defined SSL_CTRL_SET_TLSEXT_STATUS_REQ_CB) typedef struct { |