fix https://github.com/acmesh-official/acme.sh/issues/3402

2021-02-25 07:45:22 +08:00 · 2021-02-25 07:45:22 +08:00 · 9a90fe3794
commit 9a90fe3794
parent 2b01d4a203
1 changed files with 10 additions and 2 deletions
--- a/acme.sh
+++ b/acme.sh
@ -562,8 +562,16 @@ if _exists xargs && [ "$(printf %s '\\x41' | xargs printf)" = 'A' ]; then
 fi

 _h2b() {
-  if _exists xxd && xxd -r -p 2>/dev/null; then
-    return
+  if _exists xxd; then
+    if _contains "$(xxd --help 2>&1)" "assumes -c30"; then
+      if xxd -r -p -c 9999 2>/dev/null; then
+        return
+      fi
+    else
+      if xxd -r -p 2>/dev/null; then
+        return
+      fi
+    fi
  fi

  hex=$(cat)