tomb

commit 7bd21e441997c126e3027c4e138a404fe4b684a6
parent 3bed43bf214d0948ee1b861c2317ff34a56f9c86
Author: Jaromil <jaromil@dyne.org>
Date:   Sun, 17 Aug 2014 21:05:22 +0200

remove newline from decrypted key's secret, fixes #125

Diffstat:
M
tomb
 | 
5
+----

1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/tomb b/tomb
@@ -682,12 +682,9 @@ get_lukskey() {
     # key needs to be exhumed from an image
     elif [[ `file "$keyfile"` =~ "JP.G" ]]; then
         exhumedkey="`safe_filename exhumedkey`"
-        _verbose "lukspass in get_lukskey: $lukspass"
-
         exhume_key "$keyfile" "$lukspass" "$exhumedkey"
         keyfile="$exhumedkey"
     fi
-    _verbose "lukspass in get_lukskey: $lukspass"
 
     # check validity, eventually repair adding headers
     is_valid_key "$keyfile" || {
@@ -1625,7 +1622,7 @@ mount_tomb() {
         losetup -d ${nstloop}
         _failure "No valid password supplied." }
 
-    print "$tomb_secret" | \
+    print -n "$tomb_secret" | \
         cryptsetup --key-file - luksOpen ${nstloop} ${mapper}
 
     # key dropped here