From: Lukas Schauer <lukas@schauer.so>
Date: Sun, 25 Mar 2018 22:00:50 +0000 (+0200)
Subject: allow for widely-used non-standard CSR label (fixes #488)
X-Git-Tag: v0.6.2~12
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=537877a0e2fa39b16676a22aa3069730f5ba0ee4;p=thirdparty%2Fdehydrated.git

allow for widely-used non-standard CSR label (fixes #488)
---

diff --git a/dehydrated b/dehydrated
index b7a884c..40f9221 100755
--- a/dehydrated
+++ b/dehydrated
@@ -1238,7 +1238,7 @@ command_sign_domains() {
     local csr=""
     if [[ -n "${HOOK}" ]]; then
       csr="$("${HOOK}" "generate_csr" "${domain}" "${certdir}" "${domain} ${morenames}")"
-      if grep -q "\-----BEGIN CERTIFICATE REQUEST-----" <<< "${csr}"; then
+      if grep -qE "\-----BEGIN (NEW )?CERTIFICATE REQUEST-----" <<< "${csr}"; then
         altnames="$(extract_altnames "${csr}")"
         domain="$(cut -d' ' -f1 <<< "${altnames}")"
         morenames="$(cut -s -d' ' -f2- <<< "${altnames}")"