소스 검색

LibTLS: Move ECPointFormat to Extensions.h

Also add missing values from the IANA registry
stelar7 2 년 전
부모
커밋
e5f81475e5
3개의 변경된 파일11개의 추가작업 그리고 5개의 파일을 삭제
  1. 0 4
      Userland/Libraries/LibTLS/CipherSuite.h
  2. 10 0
      Userland/Libraries/LibTLS/Extensions.h
  3. 1 1
      Userland/Libraries/LibTLS/TLSv12.h

+ 0 - 4
Userland/Libraries/LibTLS/CipherSuite.h

@@ -189,8 +189,4 @@ constexpr size_t cipher_key_size(CipherAlgorithm algorithm)
     }
 }
 
-enum class ECPointFormat : u8 {
-    Uncompressed = 0,
-};
-
 }

+ 10 - 0
Userland/Libraries/LibTLS/Extensions.h

@@ -247,6 +247,16 @@ enum class SupportedGroup : u16 {
     __ENUM_SUPPORTED_GROUPS
 };
 
+// https://www.iana.org/assignments/tls-parameters/tls-parameters.xhtml#tls-parameters-9
+#define __ENUM_EC_POINT_FORMATS                   \
+    _ENUM_KEY_VALUE(UNCOMPRESSED, 0)              \
+    _ENUM_KEY_VALUE(ANSIX962_COMPRESSED_PRIME, 1) \
+    _ENUM_KEY_VALUE(ANSIX962_COMPRESSED_CHAR2, 2)
+
+enum class ECPointFormat : u8 {
+    __ENUM_EC_POINT_FORMATS
+};
+
 #undef _ENUM_KEY
 #undef _ENUM_KEY_VALUE
 

+ 1 - 1
Userland/Libraries/LibTLS/TLSv12.h

@@ -215,7 +215,7 @@ struct Options {
         SupportedGroup::X25519,
         SupportedGroup::SECP256R1,
         SupportedGroup::X448)
-    OPTION_WITH_DEFAULTS(Vector<ECPointFormat>, supported_ec_point_formats, ECPointFormat::Uncompressed)
+    OPTION_WITH_DEFAULTS(Vector<ECPointFormat>, supported_ec_point_formats, ECPointFormat::UNCOMPRESSED)
 
     OPTION_WITH_DEFAULTS(bool, use_sni, true)
     OPTION_WITH_DEFAULTS(bool, use_compression, false)