Use ChaCha only if prioritized by clnt
authorTodd Short <tshort@akamai.com>
Mon, 21 Dec 2015 20:19:29 +0000 (15:19 -0500)
committerPauli <paul.dale@oracle.com>
Wed, 29 Nov 2017 21:13:08 +0000 (07:13 +1000)
commite1c7871de80029b81824df4d59edc6de5293835f
tree8b5e34751cbc70493dbbb36cddaf7f85cd943ccd
parent92b1b9a8871530f26ef7df972111297ffa721be2
Use ChaCha only if prioritized by clnt

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)
16 files changed:
apps/apps.h
doc/man1/s_server.pod
doc/man3/SSL_CONF_cmd.pod
doc/man3/SSL_CTX_set_options.pod
include/openssl/ssl.h
ssl/s3_lib.c
ssl/ssl_conf.c
test/handshake_helper.c
test/handshake_helper.h
test/recipes/80-test_ssl_new.t
test/ssl-tests/25-cipher.conf [new file with mode: 0644]
test/ssl-tests/25-cipher.conf.in [new file with mode: 0644]
test/ssl_test.c
test/ssl_test_ctx.c
test/ssl_test_ctx.h
test/ssl_test_ctx_test.c