This commit is contained in:
Dirk 2016-11-05 14:55:30 +01:00
parent f18a398ce3
commit 72ac0734d1
1 changed files with 9 additions and 5 deletions

View File

@ -566,9 +566,13 @@ trim_trailing_space() {
echo "${1%%*( )}"
}
toupper() {
echo -n "$1" | tr 'a-z' 'A-Z'
}
if [[ $(uname) == "Linux" ]] ; then
toupper() { echo -n "${1^^}" ; }
tolower() { echo -n "${1,,}" ; }
else
toupper() { echo -n "$1" | tr 'a-z' 'A-Z'; }
tolower() { echo -n "$1" | tr 'A-Z' 'a-z' ; }
fi
is_number() {
[[ "$1" =~ ^[1-9][0-9]*$ ]] && \
@ -1524,7 +1528,7 @@ normalize_ciphercode() {
HEXC="$part1$part2$part3"
fi
#TODO: we should just echo this and avoid the global var HEXC
HEXC=$(echo $HEXC | tr 'A-Z' 'a-z' | sed 's/0x/x/') #tolower + strip leading 0
HEXC=$(tolower "$HEXC"| sed 's/0x/x/') # strip leading 0
return 0
}
@ -9066,4 +9070,4 @@ fi
exit $?
# $Id: testssl.sh,v 1.561 2016/10/29 13:37:29 dirkw Exp $
# $Id: testssl.sh,v 1.562 2016/11/05 13:55:29 dirkw Exp $