diff options
| author | Maxim Dounin <mdounin@mdounin.ru> | 2014-07-09 04:08:13 +0400 |
|---|---|---|
| committer | Maxim Dounin <mdounin@mdounin.ru> | 2014-07-09 04:08:13 +0400 |
| commit | ce64398751a8852d55a9773ff54ce7a2a5acd44d (patch) | |
| tree | 3a58117b4c4d6ffd5f9769bbbb6c88ddbf2baad2 /src | |
| parent | bd058b9d2400fec147ed9717101af114eaf364ec (diff) | |
| download | nginx-ce64398751a8852d55a9773ff54ce7a2a5acd44d.tar.gz nginx-ce64398751a8852d55a9773ff54ce7a2a5acd44d.tar.bz2 | |
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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/event/ngx_event_openssl.c | 4 |
1 files changed, 4 insertions, 0 deletions
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; } |