commit 86db18b3860c276ed18ca6df88bc646d27c9d14b parent a752005271e1989d4c15133d0ba7136fdf2c3e11 Author: Jaromil <jaromil@dyne.org> Date: Sun, 25 Sep 2011 04:05:01 -0700 Merge pull request #48 from boyska/fix_47_gpgpwd FIX #47: handling of special chars in password Diffstat:
| M | src/tomb | | | 12 | +++++------- |
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/src/tomb b/src/tomb @@ -460,9 +460,9 @@ create_tomb() { fi - print "${tombpass}" | gpg \ + gpg \ --openpgp --batch --no-options --no-tty --passphrase-fd 0 2>/dev/null \ - -o "${tombkey}" -c -a ${keytmp}/tomb.tmp + -o "${tombkey}" -c -a ${keytmp}/tomb.tmp <<< ${tombpass} # if [ $? != 0 ]; then # error "setting password failed: gnupg returns 2" @@ -616,11 +616,9 @@ mount_tomb() { else tombpass=`exec_as_user ${TOMBEXEC} askpass "$keyname (retry $c)"` fi - print "${tombpass}" \ - | gpg --batch --passphrase-fd 0 --no-tty --no-options \ - -d "${tombkey}" 2> /dev/null \ - | cryptsetup --key-file - luksOpen ${nstloop} ${mapper} - + (gpg --batch --passphrase-fd 0 --no-tty --no-options \ + -d "${tombkey}" 2> /dev/null <<< ${tombpass} ) \ + | cryptsetup --key-file - luksOpen ${nstloop} ${mapper} unset tombpass # if key was from stdin delete temp file and dir