From 0fea6e7f13b5fb38d7d3c7fa259e59c62a6a97d8 Mon Sep 17 00:00:00 2001 From: stelar7 Date: Fri, 14 Apr 2023 00:10:16 +0200 Subject: [PATCH] LibTLS: Move NameType to Extensions.h --- Userland/Libraries/LibTLS/Extensions.h | 7 +++++++ Userland/Libraries/LibTLS/HandshakeServer.cpp | 2 +- Userland/Libraries/LibTLS/TLSv12.h | 4 ---- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Userland/Libraries/LibTLS/Extensions.h b/Userland/Libraries/LibTLS/Extensions.h index 1b190f7c89..ed4fe004af 100644 --- a/Userland/Libraries/LibTLS/Extensions.h +++ b/Userland/Libraries/LibTLS/Extensions.h @@ -159,6 +159,13 @@ enum class ExtensionType : u16 { __ENUM_EXTENSION_TYPES }; +#define __ENUM_NAME_TYPES \ + _ENUM_KEY_VALUE(HOST_NAME, 0) + +enum class NameType : u8 { + __ENUM_NAME_TYPES +}; + #undef _ENUM_KEY #undef _ENUM_KEY_VALUE diff --git a/Userland/Libraries/LibTLS/HandshakeServer.cpp b/Userland/Libraries/LibTLS/HandshakeServer.cpp index 6a3b4cd3ba..04526484ba 100644 --- a/Userland/Libraries/LibTLS/HandshakeServer.cpp +++ b/Userland/Libraries/LibTLS/HandshakeServer.cpp @@ -136,7 +136,7 @@ ssize_t TLSv12::handle_server_hello(ReadonlyBytes buffer, WritePacketStage& writ auto sni_name_type = (NameType)(*(u8 const*)buffer.offset_pointer(res++)); auto sni_name_length = AK::convert_between_host_and_network_endian(ByteReader::load16(buffer.offset_pointer(res += 2))); - if (sni_name_type != NameType::HostName) + if (sni_name_type != NameType::HOST_NAME) return (i8)Error::NotUnderstood; if (sizeof(sni_name_type) + sizeof(sni_name_length) + sni_name_length != sni_name_list_bytes) diff --git a/Userland/Libraries/LibTLS/TLSv12.h b/Userland/Libraries/LibTLS/TLSv12.h index 945387403a..8157d00de8 100644 --- a/Userland/Libraries/LibTLS/TLSv12.h +++ b/Userland/Libraries/LibTLS/TLSv12.h @@ -113,10 +113,6 @@ enum class Error : i8 { OutOfMemory = -23, }; -enum class NameType : u8 { - HostName = 0x00, -}; - enum class WritePacketStage { Initial = 0, ClientHandshake = 1,