aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor Sysoev <igor@sysoev.ru>2011-06-27 15:47:51 +0000
committerIgor Sysoev <igor@sysoev.ru>2011-06-27 15:47:51 +0000
commit8d7b1d222e7a7a9de35594eac18bd00308d5e7f9 (patch)
treed0b96b9b6f6e4bbd64fea9f6d507255b9cc44c3f
parent0a860a1c1d9f521eb9ffc5e4d336b5de11b473a0 (diff)
downloadnginx-8d7b1d222e7a7a9de35594eac18bd00308d5e7f9.tar.gz
nginx-8d7b1d222e7a7a9de35594eac18bd00308d5e7f9.zip
use !aNULL to disable all anonymous cipher suites
patch by Rob Stradling
-rw-r--r--conf/nginx.conf2
-rw-r--r--src/http/modules/ngx_http_ssl_module.c2
-rw-r--r--src/mail/ngx_mail_ssl_module.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/conf/nginx.conf b/conf/nginx.conf
index 672ce8c83..3bb338936 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -106,7 +106,7 @@ http {
# ssl_session_timeout 5m;
# ssl_protocols SSLv2 SSLv3 TLSv1;
- # ssl_ciphers ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv2:+EXP;
+ # ssl_ciphers HIGH:!aNULL:!MD5;
# ssl_prefer_server_ciphers on;
# location / {
diff --git a/src/http/modules/ngx_http_ssl_module.c b/src/http/modules/ngx_http_ssl_module.c
index ee6cc6f05..1860050d3 100644
--- a/src/http/modules/ngx_http_ssl_module.c
+++ b/src/http/modules/ngx_http_ssl_module.c
@@ -13,7 +13,7 @@ typedef ngx_int_t (*ngx_ssl_variable_handler_pt)(ngx_connection_t *c,
ngx_pool_t *pool, ngx_str_t *s);
-#define NGX_DEFAULT_CIPHERS "HIGH:!ADH:!MD5"
+#define NGX_DEFAULT_CIPHERS "HIGH:!aNULL:!MD5"
static ngx_int_t ngx_http_ssl_static_variable(ngx_http_request_t *r,
diff --git a/src/mail/ngx_mail_ssl_module.c b/src/mail/ngx_mail_ssl_module.c
index de463e96b..9dd9dfd15 100644
--- a/src/mail/ngx_mail_ssl_module.c
+++ b/src/mail/ngx_mail_ssl_module.c
@@ -9,7 +9,7 @@
#include <ngx_mail.h>
-#define NGX_DEFAULT_CIPHERS "HIGH:!ADH:!MD5"
+#define NGX_DEFAULT_CIPHERS "HIGH:!aNULL:!MD5"
static void *ngx_mail_ssl_create_conf(ngx_conf_t *cf);