root/archboot
1
0
Fork 0
mirror of https://gitlab.archlinux.org/tpowa/archboot.git synced 2024-09-19 19:40:37 +02:00
Code Issues Projects Releases Packages Wiki Activity

luks passphrase fix box size and don't allow empty passphrase

Browse source
This commit is contained in:
Tobias Powalowski 2023-09-30 14:55:27 +02:00
parent 75f198dc2c
commit b1770ba815
1 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
usr/lib/archboot/installer/blockdevices.sh
View file

@ -769,18 +769,27 @@ _enter_luks_name() {
_enter_luks_passphrase () {
_LUKSPASSPHRASE=""
_LUKSPASS=""
_LUKSPASS2=""
while [[ -z "${_LUKSPASSPHRASE}" ]]; do
_dialog --no-cancel --insecure --passwordbox "Enter passphrase for luks encrypted device ${_LUKSDEV}:" 7 60 2>"${_ANSWER}" || return 1
_LUKSPASS=$(cat "${_ANSWER}")
_dialog --no-cancel --insecure --passwordbox "Retype passphrase for luks encrypted device ${_LUKSDEV}:" 7 60 2>"${_ANSWER}" || return 1
_LUKSPASS2=$(cat "${_ANSWER}")
if [[ -n "${_LUKSPASS}" && -n "${_LUKSPASS2}" && "${_LUKSPASS}" == "${_LUKSPASS2}" ]]; then
while [[ -z "${_LUKSPASS}" ]]; do
_dialog --no-cancel --insecure --passwordbox "Enter passphrase for luks encrypted device ${_LUKSDEV}:" 8 70 2>"${_ANSWER}" || return 1
_LUKSPASS=$(cat "${_ANSWER}")
done
while [[ -z "${_LUKSPASS2}" ]]; do
_dialog --no-cancel --insecure --passwordbox "Retype passphrase for luks encrypted device ${_LUKSDEV}:" 8 70 2>"${_ANSWER}" || return 1
_LUKSPASS2=$(cat "${_ANSWER}")
done
if [[ "${_LUKSPASS}" == "${_LUKSPASS2}" ]]; then
_LUKSPASSPHRASE=${_LUKSPASS}
echo "${_LUKSPASSPHRASE}" > "/tmp/passphrase-${_LUKSDEV}"
_LUKSPASSPHRASE="/tmp/passphrase-${_LUKSDEV}"
else
_dialog --no-mouse --infobox "Passphrases didn't match or was empty, please enter again." 0 0
sleep 5
_dialog --no-mouse --infobox "Passphrases didn't match, please enter again." 0 0
sleep 3
_LUKSPASSPHRASE=""
_LUKSPASS=""
_LUKSPASS2=""
fi
done
}