From 74e61c61673b3bb5e23437d19505295fbe4cb8b3 Mon Sep 17 00:00:00 2001 From: "Haelwenn (lanodan) Monnier" Date: Wed, 28 Jul 2021 04:51:13 +0200 Subject: [PATCH] acme.sh: Use idn2 instead of idn MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This fixes the following strange (and recent?) error: $ idn --quiet læwifi.fr idn: could not convert from ASCII to UTF-8 --- acme.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/acme.sh b/acme.sh index 8ded1465..1e4c2e61 100755 --- a/acme.sh +++ b/acme.sh @@ -1181,7 +1181,7 @@ _idn() { return 0 fi - if _exists idn; then + if _exists idn2; then if _contains "$__idn_d" ','; then _i_first="1" for f in $(echo "$__idn_d" | tr ',' ' '); do @@ -1191,13 +1191,13 @@ _idn() { else _i_first="" fi - idn --quiet "$f" | tr -d "\r\n" + idn2 --quiet "$f" | tr -d "\r\n" done else - idn "$__idn_d" | tr -d "\r\n" + idn2 "$__idn_d" | tr -d "\r\n" fi else - _err "Please install idn to process IDN names." + _err "Please install (lib)idn2 to process IDN names." fi } @@ -6988,8 +6988,8 @@ _process() { _err "'$_dvalue' is not a valid domain for parameter '$1'" return 1 fi - if _is_idn "$_dvalue" && ! _exists idn; then - _err "It seems that $_dvalue is an IDN( Internationalized Domain Names), please install 'idn' command first." + if _is_idn "$_dvalue" && ! _exists idn2; then + _err "It seems that $_dvalue is an IDN( Internationalized Domain Names), please install 'idn2' command first." return 1 fi