commit 1682126fd81ca12089323b936484e17285c36602
author Steven Valdez <svaldez@google.com> Fri Sep 08 17:03:42 2017 -0400
committer CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org> Mon Sep 11 16:53:16 2017 +0000
tree d6acbeb11a9494bdc5ca96cfc8e1c05443d40258
parent 54c259dec395bd991cce5691723214ffe588e51d

Add Experiment 2

Change-Id: If240cbeb133a23331cb6ca59eaacde7733592278
Reviewed-on: https://boringssl-review.googlesource.com/20144
Reviewed-by: Steven Valdez <svaldez@google.com>
Commit-Queue: Steven Valdez <svaldez@google.com>
CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>

ssl/tls13_server.cc

diff --git a/ssl/tls13_server.cc b/ssl/tls13_server.cc
index cd6baa4..a0f115b 100644
--- a/ssl/tls13_server.cc
+++ b/ssl/tls13_server.cc
@@ -528,7 +528,7 @@
   SSL *const ssl = hs->ssl;
 
   uint16_t version = ssl->version;
-  if (ssl->version == TLS1_3_EXPERIMENT_VERSION) {
+  if (ssl_is_resumption_experiment(ssl->version)) {
     version = TLS1_2_VERSION;
   }
 
@@ -539,21 +539,21 @@
       !CBB_add_u16(&body, version) ||
       !RAND_bytes(ssl->s3->server_random, sizeof(ssl->s3->server_random)) ||
       !CBB_add_bytes(&body, ssl->s3->server_random, SSL3_RANDOM_SIZE) ||
-      (ssl->version == TLS1_3_EXPERIMENT_VERSION &&
+      (ssl_is_resumption_experiment(ssl->version) &&
        (!CBB_add_u8_length_prefixed(&body, &session_id) ||
         !CBB_add_bytes(&session_id, hs->session_id, hs->session_id_len))) ||
       !CBB_add_u16(&body, ssl_cipher_get_value(hs->new_cipher)) ||
-      (ssl->version == TLS1_3_EXPERIMENT_VERSION && !CBB_add_u8(&body, 0)) ||
+      (ssl_is_resumption_experiment(ssl->version) && !CBB_add_u8(&body, 0)) ||
       !CBB_add_u16_length_prefixed(&body, &extensions) ||
       !ssl_ext_pre_shared_key_add_serverhello(hs, &extensions) ||
       !ssl_ext_key_share_add_serverhello(hs, &extensions) ||
-      (ssl->version == TLS1_3_EXPERIMENT_VERSION &&
+      (ssl_is_resumption_experiment(ssl->version) &&
        !ssl_ext_supported_versions_add_serverhello(hs, &extensions)) ||
       !ssl_add_message_cbb(ssl, cbb.get())) {
     return ssl_hs_error;
   }
 
-  if (ssl->version == TLS1_3_EXPERIMENT_VERSION &&
+  if (ssl_is_resumption_experiment(ssl->version) &&
       !ssl3_add_change_cipher_spec(ssl)) {
     return ssl_hs_error;
   }
@@ -706,7 +706,7 @@
   if (hs->early_data_offered && !hs->ssl->early_data_accepted) {
     return ssl_hs_ok;
   }
-  return hs->ssl->version == TLS1_3_EXPERIMENT_VERSION
+  return ssl_is_resumption_experiment(hs->ssl->version)
              ? ssl_hs_read_change_cipher_spec
              : ssl_hs_ok;
 }