aboutsummaryrefslogtreecommitdiff
path: root/test/ssl-tests/25-cipher.conf.in
AgeCommit message (Collapse)AuthorFilesLines
2017-12-11Fix no-chachaMatt Caswell1-1/+1
Reviewed-by: Tim Hudson <tjh@openssl.org> (Merged from https://github.com/openssl/openssl/pull/4891)
2017-12-11Don't expect a POLY1305 ciphersuite when using no-poly1305Matt Caswell1-5/+10
Reviewed-by: Tim Hudson <tjh@openssl.org> (Merged from https://github.com/openssl/openssl/pull/4891)
2017-12-11Replace tabs with spaces in 25-cipher.conf.inMatt Caswell1-51/+51
Reviewed-by: Tim Hudson <tjh@openssl.org> (Merged from https://github.com/openssl/openssl/pull/4891)
2017-11-30Use ChaCha only if prioritized by clntTodd Short1-0/+151
IFF the client has ChaCha first, and server cipher priority is used, and the new SSL_OP_PRIORITIZE_CHACHA_FOR_MOBILE option is used, then reprioritize ChaCha above everything else. This way, A matching ChaCha cipher will be selected if there is a match. If no ChaCha ciphers match, then the other ciphers are used. Reviewed-by: Paul Dale <paul.dale@oracle.com> Reviewed-by: Tim Hudson <tjh@openssl.org> Reviewed-by: Andy Polyakov <appro@openssl.org> (Merged from https://github.com/openssl/openssl/pull/4436)