From ad69a0ec4173c464e2827283e52dae90316470b7dbb0e1aa01d32e9c91536868 Mon Sep 17 00:00:00 2001
From: Petr Gajdos <pgajdos@suse.com>
Date: Mon, 31 Aug 2020 12:56:14 +0000
Subject: [PATCH] Accepting request 830773 from home:jtomasiak:branches:Apache

- gensslcert: add -a argument to override default SAN value

OBS-URL: https://build.opensuse.org/request/show/830773
OBS-URL: https://build.opensuse.org/package/show/Apache/apache2?expand=0&rev=615
---
 apache2.changes | 5 +++++
 gensslcert      | 9 ++++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/apache2.changes b/apache2.changes
index dd3eb1b..f61f489 100644
--- a/apache2.changes
+++ b/apache2.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Aug 31 11:08:16 UTC 2020 - Jacek Tomasiak <jtomasiak@suse.com>
+
+- gensslcert: add -a argument to override default SAN value
+
 -------------------------------------------------------------------
 Tue Aug 31 09:07:44 UTC 2020 - Antonio Larrosa <alarrosa@suse.com>
 
diff --git a/gensslcert b/gensslcert
index 0682c0d..296bce1 100644
--- a/gensslcert
+++ b/gensslcert
@@ -24,6 +24,7 @@ function usage
 	-u 	organisational unit		"$U"
 	-n	fully qualified domain name	$CN (hostname -f)
 	-e 	email address of webmaster	webmaster@$CN
+	-a	subject alternative name	$altName
 	-y      days server cert is valid for   $srvdays
 	-Y      days CA cert is valid for       $CAdays
 	-d	run in debug mode			
@@ -61,10 +62,11 @@ fi
 	O="SUSE Linux Web Server"
        CN=$FQHOSTNAME
     email=webmaster@$FQHOSTNAME
+  altName=DNS:$CN
    CAdays=$((365 * 6))
   srvdays=$((365 * 2))
 
-while getopts C:N:c:s:l:o:u:n:e:y:Y:dh OPT; do
+while getopts C:N:c:s:l:o:u:n:e:a:y:Y:dh OPT; do
     case $OPT in
         N) comment=$OPTARG;;
         c) C=$OPTARG;;
@@ -74,6 +76,7 @@ while getopts C:N:c:s:l:o:u:n:e:y:Y:dh OPT; do
         o) O=$OPTARG;;
         n) CN=$OPTARG;;
         e) email=$OPTARG;;
+        a) altName=$OPTARG;;
 	y) srvdays=$OPTARG;;
 	Y) CAdays=$OPTARG;;
         d) set -x;;
@@ -84,7 +87,7 @@ done
 
 GO_LEFT="\033[80D"
 GO_MIDDLE="$GO_LEFT\033[15C"
-for i in comment C ST L U O CN email srvdays CAdays; do 
+for i in comment C ST L U O CN email altName srvdays CAdays; do 
 	eval "echo -e $i\"$GO_MIDDLE\" \$$i;"
 done
 
@@ -156,7 +159,7 @@ CN                     = $CN
 emailAddress           = $email
 
 [ x509v3 ]
-subjectAltName         = DNS:$CN
+subjectAltName         = $altName
 nsComment              = $comment
 nsCertType             = server