From: Lukas Schauer <lukas@schauer.dev>
Date: Wed, 6 Apr 2022 23:34:21 +0000 (+0200)
Subject: rfc8738: fix CN on certs with mixed ip+dns
X-Git-Tag: v0.7.1~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fheads%2Frfc8738;p=thirdparty%2Fdehydrated.git

rfc8738: fix CN on certs with mixed ip+dns
---

diff --git a/dehydrated b/dehydrated
index e5b9783..9474d77 100755
--- a/dehydrated
+++ b/dehydrated
@@ -1467,12 +1467,15 @@ sign_domain() {
     for altname in ${altnames}; do
       if [[ "${altname}" =~ ^ip: ]]; then
         SAN="${SAN}IP:${altname:3}, "
-        SUBJ="/CN=${domain:3}/"
       else
         SAN="${SAN}DNS:${altname}, "
-        SUBJ="/CN=${domain}/"
       fi
     done
+    if [[ "${domain}" =~ ^ip: ]]; then
+      SUBJ="/CN=${domain:3}/"
+    else
+      SUBJ="/CN=${domain}/"
+    fi
     SAN="${SAN%%, }"
     local tmp_openssl_cnf
     tmp_openssl_cnf="$(_mktemp)"