unsubscribe

Andrew Holway andrew.holway at otternetworks.de
Sun Jun 21 12:13:16 UTC 2015


On Fri, Jun 19, 2015 at 8:40 PM, Maxim Dounin <mdounin at mdounin.ru> wrote:

> Hello!
>
> On Thu, Jun 18, 2015 at 03:39:31AM -0700, Piotr Sikora wrote:
>
> > # HG changeset patch
> > # User Piotr Sikora <piotr at cloudflare.com>
> > # Date 1434623801 25200
> > #      Thu Jun 18 03:36:41 2015 -0700
> > # Node ID e0d2520ed65517b581f2565160a89ba93f4f3630
> > # Parent  c3ec43580a48114dfd28186f43e773fcfe211337
> > SSL: avoid SSL_CTX_set_tmp_rsa_callback() call with LibreSSL.
> >
> > Signed-off-by: Piotr Sikora <piotr at cloudflare.com>
> >
> > diff -r c3ec43580a48 -r e0d2520ed655 src/stream/ngx_stream_ssl_module.c
> > --- a/src/stream/ngx_stream_ssl_module.c      Wed Jun 17 17:57:34 2015
> +0300
> > +++ b/src/stream/ngx_stream_ssl_module.c      Thu Jun 18 03:36:41 2015
> -0700
> > @@ -276,7 +276,9 @@ ngx_stream_ssl_merge_conf(ngx_conf_t *cf
> >          SSL_CTX_set_options(conf->ssl.ctx,
> SSL_OP_CIPHER_SERVER_PREFERENCE);
> >      }
> >
> > +#ifndef LIBRESSL_VERSION_NUMBER
> >      SSL_CTX_set_tmp_rsa_callback(conf->ssl.ctx,
> ngx_ssl_rsa512_key_callback);
> > +#endif
> >
> >      if (ngx_ssl_dhparam(cf, &conf->ssl, &conf->dhparam) != NGX_OK) {
> >          return NGX_CONF_ERROR;
>
> Committed with a minor change to commit log, thanks!
>
> --
> Maxim Dounin
> http://nginx.org/
>
> _______________________________________________
> nginx-devel mailing list
> nginx-devel at nginx.org
> http://mailman.nginx.org/mailman/listinfo/nginx-devel
>



-- 
Otter Networks UG
http://otternetworks.de
fon: +49 30 54 88 5197
Gotenstraße 17
10829 Berlin
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mailman.nginx.org/pipermail/nginx-devel/attachments/20150621/8c57e4e2/attachment.html>


More information about the nginx-devel mailing list