From 8f8dc0a0d4a088d77159d791d85e3cd8df434ec2 Mon Sep 17 00:00:00 2001
From: Alexandre Pujol <alexandre@pujol.io>
Date: Tue, 31 Jan 2017 23:10:39 +0000
Subject: [PATCH] Improve exhumation of key when opening a tomb

---
 tomb | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/tomb b/tomb
index cd104bf..52dd73c 100755
--- a/tomb
+++ b/tomb
@@ -1014,20 +1014,22 @@ get_lukskey() {
 
         # key needs to be exhumed from an image
     elif [[ -r $TOMBKEYFILE && $(file $TOMBKEYFILE) =~ "JP.G" ]]; then
-        # When using a GPG key, the tomb key is buried using a steganography password
-        if option_is_set -r && option_is_set --tomb-pwd; then
-            _password="`option_value --tomb-pwd`"
-            _verbose "tomb-pwd = ::1 tomb pass::" $_password
-        elif option_is_set -r; then
-            _password=$(ask_password "Insert password to exhume key from $imagefile")
-            [[ $? != 0 ]] && {
-                _warning "User aborted password dialog."
-                return 1
-            }
-        fi
-        exhume_key $TOMBKEYFILE "$_password"
         if option_is_set -r; then
+            # When using a GPG key, the tomb key is buried using a steganography password
+            if option_is_set --tomb-pwd; then
+                _password="`option_value --tomb-pwd`"
+                _verbose "tomb-pwd = ::1 tomb pass::" $_password
+            else
+                _password=$(ask_password "Insert password to exhume key from $imagefile")
+                [[ $? != 0 ]] && {
+                    _warning "User aborted password dialog."
+                    return 1
+                }
+            fi
+            exhume_key $TOMBKEYFILE "$_password"
             unset _password
+        else
+            exhume_key $TOMBKEYFILE "$_password"
         fi
     fi