Quellcode durchsuchen

LibTLS: Move NameType to Extensions.h

stelar7 vor 2 Jahren
Ursprung
Commit
0fea6e7f13

+ 7 - 0
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
 

+ 1 - 1
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)

+ 0 - 4
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,