Merge pull request #24 from cloudflare/CHACHA20-POLY1305-RFC

Patch for ChaCha20-Poly1305 cipher suites draft and RFC (on top of OpenSSL 1.0.2f)
cloudflare · Feb 13, 2016 · 1003593 · 1003593
2 parents 0aebbd2 + 3afa646
commit 1003593
Show file tree

Hide file tree

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