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

diff --git a/dehydrated b/dehydrated
index b7a884cd8041e5c6bf69a107c982254a6fdb80f9..40f9221e5b1ecafd5df5914576d20ad5006ac1ee 100755 (executable)
--- 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}")"