Llewellyn/Tomb
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/Tomb.git synced 2024-10-02 22:59:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #48 from boyska/fix_47_gpgpwd

Browse Source 
FIX #47: handling of special chars in password
This commit is contained in:
Jaromil 2011-09-25 04:05:01 -07:00
commit 86db18b386
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/tomb
View File

@ -460,9 +460,9 @@ create_tomb() {
fi fi
print "${tombpass}" | gpg \ gpg \
--openpgp --batch --no-options --no-tty --passphrase-fd 0 2>/dev/null \ --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 # if [ $? != 0 ]; then
# error "setting password failed: gnupg returns 2" # error "setting password failed: gnupg returns 2"
@ -616,11 +616,9 @@ mount_tomb() {
else else
tombpass=`exec_as_user ${TOMBEXEC} askpass "$keyname (retry $c)"` tombpass=`exec_as_user ${TOMBEXEC} askpass "$keyname (retry $c)"`
fi fi
print "${tombpass}" \ (gpg --batch --passphrase-fd 0 --no-tty --no-options \
| gpg --batch --passphrase-fd 0 --no-tty --no-options \ -d "${tombkey}" 2> /dev/null <<< ${tombpass} ) \
-d "${tombkey}" 2> /dev/null \ | cryptsetup --key-file - luksOpen ${nstloop} ${mapper}
| cryptsetup --key-file - luksOpen ${nstloop} ${mapper}
unset tombpass unset tombpass
# if key was from stdin delete temp file and dir # if key was from stdin delete temp file and dir