Rename the last remnants of the early_data_info extension. The extension was renamed to just 'early_data' at some point in TLS 1.3's development. Change-Id: I9d1de10aaeb347237b52a226e9533307f5c269ce Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/38224 Reviewed-by: Steven Valdez <svaldez@google.com> Commit-Queue: David Benjamin <davidben@google.com>
diff --git a/ssl/tls13_client.cc b/ssl/tls13_client.cc index 12f4738..15c18c2 100644 --- a/ssl/tls13_client.cc +++ b/ssl/tls13_client.cc
@@ -894,10 +894,10 @@ } // Parse out the extensions. - bool have_early_data_info = false; - CBS early_data_info; + bool have_early_data = false; + CBS early_data; const SSL_EXTENSION_TYPE ext_types[] = { - {TLSEXT_TYPE_early_data, &have_early_data_info, &early_data_info}, + {TLSEXT_TYPE_early_data, &have_early_data, &early_data}, }; uint8_t alert = SSL_AD_DECODE_ERROR; @@ -908,9 +908,9 @@ return false; } - if (have_early_data_info) { - if (!CBS_get_u32(&early_data_info, &session->ticket_max_early_data) || - CBS_len(&early_data_info) != 0) { + if (have_early_data) { + if (!CBS_get_u32(&early_data, &session->ticket_max_early_data) || + CBS_len(&early_data) != 0) { ssl_send_alert(ssl, SSL3_AL_FATAL, SSL_AD_DECODE_ERROR); OPENSSL_PUT_ERROR(SSL, SSL_R_DECODE_ERROR); return false;
diff --git a/ssl/tls13_server.cc b/ssl/tls13_server.cc index f6a81d4..abacefc 100644 --- a/ssl/tls13_server.cc +++ b/ssl/tls13_server.cc
@@ -171,10 +171,10 @@ } if (ssl->enable_early_data) { - CBB early_data_info; + CBB early_data; if (!CBB_add_u16(&extensions, TLSEXT_TYPE_early_data) || - !CBB_add_u16_length_prefixed(&extensions, &early_data_info) || - !CBB_add_u32(&early_data_info, session->ticket_max_early_data) || + !CBB_add_u16_length_prefixed(&extensions, &early_data) || + !CBB_add_u32(&early_data, session->ticket_max_early_data) || !CBB_flush(&extensions)) { return false; }