diff options
| author | Péter Dimitrov <peterdmv@erlang.org> | 2019-08-26 14:37:26 +0200 |
|---|---|---|
| committer | Péter Dimitrov <peterdmv@erlang.org> | 2019-08-28 11:14:37 +0200 |
| commit | 2a84087c34ef714f667363b67b6a82353579217d (patch) | |
| tree | 3dbe91ef712b18b7b61bcda358f283af394cdeba /lib/ssl/src/ssl_config.erl | |
| parent | 124da8950c1fe93ef02cb044157e78798bc2360d (diff) | |
| download | erlang-2a84087c34ef714f667363b67b6a82353579217d.tar.gz | |
ssl: Change internal #ssl_options{} to map
Diffstat (limited to 'lib/ssl/src/ssl_config.erl')
| -rw-r--r-- | lib/ssl/src/ssl_config.erl | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/lib/ssl/src/ssl_config.erl b/lib/ssl/src/ssl_config.erl index 1e6dab9276..7d1e80c1cc 100644 --- a/lib/ssl/src/ssl_config.erl +++ b/lib/ssl/src/ssl_config.erl @@ -28,16 +28,20 @@ -export([init/2]). -init(SslOpts, Role) -> +init(#{erl_dist := ErlDist, + key := Key, + keyfile := KeyFile, + password := Password, + dh := DH, + dhfile := DHFile} = SslOpts, Role) -> - init_manager_name(SslOpts#ssl_options.erl_dist), + init_manager_name(ErlDist), {ok, #{pem_cache := PemCache} = Config} = init_certificates(SslOpts, Role), PrivateKey = - init_private_key(PemCache, SslOpts#ssl_options.key, SslOpts#ssl_options.keyfile, - SslOpts#ssl_options.password, Role), - DHParams = init_diffie_hellman(PemCache, SslOpts#ssl_options.dh, SslOpts#ssl_options.dhfile, Role), + init_private_key(PemCache, Key, KeyFile, Password, Role), + DHParams = init_diffie_hellman(PemCache, DH, DHFile, Role), {ok, Config#{private_key => PrivateKey, dh_params => DHParams}}. init_manager_name(false) -> @@ -47,12 +51,12 @@ init_manager_name(true) -> put(ssl_manager, ssl_manager:name(dist)), put(ssl_pem_cache, ssl_pem_cache:name(dist)). -init_certificates(#ssl_options{cacerts = CaCerts, - cacertfile = CACertFile, - certfile = CertFile, - cert = Cert, - crl_cache = CRLCache - }, Role) -> +init_certificates(#{cacerts := CaCerts, + cacertfile := CACertFile, + certfile := CertFile, + cert := Cert, + crl_cache := CRLCache + }, Role) -> {ok, Config} = try Certs = case CaCerts of |