RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 14:57:35 +00:00
Code Issues Activity Actions

Everywhere: Rename ASSERT => VERIFY

Browse source 
(...and ASSERT_NOT_REACHED => VERIFY_NOT_REACHED)

Since all of these checks are done in release builds as well,
let's rename them to VERIFY to prevent confusion, as everyone is
used to assertions being compiled out in release.

We can introduce a new ASSERT macro that is specifically for debug
checks, but I'm doing this wholesale conversion first since we've
accumulated thousands of these already, and it's not immediately
obvious which ones are suitable for ASSERT.
This commit is contained in:
Andreas Kling 2021-02-23 20:42:32 +01:00
parent b33a6a443e
commit 5d180d1f99
725 changed files with 3448 additions and 3448 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Userland/Libraries/LibTLS/ClientHandshake.cpp
View file

@ -348,7 +348,7 @@ ssize_t TLSv12::handle_payload(ReadonlyBytes vbuffer)
case ClientHello:
// FIXME: We only support client mode right now
if (m_context.is_server) {
ASSERT_NOT_REACHED();
VERIFY_NOT_REACHED();
}
payload_res = (i8)Error::UnexpectedMessage;
break;
@ -364,7 +364,7 @@ ssize_t TLSv12::handle_payload(ReadonlyBytes vbuffer)
#endif
if (m_context.is_server) {
dbgln("unsupported: server mode");
ASSERT_NOT_REACHED();
VERIFY_NOT_REACHED();
} else {
payload_res = handle_hello(buffer.slice(1, payload_size), write_packets);
}
@ -386,7 +386,7 @@ ssize_t TLSv12::handle_payload(ReadonlyBytes vbuffer)
if (m_context.connection_status == ConnectionStatus::Negotiating) {
if (m_context.is_server) {
dbgln("unsupported: server mode");
ASSERT_NOT_REACHED();
VERIFY_NOT_REACHED();
}
payload_res = handle_certificate(buffer.slice(1, payload_size));
if (m_context.certificates.size()) {
@ -420,7 +420,7 @@ ssize_t TLSv12::handle_payload(ReadonlyBytes vbuffer)
#endif
if (m_context.is_server) {
dbgln("unsupported: server mode");
ASSERT_NOT_REACHED();
VERIFY_NOT_REACHED();
} else {
payload_res = handle_server_key_exchange(buffer.slice(1, payload_size));
}
@ -435,7 +435,7 @@ ssize_t TLSv12::handle_payload(ReadonlyBytes vbuffer)
if (m_context.is_server) {
dbgln("invalid request");
dbgln("unsupported: server mode");
ASSERT_NOT_REACHED();
VERIFY_NOT_REACHED();
} else {
// we do not support "certificate request"
dbgln("certificate request");
@ -456,7 +456,7 @@ ssize_t TLSv12::handle_payload(ReadonlyBytes vbuffer)
#endif
if (m_context.is_server) {
dbgln("unsupported: server mode");
ASSERT_NOT_REACHED();
VERIFY_NOT_REACHED();
} else {
payload_res = handle_server_hello_done(buffer.slice(1, payload_size));
if (payload_res > 0)
@ -491,7 +491,7 @@ ssize_t TLSv12::handle_payload(ReadonlyBytes vbuffer)
#endif
if (m_context.is_server) {
dbgln("unsupported: server mode");
ASSERT_NOT_REACHED();
VERIFY_NOT_REACHED();
} else {
payload_res = (i8)Error::UnexpectedMessage;
}
@ -581,7 +581,7 @@ ssize_t TLSv12::handle_payload(ReadonlyBytes vbuffer)
break;
default:
dbgln("Unknown TLS::Error with value {}", payload_res);
ASSERT_NOT_REACHED();
VERIFY_NOT_REACHED();
break;
}
if (payload_res < 0)
@ -628,7 +628,7 @@ ssize_t TLSv12::handle_payload(ReadonlyBytes vbuffer)
case WritePacketStage::ServerHandshake:
// server handshake
dbgln("UNSUPPORTED: Server mode");
ASSERT_NOT_REACHED();
VERIFY_NOT_REACHED();
break;
case WritePacketStage::Finished:
// finished

2
Userland/Libraries/LibTLS/Exchange.cpp
View file

@ -189,7 +189,7 @@ ByteBuffer TLSv12::build_certificate()
if (m_context.is_server) {
dbgln("Unsupported: Server mode");
ASSERT_NOT_REACHED();
VERIFY_NOT_REACHED();
} else {
local_certificates = &m_context.client_certificates;
}

2
Userland/Libraries/LibTLS/Handshake.cpp
View file

@ -110,7 +110,7 @@ ByteBuffer TLSv12::build_hello()
if (alpn_length) {
// TODO
ASSERT_NOT_REACHED();
VERIFY_NOT_REACHED();
}
// set the "length" field of the packet

16
Userland/Libraries/LibTLS/Record.cpp
View file

@ -117,7 +117,7 @@ void TLSv12::update_packet(ByteBuffer& packet)
aad_stream.write({ &seq_no, sizeof(seq_no) });
aad_stream.write(packet.bytes().slice(0, 3)); // content-type + version
aad_stream.write({ &len, sizeof(len) }); // length
ASSERT(aad_stream.is_end());
VERIFY(aad_stream.is_end());
// AEAD IV (12)
// IV (4)
@ -141,7 +141,7 @@ void TLSv12::update_packet(ByteBuffer& packet)
aad_bytes,
ct.bytes().slice(header_size + 8 + length, 16));
ASSERT(header_size + 8 + length + 16 == ct.size());
VERIFY(header_size + 8 + length + 16 == ct.size());
} else {
// We need enough space for a header, iv_length bytes of IV and whatever the packet contains
@ -161,7 +161,7 @@ void TLSv12::update_packet(ByteBuffer& packet)
memset(buffer.offset_pointer(buffer_position), padding - 1, padding);
buffer_position += padding;
ASSERT(buffer_position == buffer.size());
VERIFY(buffer_position == buffer.size());
auto iv = ByteBuffer::create_uninitialized(iv_size);
AK::fill_with_random(iv.data(), iv.size());
@ -169,8 +169,8 @@ void TLSv12::update_packet(ByteBuffer& packet)
// write it into the ciphertext portion of the message
ct.overwrite(header_size, iv.data(), iv.size());
ASSERT(header_size + iv_size + length == ct.size());
ASSERT(length % block_size == 0);
VERIFY(header_size + iv_size + length == ct.size());
VERIFY(length % block_size == 0);
// get a block to encrypt into
auto view = ct.bytes().slice(header_size + iv_size, length);
@ -269,7 +269,7 @@ ssize_t TLSv12::handle_message(ReadonlyBytes buffer)
}
if (is_aead()) {
ASSERT(m_aes_remote.gcm);
VERIFY(m_aes_remote.gcm);
if (length < 24) {
dbgln("Invalid packet length");
@ -297,7 +297,7 @@ ssize_t TLSv12::handle_message(ReadonlyBytes buffer)
aad_stream.write({ &seq_no, sizeof(seq_no) }); // Sequence number
aad_stream.write(buffer.slice(0, header_size - 2)); // content-type + version
aad_stream.write({ &len, sizeof(u16) });
ASSERT(aad_stream.is_end());
VERIFY(aad_stream.is_end());
auto nonce = payload.slice(0, iv_length());
payload = payload.slice(iv_length());
@ -333,7 +333,7 @@ ssize_t TLSv12::handle_message(ReadonlyBytes buffer)
plain = decrypted;
} else {
ASSERT(m_aes_remote.cbc);
VERIFY(m_aes_remote.cbc);
auto iv_size = iv_length();
decrypted = m_aes_remote.cbc->create_aligned_buffer(length - iv_size);

4
Userland/Libraries/LibTLS/Socket.cpp
View file

@ -61,7 +61,7 @@ String TLSv12::read_line(size_t max_size)
auto* start = m_context.application_buffer.data();
auto* newline = (u8*)memchr(m_context.application_buffer.data(), '\n', m_context.application_buffer.size());
ASSERT(newline);
VERIFY(newline);
size_t offset = newline - start;
@ -106,7 +106,7 @@ bool TLSv12::common_connect(const struct sockaddr* saddr, socklen_t length)
if (Core::Socket::is_connected()) {
if (is_established()) {
ASSERT_NOT_REACHED();
VERIFY_NOT_REACHED();
} else {
Core::Socket::close(); // reuse?
}

2
Userland/Libraries/LibTLS/TLSPacketBuilder.h
View file

@ -107,7 +107,7 @@ public:
}
inline void set(size_t offset, u8 value)
{
ASSERT(offset < m_current_length);
VERIFY(offset < m_current_length);
m_packet_data[offset] = value;
}
size_t length() const { return m_current_length; }