yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor(emqx_tls_lib): allow undefined for string fields

This commit is contained in:
Zaiming (Stone) Shi 2022-04-05 22:37:05 +02:00
parent ba51f03cb7
commit 1ac19b42e4
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
apps/emqx/src/emqx_tls_lib.erl
View File

@ -439,11 +439,7 @@ to_client_opts(Opts) ->
CertFile = ensure_str(Get(certfile)), CertFile = ensure_str(Get(certfile)),
CAFile = ensure_str(Get(cacertfile)), CAFile = ensure_str(Get(cacertfile)),
Verify = GetD(verify, verify_none), Verify = GetD(verify, verify_none),
SNI = SNI = ensure_str(Get(server_name_indication)),
case GetD(server_name_indication, undefined) of
undefined -> undefined;
SNI0 -> ensure_str(SNI0)
end,
Versions = integral_versions(Get(versions)), Versions = integral_versions(Get(versions)),
Ciphers = integral_ciphers(Versions, Get(ciphers)), Ciphers = integral_ciphers(Versions, Get(ciphers)),
filter([ filter([
@ -472,6 +468,7 @@ fuzzy_map_get(Key, Options, Default) ->
Default Default
end. end.
ensure_str(undefined) -> undefined;
ensure_str(L) when is_list(L) -> L; ensure_str(L) when is_list(L) -> L;
ensure_str(B) when is_binary(B) -> unicode:characters_to_list(B, utf8). ensure_str(B) when is_binary(B) -> unicode:characters_to_list(B, utf8).