# HG changeset patch
# User Piotr Sikora <piotr@cloudflare.com>
# Date 1404690073 25200
# Sun Jul 06 16:41:13 2014 -0700
# Node ID 8c3e64571adf1ff45fa40559f761ea317e29d474
# Parent a680bf4dddd5c4b106419e3dfb0264815c401275
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>

diff -r a680bf4dddd5 -r 8c3e64571adf src/event/ngx_event_openssl.h
--- a/src/event/ngx_event_openssl.h Sat Jul 05 23:29:47 2014 +0400
+++ b/src/event/ngx_event_openssl.h Sun Jul 06 16:41:13 2014 -0700
@@ -14,10 +14,17 @@

#include <openssl/ssl.h>
#include <openssl/err.h>
+#include <openssl/bn.h>
#include <openssl/conf.h>
+#include <openssl/crypto.h>
+#include <openssl/dh.h>
#include <openssl/engine.h>
#include <openssl/evp.h>
#include <openssl/ocsp.h>
+#include <openssl/rand.h>
+#include <openssl/rsa.h>
+#include <openssl/x509.h>
+#include <openssl/x509v3.h>

#define NGX_SSL_NAME "OpenSSL"


_______________________________________________
nginx-devel mailing list
nginx-devel@nginx.org
http://mailman.nginx.org/mailman/listinfo/nginx-devel