From b7e296857ce81f19ed3be5511175247004b45399 Mon Sep 17 00:00:00 2001 From: Evgeny Khramtsov Date: Sun, 22 Sep 2019 13:28:14 +0300 Subject: [PATCH] Don't call to xmpp_idna --- rebar.config | 2 +- src/ejabberd_pkix.erl | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/rebar.config b/rebar.config index e9b40a27f..27e05ff0e 100644 --- a/rebar.config +++ b/rebar.config @@ -25,7 +25,7 @@ {stringprep, ".*", {git, "https://github.com/processone/stringprep", {tag, "1.0.17"}}}, {fast_xml, ".*", {git, "https://github.com/processone/fast_xml", {tag, "1.1.37"}}}, {idna, ".*", {git, "https://github.com/benoitc/erlang-idna", {tag, "6.0.0"}}}, - {xmpp, ".*", {git, "https://github.com/processone/xmpp", "3e892bc"}}, + {xmpp, ".*", {git, "https://github.com/processone/xmpp", "f3517a9"}}, {fast_yaml, ".*", {git, "https://github.com/processone/fast_yaml", {tag, "1.0.20"}}}, {yconf, ".*", {git, "https://github.com/processone/yconf", {tag, "1.0.0"}}}, {jiffy, ".*", {git, "https://github.com/davisp/jiffy", {tag, "0.14.8"}}}, diff --git a/src/ejabberd_pkix.erl b/src/ejabberd_pkix.erl index 48d1a5d6c..eddeeeb19 100644 --- a/src/ejabberd_pkix.erl +++ b/src/ejabberd_pkix.erl @@ -92,14 +92,14 @@ get_certfile(Domain) -> -spec get_certfile_no_default(binary()) -> {ok, filename()} | error. get_certfile_no_default(Domain) -> - case xmpp_idna:domain_utf8_to_ascii(Domain) of - false -> - error; + try list_to_binary(idna:utf8_to_ascii(Domain)) of ASCIIDomain -> case pkix:get_certfile(ASCIIDomain) of error -> error; Ret -> {ok, select_certfile(Ret)} end + catch _:_ -> + error end. -spec get_certfile() -> {ok, filename()} | error.