commit b74b08144ea12adb229d9a4a7855ebfdbb7f7c8c
author David Benjamin <davidben@google.com> Thu Oct 06 19:43:48 2016 -0400
committer Adam Langley <agl@google.com> Sun Oct 09 16:50:13 2016 +0000
tree e2ab54e2f74c885f84d64fc82d50c0afec62114b
parent f5d2cd08084f44c196420eebd306fc6de32dd59e

Move next_proto_neg_seen into SSL_HANDSHAKE.

Change-Id: I7f1d546f735ca854ac58c65b529218afda164ec0
Reviewed-on: https://boringssl-review.googlesource.com/11523
Reviewed-by: Adam Langley <agl@google.com>

ssl/ssl_lib.c

diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
index 5235b4d..3a64deb 100644
--- a/ssl/ssl_lib.c
+++ b/ssl/ssl_lib.c
@@ -2697,7 +2697,8 @@
   /* False Start only for TLS 1.2 with an ECDHE+AEAD cipher and ALPN or NPN. */
   return !SSL_is_dtls(ssl) &&
       SSL_version(ssl) == TLS1_2_VERSION &&
-      (ssl->s3->alpn_selected || ssl->s3->next_proto_neg_seen) &&
+      (ssl->s3->alpn_selected != NULL ||
+       ssl->s3->next_proto_negotiated != NULL) &&
       cipher != NULL &&
       (cipher->algorithm_mkey == SSL_kECDHE ||
        cipher->algorithm_mkey == SSL_kCECPQ1) &&