From e631d9679edc6129088763c15160017da6b9235f Mon Sep 17 00:00:00 2001 From: Adam Langley Date: Wed, 1 Apr 2015 13:11:01 -0700 Subject: [PATCH] Don't False Start with DHE. BUG=460271 Change-Id: I271a270067605ec629944633c3e22c2069ba9a24 Reviewed-on: https://boringssl-review.googlesource.com/4192 Reviewed-by: Adam Langley --- ssl/ssl_lib.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c index d723d330..c81e0610 100644 --- a/ssl/ssl_lib.c +++ b/ssl/ssl_lib.c @@ -2870,14 +2870,12 @@ void SSL_get_structure_sizes(size_t *ssl_size, size_t *ssl_ctx_size, int ssl3_can_false_start(const SSL *s) { const SSL_CIPHER *const cipher = SSL_get_current_cipher(s); - /* False Start only for TLS 1.2 with a forward-secure, AEAD cipher and ALPN or - * NPN. */ + /* False Start only for TLS 1.2 with an ECDHE+AEAD cipher and ALPN or NPN. */ return !SSL_IS_DTLS(s) && SSL_version(s) >= TLS1_2_VERSION && (s->s3->alpn_selected || s->s3->next_proto_neg_seen) && cipher != NULL && - (cipher->algorithm_mkey == SSL_kDHE || - cipher->algorithm_mkey == SSL_kECDHE) && + cipher->algorithm_mkey == SSL_kECDHE && (cipher->algorithm_enc == SSL_AES128GCM || cipher->algorithm_enc == SSL_AES256GCM || cipher->algorithm_enc == SSL_CHACHA20POLY1305);