diff options
| author | Todd Short <tshort@akamai.com> | 2015-12-21 15:19:29 -0500 |
|---|---|---|
| committer | Pauli <paul.dale@oracle.com> | 2017-11-30 07:13:08 +1000 |
| commit | e1c7871de80029b81824df4d59edc6de5293835f (patch) | |
| tree | 8b5e34751cbc70493dbbb36cddaf7f85cd943ccd /test/handshake_helper.h | |
| parent | 92b1b9a8871530f26ef7df972111297ffa721be2 (diff) | |
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)
Diffstat (limited to 'test/handshake_helper.h')
| -rw-r--r-- | test/handshake_helper.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/test/handshake_helper.h b/test/handshake_helper.h index 96c670e387..9dcbeb78f7 100644 --- a/test/handshake_helper.h +++ b/test/handshake_helper.h @@ -64,6 +64,7 @@ typedef struct handshake_result { STACK_OF(X509_NAME) *client_ca_names; /* Session id status */ ssl_session_id_t session_id; + char *cipher; } HANDSHAKE_RESULT; HANDSHAKE_RESULT *HANDSHAKE_RESULT_new(void); |