LSC: Apply clang-tidy's modernize-use-bool-literals to boringssl
The check finds implicit conversions of integer literals to bools:
bool b1 = 1;
bool b2 = static_cast<bool>(1);
and transforms them to:
bool b1 = true;
bool b2 = true;
Bug: chromium:1290142
Change-Id: I15579e28f544d07b331a230b70a8278e0651150d
Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/51085
Reviewed-by: David Benjamin <davidben@google.com>
Commit-Queue: David Benjamin <davidben@google.com>
diff --git a/ssl/dtls_method.cc b/ssl/dtls_method.cc
index d179bae..a28dcdc 100644
--- a/ssl/dtls_method.cc
+++ b/ssl/dtls_method.cc
@@ -94,7 +94,7 @@
ssl->s3->aead_read_ctx = std::move(aead_ctx);
ssl->s3->read_level = level;
- ssl->d1->has_change_cipher_spec = 0;
+ ssl->d1->has_change_cipher_spec = false;
return true;
}
diff --git a/ssl/extensions.cc b/ssl/extensions.cc
index 3baef6d..47434de 100644
--- a/ssl/extensions.cc
+++ b/ssl/extensions.cc
@@ -2581,7 +2581,7 @@
assert(CBS_len(©) == 0);
*out = std::move(ret);
- return 1;
+ return true;
}
static bool ext_supported_groups_parse_clienthello(SSL_HANDSHAKE *hs,
diff --git a/ssl/handshake.cc b/ssl/handshake.cc
index fc85e21..8d5a238 100644
--- a/ssl/handshake.cc
+++ b/ssl/handshake.cc
@@ -528,20 +528,20 @@
size_t finished_len;
if (!hs->transcript.GetFinishedMAC(finished, &finished_len, session,
ssl->server)) {
- return 0;
+ return false;
}
// Log the master secret, if logging is enabled.
if (!ssl_log_secret(ssl, "CLIENT_RANDOM",
MakeConstSpan(session->secret, session->secret_length))) {
- return 0;
+ return false;
}
// Copy the Finished so we can use it for renegotiation checks.
if (finished_len > sizeof(ssl->s3->previous_client_finished) ||
finished_len > sizeof(ssl->s3->previous_server_finished)) {
OPENSSL_PUT_ERROR(SSL, ERR_R_INTERNAL_ERROR);
- return 0;
+ return false;
}
if (ssl->server) {
@@ -558,10 +558,10 @@
!CBB_add_bytes(&body, finished, finished_len) ||
!ssl_add_message_cbb(ssl, cbb.get())) {
OPENSSL_PUT_ERROR(SSL, ERR_R_INTERNAL_ERROR);
- return 0;
+ return false;
}
- return 1;
+ return true;
}
bool ssl_output_cert_chain(SSL_HANDSHAKE *hs) {
diff --git a/ssl/handshake_server.cc b/ssl/handshake_server.cc
index fdf9511..1d03c55 100644
--- a/ssl/handshake_server.cc
+++ b/ssl/handshake_server.cc
@@ -1311,7 +1311,7 @@
hs->new_session->verify_result = X509_V_OK;
} else if (hs->config->retain_only_sha256_of_client_certs) {
// The hash will have been filled in.
- hs->new_session->peer_sha256_valid = 1;
+ hs->new_session->peer_sha256_valid = true;
}
ssl->method->next_message(ssl);
diff --git a/ssl/ssl_asn1.cc b/ssl/ssl_asn1.cc
index 27bc310..0426437 100644
--- a/ssl/ssl_asn1.cc
+++ b/ssl/ssl_asn1.cc
@@ -662,9 +662,9 @@
}
OPENSSL_memcpy(ret->peer_sha256, CBS_data(&peer_sha256),
sizeof(ret->peer_sha256));
- ret->peer_sha256_valid = 1;
+ ret->peer_sha256_valid = true;
} else {
- ret->peer_sha256_valid = 0;
+ ret->peer_sha256_valid = false;
}
if (!SSL_SESSION_parse_bounded_octet_string(
diff --git a/ssl/ssl_file.cc b/ssl/ssl_file.cc
index ca4b0be..43db37c 100644
--- a/ssl/ssl_file.cc
+++ b/ssl/ssl_file.cc
@@ -179,7 +179,7 @@
}
}
- if (0) {
+ if (false) {
err:
sk_X509_NAME_pop_free(ret, X509_NAME_free);
ret = NULL;
diff --git a/ssl/ssl_test.cc b/ssl/ssl_test.cc
index 3286081..567d206 100644
--- a/ssl/ssl_test.cc
+++ b/ssl/ssl_test.cc
@@ -5146,7 +5146,7 @@
SSL_CTX_set_session_cache_mode(client_ctx.get(), SSL_SESS_CACHE_CLIENT);
SSL_CTX_sess_set_new_cb(client_ctx.get(), SaveLastSession);
- SSL_CTX_set_handoff_mode(server_ctx.get(), 1);
+ SSL_CTX_set_handoff_mode(server_ctx.get(), true);
uint8_t keys[48];
SSL_CTX_get_tlsext_ticket_keys(server_ctx.get(), &keys, sizeof(keys));
SSL_CTX_set_tlsext_ticket_keys(handshaker_ctx.get(), &keys, sizeof(keys));
@@ -5251,7 +5251,7 @@
ASSERT_TRUE(client_ctx);
ASSERT_TRUE(server_ctx);
- SSL_CTX_set_handoff_mode(server_ctx.get(), 1);
+ SSL_CTX_set_handoff_mode(server_ctx.get(), true);
ASSERT_TRUE(SSL_CTX_set_max_proto_version(server_ctx.get(), TLS1_2_VERSION));
bssl::UniquePtr<SSL> client, server;
diff --git a/ssl/tls13_both.cc b/ssl/tls13_both.cc
index 226c67b..208c6ff 100644
--- a/ssl/tls13_both.cc
+++ b/ssl/tls13_both.cc
@@ -475,7 +475,7 @@
CRYPTO_BUFFER_len(raw)) ||
!CBB_flush(&extensions)) {
OPENSSL_PUT_ERROR(SSL, ERR_R_INTERNAL_ERROR);
- return 0;
+ return false;
}
ssl->s3->delegated_credential_used = true;
}
diff --git a/ssl/tls13_enc.cc b/ssl/tls13_enc.cc
index c7b75a6..ad023ef 100644
--- a/ssl/tls13_enc.cc
+++ b/ssl/tls13_enc.cc
@@ -364,9 +364,9 @@
!tls13_verify_data(out, out_len, hs->transcript.Digest(),
hs->ssl->version, traffic_secret,
MakeConstSpan(context_hash, context_hash_len))) {
- return 0;
+ return false;
}
- return 1;
+ return true;
}
static const char kTLS13LabelResumptionPSK[] = "resumption";
