From 402b239af1855871e85039b1376ca5e1a5bb18f8 Mon Sep 17 00:00:00 2001 From: Hakase Date: Thu, 7 Jun 2018 09:58:15 +0900 Subject: [PATCH] Update auto shell, fix source. --- auto.sh | 3 ++- src/mail/ngx_mail_ssl_module.c | 5 ++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/auto.sh b/auto.sh index 33e730e..f2c295a 100755 --- a/auto.sh +++ b/auto.sh @@ -1,4 +1,4 @@ -#!/bin/sh +7#!/bin/sh ### Read config if [ ! -f "config.inc" ]; then @@ -132,6 +132,7 @@ auto/configure \ --with-http_ssl_module \ --with-mail_ssl_module \ --with-http_v2_module \ +--with-http_spdy_module \ --with-http_v2_hpack_enc \ --with-stream_ssl_module \ --with-stream_geoip_module \ diff --git a/src/mail/ngx_mail_ssl_module.c b/src/mail/ngx_mail_ssl_module.c index 13aaa7a..f5ecfc0 100644 --- a/src/mail/ngx_mail_ssl_module.c +++ b/src/mail/ngx_mail_ssl_module.c @@ -10,9 +10,8 @@ #include -#define NGX_DEFAULT_CIPHERS "[TLS13+AESGCM+AES128|TLS13+AESGCM+AES256|TLS13+CHACHA20]:[EECDH+ECDSA+AESGCM+AES128|EECDH+ECDSA+CHACHA20]:EECDH+ECDSA+AESGCM+AES256:EECDH+ECDSA+AES128+SHA:EECDH+ECDSA+AES256+SHA:[EECDH+aRSA+AESGCM+AES128|EECDH+aRSA+CHACHA20]:EECDH+aRSA+AESGCM+AES256:EECDH+aRSA+AES128+SHA:EECDH+aRSA+AES256+SHA" - -#define NGX_DEFAULT_ECDH_CURVE "X25519:P-256:P-384" +#define NGX_DEFAULT_CIPHERS "[TLS13+AESGCM+AES128|TLS13+AESGCM+AES256|TLS13+CHACHA20]:[EECDH+ECDSA+AESGCM+AES128|EECDH+ECDSA+CHACHA20]:EECDH+ECDSA+AESGCM+AES256:EECDH+ECDSA+AES128+SHA:EECDH+ECDSA+AES256+SHA:[EECDH+aRSA+AESGCM+AES128|EECDH+aRSA+CHACHA20]:EECDH+aRSA+AESGCM+AES256:EECDH+aRSA+AES128+SHA:EECDH+aRSA+AES256+SHA:RSA+AES128+SHA:RSA+AES256+SHA:RSA+3DES" +#define NGX_DEFAULT_ECDH_CURVE "X25519:P-256:P-384:P-224:P-521" static void *ngx_mail_ssl_create_conf(ngx_conf_t *cf);