From ce64398751a8852d55a9773ff54ce7a2a5acd44d Mon Sep 17 00:00:00 2001 From: Maxim Dounin Date: Wed, 9 Jul 2014 04:08:13 +0400 Subject: [PATCH] SSL: fixed build with OPENSSL_NO_DEPRECATED defined. The RSA_generate_key() is marked as deprecated and causes build to fail. On the other hand, replacement function, RSA_generate_key_ex(), requires much more code. Since RSA_generate_key() is only needed for barely usable EXP ciphers, the #ifdef was added instead. Prodded by Piotr Sikora. --- src/event/ngx_event_openssl.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/event/ngx_event_openssl.c b/src/event/ngx_event_openssl.c index 46934b2f6..a5278cb5d 100644 --- a/src/event/ngx_event_openssl.c +++ b/src/event/ngx_event_openssl.c @@ -656,10 +656,14 @@ ngx_ssl_rsa512_key_callback(ngx_ssl_conn_t *ssl_conn, int is_export, return NULL; } +#ifndef OPENSSL_NO_DEPRECATED + if (key == NULL) { key = RSA_generate_key(512, RSA_F4, NULL, NULL); } +#endif + return key; }