]> git.ipfire.org Git - thirdparty/dehydrated.git/commitdiff
fix CN extraction for older openssl versions
authorLukas Schauer <lukas@schauer.so>
Fri, 11 Dec 2020 17:02:51 +0000 (18:02 +0100)
committerLukas Schauer <lukas@schauer.so>
Fri, 11 Dec 2020 17:02:51 +0000 (18:02 +0100)
dehydrated

index 622165e096d633e5e98ab55f13e5c3508d71348e..37e0ab6fbeb2f4ce83dedacced6ac263a832e408 100755 (executable)
@@ -926,14 +926,14 @@ extract_altnames() {
     printf "%s" "${altnames}" | tr '\n' ' '
   else
     # No SANs, extract CN
-    altnames="$( <<<"${reqtext}" grep '^[[:space:]]*Subject:' | _sed -e 's/.* CN ?= ?([^ /,]*).*/\1/' )"
+    altnames="$( <<<"${reqtext}" grep '^[[:space:]]*Subject:' | _sed -e 's/.*[ /]CN ?= ?([^ /,]*).*/\1/' )"
     printf "%s" "${altnames}"
   fi
 }
 
 # Get last issuer CN in certificate chain
 get_last_cn() {
-  <<<"${1}" _sed 'H;/-----BEGIN CERTIFICATE-----/h;$!d;x' | "${OPENSSL}" x509 -noout -issuer | head -n1 | _sed -e 's/.* CN ?= ?([^/,]*).*/\1/'
+  <<<"${1}" _sed 'H;/-----BEGIN CERTIFICATE-----/h;$!d;x' | "${OPENSSL}" x509 -noout -issuer | head -n1 | _sed -e 's/.*[ /]CN ?= ?([^/,]*).*/\1/'
 }
 
 # Create certificate for domain(s) and outputs it FD 3