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>
diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h
index a81dd7a..7b9875f 100644
--- a/include/openssl/ssl.h
+++ b/include/openssl/ssl.h
@@ -4394,9 +4394,6 @@
uint8_t previous_server_finished_len;
int send_connection_binding;
- /* Set if we saw the Next Protocol Negotiation extension from our peer. */
- int next_proto_neg_seen;
-
/* Next protocol negotiation. For the client, this is the protocol that we
* sent in NextProtocol and is set when handling ServerHello extensions.
*
diff --git a/ssl/handshake_client.c b/ssl/handshake_client.c
index e2b5a71..5bde567 100644
--- a/ssl/handshake_client.c
+++ b/ssl/handshake_client.c
@@ -382,7 +382,7 @@
case SSL3_ST_CW_NEXT_PROTO_A:
case SSL3_ST_CW_NEXT_PROTO_B:
- if (ssl->s3->next_proto_neg_seen) {
+ if (ssl->s3->hs->next_proto_neg_seen) {
ret = ssl3_send_next_proto(ssl);
if (ret <= 0) {
goto end;
diff --git a/ssl/handshake_server.c b/ssl/handshake_server.c
index 935c40e..99df871 100644
--- a/ssl/handshake_server.c
+++ b/ssl/handshake_server.c
@@ -366,7 +366,7 @@
break;
case SSL3_ST_SR_NEXT_PROTO_A:
- if (ssl->s3->next_proto_neg_seen) {
+ if (ssl->s3->hs->next_proto_neg_seen) {
ret = ssl3_get_next_proto(ssl);
if (ret <= 0) {
goto end;
diff --git a/ssl/internal.h b/ssl/internal.h
index 1766775..1c0f1c9 100644
--- a/ssl/internal.h
+++ b/ssl/internal.h
@@ -967,6 +967,9 @@
* Start. The client may write data at this point. */
unsigned in_false_start:1;
+ /* next_proto_neg_seen is one of NPN was negotiated. */
+ unsigned next_proto_neg_seen:1;
+
/* peer_psk_identity_hint, on the client, is the psk_identity_hint sent by the
* server when using a TLS 1.2 PSK key exchange. */
char *peer_psk_identity_hint;
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) &&
diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c
index efb3347..7adf22a 100644
--- a/ssl/t1_lib.c
+++ b/ssl/t1_lib.c
@@ -1328,10 +1328,6 @@
*
* https://htmlpreview.github.io/?https://github.com/agl/technotes/blob/master/nextprotoneg.html */
-static void ext_npn_init(SSL *ssl) {
- ssl->s3->next_proto_neg_seen = 0;
-}
-
static int ext_npn_add_clienthello(SSL *ssl, CBB *out) {
if (ssl->s3->initial_handshake_complete ||
ssl->ctx->next_proto_select_cb == NULL ||
@@ -1401,7 +1397,7 @@
}
ssl->s3->next_proto_negotiated_len = selected_len;
- ssl->s3->next_proto_neg_seen = 1;
+ ssl->s3->hs->next_proto_neg_seen = 1;
return 1;
}
@@ -1427,14 +1423,14 @@
return 1;
}
- ssl->s3->next_proto_neg_seen = 1;
+ ssl->s3->hs->next_proto_neg_seen = 1;
return 1;
}
static int ext_npn_add_serverhello(SSL *ssl, CBB *out) {
/* |next_proto_neg_seen| might have been cleared when an ALPN extension was
* parsed. */
- if (!ssl->s3->next_proto_neg_seen) {
+ if (!ssl->s3->hs->next_proto_neg_seen) {
return 1;
}
@@ -1444,7 +1440,7 @@
if (ssl->ctx->next_protos_advertised_cb(
ssl, &npa, &npa_len, ssl->ctx->next_protos_advertised_cb_arg) !=
SSL_TLSEXT_ERR_OK) {
- ssl->s3->next_proto_neg_seen = 0;
+ ssl->s3->hs->next_proto_neg_seen = 0;
return 1;
}
@@ -1567,7 +1563,7 @@
assert(!ssl->s3->initial_handshake_complete);
assert(ssl->alpn_client_proto_list != NULL);
- if (ssl->s3->next_proto_neg_seen) {
+ if (ssl->s3->hs->next_proto_neg_seen) {
/* NPN and ALPN may not be negotiated in the same connection. */
*out_alert = SSL_AD_ILLEGAL_PARAMETER;
OPENSSL_PUT_ERROR(SSL, SSL_R_NEGOTIATED_BOTH_NPN_AND_ALPN);
@@ -1633,7 +1629,7 @@
}
/* ALPN takes precedence over NPN. */
- ssl->s3->next_proto_neg_seen = 0;
+ ssl->s3->hs->next_proto_neg_seen = 0;
CBS protocol_name_list;
if (!CBS_get_u16_length_prefixed(contents, &protocol_name_list) ||
@@ -2518,7 +2514,7 @@
},
{
TLSEXT_TYPE_next_proto_neg,
- ext_npn_init,
+ NULL,
ext_npn_add_clienthello,
ext_npn_parse_serverhello,
ext_npn_parse_clienthello,
