Git
/
testssl.sh
mirror of https://github.com/drwetter/testssl.sh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1018 from dcooper16/fix1015 

Fix #1015
This commit is contained in:
Dirk Wetter 2018-03-19 16:15:49 +01:00 committed by GitHub
parent 2c8bdcd205 4c946bfd49
commit a7d195fb89
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
testssl.sh
View File

@ -6270,12 +6270,12 @@ is_wildcard()
# Remove part of name preceding '*' or '.'. If no "*" appears in the # Remove part of name preceding '*' or '.'. If no "*" appears in the
# left-most label, then it is not a wildcard name (RFC 6125, Section 6.4.3). # left-most label, then it is not a wildcard name (RFC 6125, Section 6.4.3).
basename="$(echo -n "$certname" | sed 's/^[a-zA-Z0-9\-]*//')" basename="$(echo -n "$certname" | sed 's/^[_a-zA-Z0-9\-]*//')"
[[ "${basename:0:1}" != "*" ]] && return 1 # not a wildcard name [[ "${basename:0:1}" != "*" ]] && return 1 # not a wildcard name
# Check that there are no additional wildcard ('*') characters or any # Check that there are no additional wildcard ('*') characters or any
# other characters that do not belong in a DNS name. # other characters that do not belong in a DNS name.
[[ -n $(echo -n "${basename:1}" | sed 's/^[\.a-zA-Z0-9\-]*//') ]] && return 1 [[ -n $(echo -n "${basename:1}" | sed 's/^[_\.a-zA-Z0-9\-]*//') ]] && return 1
return 0 return 0
} }
@ -6305,7 +6305,7 @@ wildcard_match()
servername="$(toupper "$servername")" servername="$(toupper "$servername")"
# Extract part of name that comes after the "*" # Extract part of name that comes after the "*"
basename="$(echo -n "$certname" | sed 's/^[A-Z0-9\-]*\*//')" basename="$(echo -n "$certname" | sed 's/^[_A-Z0-9\-]*\*//')"
len_basename=${#basename} len_basename=${#basename}
len_part1=$len_certname-$len_basename-1 len_part1=$len_certname-$len_basename-1
len_wildcard=$len_servername-$len_certname+1 len_wildcard=$len_servername-$len_certname+1
@ -6318,7 +6318,7 @@ wildcard_match()
# Check that part of $servername that matches "*" is all part of a single # Check that part of $servername that matches "*" is all part of a single
# domain label. # domain label.
[[ -n $(echo -n "${servername:len_part1:len_wildcard}" | sed 's/^[A-Z0-9\-]*//') ]] && return 1 [[ -n $(echo -n "${servername:len_part1:len_wildcard}" | sed 's/^[_A-Z0-9\-]*//') ]] && return 1
return 0 return 0
} }