Mercurial > hg > nginx

comparison src/mail/ngx_mail_ssl_module.c @ 6489:c256dfdd469d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
SSL: RSA_generate_key() is deprecated in OpenSSL 1.1.0. OpenSSL removed support for all 40 and 56 bit ciphers.
author Maxim Dounin <mdounin@mdounin.ru>
date Thu, 31 Mar 2016 23:38:34 +0300
parents 2cd019520210
children 51e1f047d15d
comparison
equal deleted inserted replaced
6488:a57b2b8999e7 6489:c256dfdd469d
419 419
420 if (conf->prefer_server_ciphers) { 420 if (conf->prefer_server_ciphers) {
421 SSL_CTX_set_options(conf->ssl.ctx, SSL_OP_CIPHER_SERVER_PREFERENCE); 421 SSL_CTX_set_options(conf->ssl.ctx, SSL_OP_CIPHER_SERVER_PREFERENCE);
422 } 422 }
423 423
424 #ifndef LIBRESSL_VERSION_NUMBER 424 #if (OPENSSL_VERSION_NUMBER < 0x10100001L && !defined LIBRESSL_VERSION_NUMBER)
425 SSL_CTX_set_tmp_rsa_callback(conf->ssl.ctx, ngx_ssl_rsa512_key_callback); 425 SSL_CTX_set_tmp_rsa_callback(conf->ssl.ctx, ngx_ssl_rsa512_key_callback);
426 #endif 426 #endif
427 427
428 if (ngx_ssl_dhparam(cf, &conf->ssl, &conf->dhparam) != NGX_OK) { 428 if (ngx_ssl_dhparam(cf, &conf->ssl, &conf->dhparam) != NGX_OK) {
429 return NGX_CONF_ERROR; 429 return NGX_CONF_ERROR;