Merge pull request #5 from cloudflare/nick/chachapoly

Add ChaCha20-Poly1305 support.
cloudflare · Feb 23, 2015 · 092558f · 092558f
2 parents d999e0f + d6529d3
commit 092558f
Show file tree

Hide file tree

Showing 2 changed files with 4,417 additions and 1 deletion.
diff --git a/conf b/conf
@@ -1,3 +1,3 @@
 ssl_protocols               TLSv1 TLSv1.1 TLSv1.2;
-ssl_ciphers                 EECDH+AES128:RSA+AES128:EECDH+AES256:RSA+AES256:EECDH+3DES:RSA+3DES:EECDH+RC4:RSA+RC4:!MD5;
+ssl_ciphers                 EECDH+CHACHA20:EECDH+AES128:RSA+AES128:EECDH+AES256:RSA+AES256:EECDH+3DES:RSA+3DES:!MD5;
 ssl_prefer_server_ciphers   on;