# HG changeset patch
# User Igor Sysoev <igor@sysoev.ru>
# Date 1309189671 0
# Node ID 1e90599af73b3ca38474869e657431943e44d1b3
# Parent  92badf634ba8a4c0a5e2cbc35277a2cc7ba1fd78
use !aNULL to disable all anonymous cipher suites
patch by Rob Stradling

diff -r 92badf634ba8 -r 1e90599af73b conf/nginx.conf
--- a/conf/nginx.conf	Mon Jun 27 15:34:44 2011 +0000
+++ b/conf/nginx.conf	Mon Jun 27 15:47:51 2011 +0000
@@ -106,7 +106,7 @@
     #    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 -r 92badf634ba8 -r 1e90599af73b src/http/modules/ngx_http_ssl_module.c
--- a/src/http/modules/ngx_http_ssl_module.c	Mon Jun 27 15:34:44 2011 +0000
+++ b/src/http/modules/ngx_http_ssl_module.c	Mon Jun 27 15:47:51 2011 +0000
@@ -13,7 +13,7 @@
     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 -r 92badf634ba8 -r 1e90599af73b src/mail/ngx_mail_ssl_module.c
--- a/src/mail/ngx_mail_ssl_module.c	Mon Jun 27 15:34:44 2011 +0000
+++ b/src/mail/ngx_mail_ssl_module.c	Mon Jun 27 15:47:51 2011 +0000
@@ -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);