From 1ac19b42e4f08acfa9f0f3a90c8d6e347166c8aa Mon Sep 17 00:00:00 2001 From: "Zaiming (Stone) Shi" Date: Tue, 5 Apr 2022 22:37:05 +0200 Subject: [PATCH] refactor(emqx_tls_lib): allow undefined for string fields --- apps/emqx/src/emqx_tls_lib.erl | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/apps/emqx/src/emqx_tls_lib.erl b/apps/emqx/src/emqx_tls_lib.erl index d6ca233f7..c3748cbd4 100644 --- a/apps/emqx/src/emqx_tls_lib.erl +++ b/apps/emqx/src/emqx_tls_lib.erl @@ -439,11 +439,7 @@ to_client_opts(Opts) -> CertFile = ensure_str(Get(certfile)), CAFile = ensure_str(Get(cacertfile)), Verify = GetD(verify, verify_none), - SNI = - case GetD(server_name_indication, undefined) of - undefined -> undefined; - SNI0 -> ensure_str(SNI0) - end, + SNI = ensure_str(Get(server_name_indication)), Versions = integral_versions(Get(versions)), Ciphers = integral_ciphers(Versions, Get(ciphers)), filter([ @@ -472,6 +468,7 @@ fuzzy_map_get(Key, Options, Default) -> Default end. +ensure_str(undefined) -> undefined; ensure_str(L) when is_list(L) -> L; ensure_str(B) when is_binary(B) -> unicode:characters_to_list(B, utf8).