ssl: Move all configuration handling to ssl_config.erl

erlang · Dec 11, 2024 · 813e905 · 813e905
1 parent c838c6c
commit 813e905
Show file tree

Hide file tree

Showing 15 changed files with 1,676 additions and 1,643 deletions.
diff --git a/lib/ssl/src/dtls_client_connection.erl b/lib/ssl/src/dtls_client_connection.erl
@@ -230,12 +230,11 @@ initial_hello({call, From}, {start, {Opts, EmOpts}, Timeout},
             ssl_options = OrigSSLOptions,
             socket_options = SockOpts} = State0) ->
     try
-        SslOpts = ssl:update_options(Opts, Role, OrigSSLOptions),
+        SslOpts = ssl_config:update_options(Opts, Role, OrigSSLOptions),
 	State = ssl_gen_statem:ssl_config(SslOpts, Role, State0),
 	initial_hello({call, From}, {start, Timeout},
-	     State#state{ssl_options = SslOpts,
-                         socket_options =
-                             ssl_config:new_emulated(EmOpts, SockOpts)})
+                      State#state{socket_options =
+                                      ssl_config:new_emulated(EmOpts, SockOpts)})
     catch throw:Error ->
 	   {stop_and_reply, {shutdown, normal}, {reply, From, {error, Error}}, State0}
     end;

diff --git a/lib/ssl/src/dtls_server_connection.erl b/lib/ssl/src/dtls_server_connection.erl
@@ -196,12 +196,11 @@ initial_hello({call, From}, {start, {Opts, EmOpts}, Timeout},
                      ssl_options = OrigSSLOptions,
                      socket_options = SockOpts} = State0) ->
     try
-        SslOpts = ssl:update_options(Opts, Role, OrigSSLOptions),
+        SslOpts = ssl_config:update_options(Opts, Role, OrigSSLOptions),
 	State = ssl_gen_statem:ssl_config(SslOpts, Role, State0),
 	initial_hello({call, From}, {start, Timeout},
-	     State#state{ssl_options = SslOpts,
-                         socket_options =
-                             ssl_config:new_emulated(EmOpts, SockOpts)})
+                      State#state{socket_options =
+                                      ssl_config:new_emulated(EmOpts, SockOpts)})
     catch throw:Error ->
             {stop_and_reply, {shutdown, normal}, {reply, From, {error, Error}}, State0}
     end;