Merge branch 'maint'

Author: IngelaAndin

lib/ssl/src/ssl.erl

@@ -558,11 +558,20 @@ These curves have been deprecated by RFC 8422.
 -doc """
 TLS-1.3 key exchange configuration.
 """.
--type group()                  :: x25519
+-type group()                  :: x25519mlkem768
+                                | secp384r1mlkem1024
+                                | secp256r1mlkem768
+                                | mlkem1024
+                                | mlkem768
+                                | mlkem512
+                                | x25519
                                 | x448
                                 | secp256r1
                                 | secp384r1
                                 | secp521r1
+                                | brainpoolP512r1tls13
+                                | brainpoolP384r1tls13
+                                | brainpoolP256r1tls13
                                 | ffdhe2048
                                 | ffdhe3072
                                 | ffdhe4096

lib/ssl/src/ssl_handshake.erl

@@ -2053,6 +2053,12 @@ extension_value(#key_share_client_hello{client_shares = ClientShares}) ->
     ClientShares;
 extension_value(#key_share_server_hello{server_share = ServerShare}) ->
     ServerShare;
+extension_value(#key_share_hello_retry_request{selected_group = Group}) ->
+    Group;
+extension_value(#early_data_indication{})->
+    "";
+extension_value(#early_data_indication_nst{indication = MaxSize})->
+    MaxSize;
 extension_value(#client_hello_versions{versions = Versions}) ->
     Versions;
 extension_value(#server_hello_selected_version{selected_version = SelectedVersion}) ->
@@ -2063,6 +2069,8 @@ extension_value(#pre_shared_key_server_hello{selected_identity = SelectedIdentit
     SelectedIdentity;
 extension_value(#psk_key_exchange_modes{ke_modes = Modes}) ->
     Modes;
+extension_value(#certificate_authorities{authorities = Auths}) ->
+    Auths;
 extension_value(#cookie{cookie = Cookie}) ->
     Cookie.