ssl: Prepare code to have several certificate key pairs to choose from

1 files changed, 7 insertions, 7 deletions

diff --git a/lib/ssl/src/ssl_config.erl b/lib/ssl/src/ssl_config.erl
index 80a5b4f44c..65d4259ab4 100644
--- a/lib/ssl/src/ssl_config.erl
+++ b/lib/ssl/src/ssl_config.erl
@@ -49,12 +49,12 @@ init(#{erl_dist := ErlDist,
     
     init_manager_name(ErlDist),
 
-    {ok, #{pem_cache := PemCache} = Config} 
+    {ok, #{pem_cache := PemCache} = Config, Certs}
 	= init_certificates(SslOpts, Role),
     PrivateKey =
 	init_private_key(PemCache, Key, KeyFile, Password, Role),
     DHParams = init_diffie_hellman(PemCache, DH, DHFile, Role),
-    {ok, Config#{private_key => PrivateKey, dh_params => DHParams}}.
+    {ok, Config#{cert_key_pairs => [#{private_key => PrivateKey, certs => Certs}], dh_params => DHParams}}.
 
 pre_1_3_session_opts(Role) ->
     {Cb, InitArgs} = session_cb_opts(Role),
@@ -141,28 +141,28 @@ init_certificates(#{cacerts := CaCerts,
     init_certificates(OwnCerts, Config, CertFile, Role).
 
 init_certificates(undefined, Config, <<>>, _) ->
-    {ok, Config#{own_certificates => undefined}};
+    {ok, Config, undefined};
 
 init_certificates(undefined, #{pem_cache := PemCache} = Config, CertFile, client) ->
     try 
         %% OwnCert | [OwnCert | Chain]
 	OwnCerts = ssl_certificate:file_to_certificats(CertFile, PemCache),
-	{ok, Config#{own_certificates => OwnCerts}}
+	{ok, Config, OwnCerts}
     catch _Error:_Reason  ->
-	    {ok, Config#{own_certificates => undefined}}
+	    {ok, Config, undefined}
     end; 
 
 init_certificates(undefined, #{pem_cache := PemCache} = Config, CertFile, server) ->
     try
         %% OwnCert | [OwnCert | Chain]
 	OwnCerts = ssl_certificate:file_to_certificats(CertFile, PemCache),
-	{ok, Config#{own_certificates => OwnCerts}}
+	{ok, Config, OwnCerts}
     catch
 	_:Reason ->
 	    file_error(CertFile, {certfile, Reason})	    
     end;
 init_certificates(OwnCerts, Config, _, _) ->
-    {ok, Config#{own_certificates => OwnCerts}}.
+    {ok, Config, OwnCerts}.
 init_private_key(_, #{algorithm := Alg} = Key, _, _Password, _Client) when Alg == ecdsa;
                                                                            Alg == rsa;
                                                                            Alg == dss ->