Flip SSL_SESSION fields to bool.
Change-Id: I0a3648437f78f37a4b710aaea73084a19be607c5
Reviewed-on: https://boringssl-review.googlesource.com/29485
Reviewed-by: Adam Langley <agl@google.com>
Commit-Queue: Adam Langley <agl@google.com>
CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
diff --git a/ssl/handshake_client.cc b/ssl/handshake_client.cc
index 391aa29..bb67235 100644
--- a/ssl/handshake_client.cc
+++ b/ssl/handshake_client.cc
@@ -1581,7 +1581,7 @@
}
if (renewed_session) {
- session->not_resumable = 0;
+ session->not_resumable = false;
SSL_SESSION_free(ssl->session);
ssl->session = renewed_session.release();
}
@@ -1635,7 +1635,7 @@
}
// Renegotiations do not participate in session resumption.
if (!ssl->s3->initial_handshake_complete) {
- ssl->s3->established_session->not_resumable = 0;
+ ssl->s3->established_session->not_resumable = false;
}
hs->new_session.reset();
diff --git a/ssl/handshake_server.cc b/ssl/handshake_server.cc
index 2456d12..f733402 100644
--- a/ssl/handshake_server.cc
+++ b/ssl/handshake_server.cc
@@ -1478,7 +1478,7 @@
ssl->s3->established_session.reset(ssl->session);
} else {
ssl->s3->established_session = std::move(hs->new_session);
- ssl->s3->established_session->not_resumable = 0;
+ ssl->s3->established_session->not_resumable = false;
}
hs->handshake_finalized = true;
diff --git a/ssl/internal.h b/ssl/internal.h
index 494b039..c6b849c 100644
--- a/ssl/internal.h
+++ b/ssl/internal.h
@@ -3303,22 +3303,22 @@
uint8_t *early_alpn;
size_t early_alpn_len;
- // extended_master_secret is true if the master secret in this session was
+ // extended_master_secret is whether the master secret in this session was
// generated using EMS and thus isn't vulnerable to the Triple Handshake
// attack.
- unsigned extended_master_secret:1;
+ bool extended_master_secret:1;
- // peer_sha256_valid is non-zero if |peer_sha256| is valid.
- unsigned peer_sha256_valid:1; // Non-zero if peer_sha256 is valid
+ // peer_sha256_valid is whether |peer_sha256| is valid.
+ bool peer_sha256_valid:1; // Non-zero if peer_sha256 is valid
// not_resumable is used to indicate that session resumption is disallowed.
- unsigned not_resumable:1;
+ bool not_resumable:1;
- // ticket_age_add_valid is non-zero if |ticket_age_add| is valid.
- unsigned ticket_age_add_valid:1;
+ // ticket_age_add_valid is whether |ticket_age_add| is valid.
+ bool ticket_age_add_valid:1;
- // is_server is true if this session was created by a server.
- unsigned is_server:1;
+ // is_server is whether this session was created by a server.
+ bool is_server:1;
};
diff --git a/ssl/ssl_asn1.cc b/ssl/ssl_asn1.cc
index 078ad1f..531a8ee 100644
--- a/ssl/ssl_asn1.cc
+++ b/ssl/ssl_asn1.cc
@@ -727,7 +727,7 @@
CBS_len(&age_add) != 0) {
return nullptr;
}
- ret->ticket_age_add_valid = age_add_present;
+ ret->ticket_age_add_valid = age_add_present != 0;
int is_server;
if (!CBS_get_optional_asn1_bool(&session, &is_server, kIsServerTag,
diff --git a/ssl/ssl_session.cc b/ssl/ssl_session.cc
index 0498aaf..703225e 100644
--- a/ssl/ssl_session.cc
+++ b/ssl/ssl_session.cc
@@ -291,7 +291,7 @@
// The new_session does not get a copy of the ex_data.
- new_session->not_resumable = 1;
+ new_session->not_resumable = true;
return new_session;
}
@@ -414,7 +414,7 @@
session->sid_ctx_length = hs->config->cert->sid_ctx_length;
// The session is marked not resumable until it is completely filled in.
- session->not_resumable = 1;
+ session->not_resumable = true;
session->verify_result = X509_V_ERR_INVALID_CALL;
hs->new_session = std::move(session);
diff --git a/ssl/ssl_test.cc b/ssl/ssl_test.cc
index 30fcbab..7f5361f 100644
--- a/ssl/ssl_test.cc
+++ b/ssl/ssl_test.cc
@@ -1724,7 +1724,7 @@
bssl::SSL_SESSION_dup(session0, SSL_SESSION_DUP_ALL);
ASSERT_TRUE(session1);
- session1->not_resumable = 0;
+ session1->not_resumable = false;
uint8_t *s0_bytes, *s1_bytes;
size_t s0_len, s1_len;
diff --git a/ssl/tls13_client.cc b/ssl/tls13_client.cc
index b8bd546..317b4d3 100644
--- a/ssl/tls13_client.cc
+++ b/ssl/tls13_client.cc
@@ -891,8 +891,8 @@
}
}
- session->ticket_age_add_valid = 1;
- session->not_resumable = 0;
+ session->ticket_age_add_valid = true;
+ session->not_resumable = false;
if ((ssl->session_ctx->session_cache_mode & SSL_SESS_CACHE_CLIENT) &&
ssl->session_ctx->new_session_cb != NULL &&
diff --git a/ssl/tls13_server.cc b/ssl/tls13_server.cc
index 81d78fa..481dc54 100644
--- a/ssl/tls13_server.cc
+++ b/ssl/tls13_server.cc
@@ -168,7 +168,7 @@
if (!RAND_bytes((uint8_t *)&session->ticket_age_add, 4)) {
return 0;
}
- session->ticket_age_add_valid = 1;
+ session->ticket_age_add_valid = true;
if (ssl->enable_early_data) {
session->ticket_max_early_data = kMaxEarlyDataAccepted;
}
