Mercurial > hg > nginx

comparison src/event/ngx_event_openssl.h @ 5753:febce92c82f6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
SSL: include correct OpenSSL headers. Previously, <bn.h>, <dh.h>, <rand.h> and <rsa.h> were pulled in by <engine.h> using OpenSSL's deprecated interface, which meant that nginx couldn't have been built with -DOPENSSL_NO_DEPRECATED. Both <x509.h> and <x509v3.h> are pulled in by <ocsp.h>, but we're calling X509 functions directly, so let's include those as well. <crypto.h> is pulled in by virtually everything, but we're calling CRYPTO_add() directly, so let's include it as well. Signed-off-by: Piotr Sikora <piotr@cloudflare.com>
author Piotr Sikora <piotr@cloudflare.com>
date Sun, 06 Jul 2014 16:41:13 -0700
parents 42114bf12da0
children 4d092aa2f463
comparison
equal deleted inserted replaced
5752:ebcd01d080c9 5753:febce92c82f6
12 #include <ngx_config.h> 12 #include <ngx_config.h>
13 #include <ngx_core.h> 13 #include <ngx_core.h>
14 14
15 #include <openssl/ssl.h> 15 #include <openssl/ssl.h>
16 #include <openssl/err.h> 16 #include <openssl/err.h>
17 #include <openssl/bn.h>
17 #include <openssl/conf.h> 18 #include <openssl/conf.h>
19 #include <openssl/crypto.h>
20 #include <openssl/dh.h>
18 #include <openssl/engine.h> 21 #include <openssl/engine.h>
19 #include <openssl/evp.h> 22 #include <openssl/evp.h>
20 #include <openssl/ocsp.h> 23 #include <openssl/ocsp.h>
24 #include <openssl/rand.h>
25 #include <openssl/rsa.h>
26 #include <openssl/x509.h>
27 #include <openssl/x509v3.h>
21 28
22 #define NGX_SSL_NAME "OpenSSL" 29 #define NGX_SSL_NAME "OpenSSL"
23 30
24 31
25 #define ngx_ssl_session_t SSL_SESSION 32 #define ngx_ssl_session_t SSL_SESSION