nik/easyrsa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor display_san() and display_dn() - Quote all exansions (#494)

Browse Source 
Signed-off-by: Richard T Bonhomme <tincantech@protonmail.com>
This commit is contained in:
Richard T Bonhomme 2022-04-22 17:32:58 +01:00
parent 2a9cd44902
commit a466f96b4e
No known key found for this signature in database
GPG Key ID: 2D767DB92FB6C246
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
easyrsa3/easyrsa
View File

@ -1883,21 +1883,21 @@ display_san() {
print "$(echo "$EASYRSA_EXTRA_EXTS" | grep subjectAltName | print "$(echo "$EASYRSA_EXTRA_EXTS" | grep subjectAltName |
sed 's/^\s*subjectAltName\s*=\s*//')" sed 's/^\s*subjectAltName\s*=\s*//')"
else else
san=$( san="$(
x509v3san="X509v3 Subject Alternative Name:" x509v3san="X509v3 Subject Alternative Name:"
"$EASYRSA_OPENSSL" "$format" -in "$path" -noout -text | "$EASYRSA_OPENSSL" "$format" -in "$path" -noout -text |
sed -n "/${x509v3san}/{n;s/ //g;s/IPAddress:/IP:/g;s/RegisteredID/RID/;p;}" sed -n "/${x509v3san}/{n;s/ //g;s/IPAddress:/IP:/g;s/RegisteredID/RID/;p;}"
) )"
[ -n "$san" ] && print "$san" [ -n "$san" ] && print "$san"
fi fi
} } # => display_san()
# display cert DN info on a req/X509, passed by full pathname # display cert DN info on a req/X509, passed by full pathname
display_dn() { display_dn() {
format="$1" path="$2" format="$1" path="$2"
print "$("$EASYRSA_OPENSSL" "$format" -in "$path" -noout -subject -nameopt multiline)" print "$("$EASYRSA_OPENSSL" "$format" -in "$path" -noout -subject -nameopt multiline)"
san=$(display_san "$1" "$2") san="$(display_san "$1" "$2")"
if [ -n "$san" ]; then if [ -n "$san" ]; then
print "" print ""
print "X509v3 Subject Alternative Name:" print "X509v3 Subject Alternative Name:"