commit 046bc1fbe820b93d7dcd7bb44b3d133ab9c2ddf7
author David Benjamin <davidben@google.com> Thu Aug 31 15:06:42 2017 -0400
committer CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org> Fri Sep 01 15:07:32 2017 +0000
tree f37613be5c9cee6fc0ee1cbb7df55789193044ad
parent 4cbb93195f887bbc491f819907065339db70c370

SSL3_STATE ints to bools.

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

ssl/handshake_server.cc

diff --git a/ssl/handshake_server.cc b/ssl/handshake_server.cc
index eeb9f7f..f196db0 100644
--- a/ssl/handshake_server.cc
+++ b/ssl/handshake_server.cc
@@ -275,7 +275,7 @@
 
   // At this point, the connection's version is known and |ssl->version| is
   // fixed. Begin enforcing the record-layer version.
-  ssl->s3->have_version = 1;
+  ssl->s3->have_version = true;
 
   // Handle FALLBACK_SCSV.
   if (ssl_client_cipher_list_contains_cipher(client_hello,
@@ -607,7 +607,7 @@
     // Use the old session.
     hs->ticket_expected = renew_ticket;
     ssl->session = session.release();
-    ssl->s3->session_reused = 1;
+    ssl->s3->session_reused = true;
   } else {
     hs->ticket_expected = tickets_supported;
     ssl_set_session(ssl, NULL);
@@ -695,7 +695,7 @@
   // known attack while we fix ChannelID itself.
   if (ssl->s3->tlsext_channel_id_valid &&
       (hs->new_cipher->algorithm_mkey & SSL_kECDHE) == 0) {
-    ssl->s3->tlsext_channel_id_valid = 0;
+    ssl->s3->tlsext_channel_id_valid = false;
   }
 
   // If this is a resumption and the original handshake didn't support
@@ -703,7 +703,7 @@
   // session and so cannot resume with ChannelIDs.
   if (ssl->session != NULL &&
       ssl->session->original_handshake_hash_len == 0) {
-    ssl->s3->tlsext_channel_id_valid = 0;
+    ssl->s3->tlsext_channel_id_valid = false;
   }
 
   struct OPENSSL_timeval now;
@@ -1569,7 +1569,7 @@
   }
 
   hs->handshake_finalized = true;
-  ssl->s3->initial_handshake_complete = 1;
+  ssl->s3->initial_handshake_complete = true;
   ssl_update_cache(hs, SSL_SESS_CACHE_SERVER);
 
   hs->state = state_done;