Compare commits
3 Commits
a181ca82da
...
master
Author | SHA1 | Date | |
---|---|---|---|
a4a1e10448 | |||
8a94b8ee0f | |||
8ae1464532 |
@ -213,4 +213,23 @@ else
|
|||||||
echo ""
|
echo ""
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
echo ""
|
||||||
|
echo ""
|
||||||
|
echononl "\033[1m mkpasswd -m bcrypt $passwd\033[m"
|
||||||
|
passwd_hash="$(mkpasswd -m bcrypt $passwd 2> $log_file)"
|
||||||
|
if [[ $? -ne 0 ]] ; then
|
||||||
|
echo_failed
|
||||||
|
error "$(cat "$log_file")"
|
||||||
|
else
|
||||||
|
echo_ok
|
||||||
|
echo ""
|
||||||
|
echo " password: $passwd"
|
||||||
|
echo " password hash: $passwd_hash"
|
||||||
|
if [[ -n "$2" ]]; then
|
||||||
|
echo ""
|
||||||
|
echo " ${2}:$passwd_hash"
|
||||||
|
fi
|
||||||
|
echo ""
|
||||||
|
fi
|
||||||
|
|
||||||
clean_up 0
|
clean_up 0
|
||||||
|
@ -12,7 +12,7 @@ info (){
|
|||||||
}
|
}
|
||||||
get_openssl_version() {
|
get_openssl_version() {
|
||||||
|
|
||||||
OPENSSL_VERSION="$(openssl version|awk '{print $2}' | grep -o -E "[0-9]+\.[0-9]+\.[0-9]")"
|
OPENSSL_VERSION="$(openssl version|awk '{print $2}' | grep -o -E "[0-9]+\.[0-9]+\.[0-9]+[a-zA-Z]?")"
|
||||||
|
|
||||||
OPENSSL_MAIN_VERSION=`echo $OPENSSL_VERSION | cut -d '.' -f1,2`
|
OPENSSL_MAIN_VERSION=`echo $OPENSSL_VERSION | cut -d '.' -f1,2`
|
||||||
OPENSSL_MAJOR_VERSION=`echo $OPENSSL_VERSION | cut -d '.' -f1`
|
OPENSSL_MAJOR_VERSION=`echo $OPENSSL_VERSION | cut -d '.' -f1`
|
||||||
|
Reference in New Issue
Block a user